Merge pull request webpack#7699 from webpack/ci/upgrade-jest

upgrade jest

Author: sokra

.eslintrc.js

@@ -61,7 +61,7 @@ module.exports = {
 				browser: true
 			},
 			globals: {
-				Promise: false,
+				Promise: false
 			},
 			parserOptions: {
 				ecmaVersion: 5
@@ -71,6 +71,9 @@ module.exports = {
 			files: ["test/**/*.js"],
 			env: {
 				"jest/globals": true
+			},
+			globals: {
+				nsObj: false
 			}
 		}
 	]

package.json

@@ -56,7 +56,7 @@
     "istanbul": "^0.4.5",
     "jade": "^1.11.0",
     "jade-loader": "~0.8.0",
-    "jest": "^23.0.1",
+    "jest": "^23.3.0",
     "jest-silent-reporter": "^0.0.5",
     "json-loader": "^0.5.7",
     "less": "^2.5.1",
@@ -82,6 +82,14 @@
     "worker-loader": "^1.1.1",
     "xxhashjs": "^0.2.1"
   },
+  "resolutions": {
+    "**/jest-message-util/micromatch": "^2.3.11",
+    "**/jest-cli/micromatch": "^2.3.11",
+    "**/jest-runtime/micromatch": "^2.3.11",
+    "**/jest-haste-map/micromatch": "^2.3.11",
+    "**/jest-haste-map/sane/micromatch": "^2.3.11",
+    "**/jest-config/babel-jest/babel-plugin-istanbul/test-exclude/micromatch": "^2.3.11"
+  },
   "engines": {
     "node": ">=6.11.5"
   },
@@ -179,7 +187,8 @@
     "coveragePathIgnorePatterns": [
       "\\.runtime\\.js$",
       "<rootDir>/test/",
-      "<rootDir>/schemas/"
+      "<rootDir>/schemas/",
+      "<rootDir>/node_modules/"
     ],
     "testEnvironment": "node",
     "coverageReporters": [

test/ConfigTestCases.test.js

@@ -211,6 +211,7 @@ describe("ConfigTestCases", () => {
 											) {
 												fn = vm.runInNewContext(
 													"(function(require, module, exports, __dirname, __filename, it, beforeEach, afterEach, expect, jest, window) {" +
+														'function nsObj(m) { Object.defineProperty(m, Symbol.toStringTag, { value: "Module" }); return m; }' +
 														content +
 														"\n})",
 													globalContext,
@@ -220,6 +221,7 @@ describe("ConfigTestCases", () => {
 												fn = vm.runInThisContext(
 													"(function(require, module, exports, __dirname, __filename, it, beforeEach, afterEach, expect, jest) {" +
 														"global.expect = expect; " +
+														'function nsObj(m) { Object.defineProperty(m, Symbol.toStringTag, { value: "Module" }); return m; }' +
 														content +
 														"\n})",
 													p

test/HotTestCases.test.js

@@ -151,6 +151,7 @@ describe("HotTestCases", () => {
 										const fn = vm.runInThisContext(
 											"(function(require, module, exports, __dirname, __filename, it, expect, NEXT, STATS) {" +
 												"global.expect = expect;" +
+												'function nsObj(m) { Object.defineProperty(m, Symbol.toStringTag, { value: "Module" }); return m; }' +
 												fs.readFileSync(p, "utf-8") +
 												"\n})",
 											p

test/TestCases.template.js

@@ -216,6 +216,7 @@ const describeCases = config => {
 												const fn = vm.runInThisContext(
 													"(function(require, module, exports, __dirname, it, expect) {" +
 														"global.expect = expect;" +
+														'function nsObj(m) { Object.defineProperty(m, Symbol.toStringTag, { value: "Module" }); return m; }' +
 														fs.readFileSync(p, "utf-8") +
 														"\n})",
 													p

test/WatchTestCases.test.js

@@ -245,6 +245,7 @@ describe("WatchTestCases", () => {
 												) {
 													fn = vm.runInNewContext(
 														"(function(require, module, exports, __dirname, __filename, it, WATCH_STEP, STATS_JSON, STATE, expect, window) {" +
+															'function nsObj(m) { Object.defineProperty(m, Symbol.toStringTag, { value: "Module" }); return m; }' +
 															content +
 															"\n})",
 														globalContext,
@@ -254,6 +255,7 @@ describe("WatchTestCases", () => {
 													fn = vm.runInThisContext(
 														"(function(require, module, exports, __dirname, __filename, it, WATCH_STEP, STATS_JSON, STATE, expect) {" +
 															"global.expect = expect;" +
+															'function nsObj(m) { Object.defineProperty(m, Symbol.toStringTag, { value: "Module" }); return m; }' +
 															content +
 															"\n})",
 														p

test/cases/chunks/import-context/index.js

@@ -23,10 +23,9 @@ function testCase(load, done) {
 it("should be able to use expressions in import", function(done) {
 	function load(name, expected, callback) {
 		import("./dir/" + name).then(function(result) {
-			expect(result).toEqual({
-				default: expected,
-				[Symbol.toStringTag]: "Module"
-			});
+			expect(result).toEqual(nsObj({
+				default: expected
+			}));
 			callback();
 		}).catch(function(err) {
 			done(err);

test/cases/chunks/import/index.js

@@ -1,9 +1,8 @@
 it("should be able to use import", function(done) {
 	import("./two").then(function(two) {
-		expect(two).toEqual({
-			default: 2,
-			[Symbol.toStringTag]: "Module"
-		});
+		expect(two).toEqual(nsObj({
+			default: 2
+		}));
 		done();
 	}).catch(function(err) {
 		done(err);

test/cases/chunks/inline-options/index.js

@@ -110,17 +110,15 @@ function testChunkLoading(load, expectedSyncInitial, expectedSyncRequested) {
 		sync = true;
 		var p = Promise.all([
 			load("a").then(function(a) {
-				expect(a).toEqual({
-					default: "a",
-					[Symbol.toStringTag]: "Module"
-				});
+				expect(a).toEqual(nsObj({
+					default: "a"
+				}));
 				expect(sync).toBe(true);
 			}),
 			load("c").then(function(c) {
-				expect(c).toEqual({
-					default: "c",
-					[Symbol.toStringTag]: "Module"
-				});
+				expect(c).toEqual(nsObj({
+					default: "c"
+				}));
 				expect(sync).toBe(expectedSyncRequested);
 			})
 		]);

test/cases/chunks/issue-2443/index.js

@@ -1,10 +1,9 @@
 it("should be able to use expressions in import (directory)", function(done) {
 	function load(name, expected, callback) {
 		import("./dir/" + name + "/file.js").then(function(result) {
-			expect(result).toEqual({
-				default: expected,
-				[Symbol.toStringTag]: "Module"
-			});
+			expect(result).toEqual(nsObj({
+				default: expected
+			}));
 			callback();
 		}).catch(function(err) {
 			done(err);