fixed bugs from upgrading enzyme

zookatron · Mar 19, 2019 · d5e33da · d5e33da
1 parent 88e62cc
commit d5e33da
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -16,7 +16,7 @@ module.exports = {
     },
   },
   moduleDirectories: ["node_modules", "<rootDir>"],
-  moduleFileExtensions: ["ts", "tsx", "js", "jsx"],
+  moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json"],
   moduleNameMapper: {
     "\\.(css|less|s(c|a)ss)$": "<rootDir>/src/__mocks__/style.ts",
     "@/(.*)": "<rootDir>/$1",

diff --git a/src/__tests__/testing.tsx b/src/__tests__/testing.tsx
@@ -51,7 +51,7 @@ export const withWindow = contextManager(
   // tslint:disable:no-any
   ({ value }: { value?: undefined } = {}) => {
     const window = (global as any).window;
-    delete (global as any).window;
+    // delete (global as any).window;
 
     if (value !== undefined) {
       (global as any).window = value;

diff --git a/src/__tests__/utils.test.ts b/src/__tests__/utils.test.ts
@@ -15,12 +15,16 @@ describe("Utils", () => {
     });
 
     it("should return false without window (SSR)", () => {
-      withWindow({}, () => {
+      const initialWindow = window;
+      try {
+        delete (global as any).window; // tslint:disable-line:no-any
         expect(() => window).toThrow(
           new ReferenceError("window is not defined"),
         );
         expect(canUseDOM()).toBe(false);
-      });
+      } catch {
+        (global as any).window = initialWindow; // tslint:disable-line:no-any
+      }
     });
 
     it("should return false without document", () => {