migrate should to expect, part 4 (manual)

niieani · niieani · commit 075fcc31d76c · 2018-01-27T16:05:21.000+01:00
diff --git a/test/cases/parsing/chunks/index.js b/test/cases/parsing/chunks/index.js
@@ -30,7 +30,7 @@ it("should parse a string in require.ensure with arrow function expression", fun
 
 
 it("should parse a string in require.ensure with arrow function array expression", function(done) {
-	require.ensure("./file", require =>expect( (require("./file")).toBe("ok"), done()));
+	require.ensure("./file", require => (expect(require("./file")).toBe("ok"), done()));
 });
 
 
diff --git a/test/cases/parsing/es6.nominimize/index.js b/test/cases/parsing/es6.nominimize/index.js
@@ -26,14 +26,14 @@ it("should parse classes", function() {
 
 it("should parse spread operator"/*, function() {
 	expect([0, ...require("./array")]).toEqual([0, 1, 2, 3]);
-	({z: 0, ...require("./object")}expect()).toEqual({z: 0, a: 1, b: 2, c: 3});
+	expect(({z: 0, ...require("./object")})).toEqual({z: 0, a: 1, b: 2, c: 3});
 }*/);
 
 it("should parse arrow function", function() {
-	(() =>expect( require("./a"))()).toBe("a");
-	(() => {
+	expect((() => require("./a"))()).toBe("a");
+	(expect(() => {
 		return require("./a");
-	}expect()()).toBe("a");
+	})()).toBe("a");
 	require.ensure([], () => {
 		require("./a");
 	});
diff --git a/test/cases/parsing/harmony-this/index.js b/test/cases/parsing/harmony-this/index.js
@@ -20,9 +20,9 @@ import * as New from "./new";
 
 it("should be possible to use new correctly", function() {
 	x
-	expect(new C()).toMatch({ok: true});
+	expect(new C()).toEqual({ok: true});
 	x
-	expect(new C2()).toMatch({ok: true});
+	expect(new C2()).toEqual({ok: true});
 	x
-	expect(new New.C()).toMatch({ok: true});
+	expect(new New.C()).toEqual({ok: true});
 });
diff --git a/test/configCases/commons-chunk-plugin/move-to-grandparent/second.js b/test/configCases/commons-chunk-plugin/move-to-grandparent/second.js
@@ -1,6 +1,6 @@
 it("should handle indirect children with multiple parents correctly", function(done) {
   import('./pageB').then(b => {
-expect(    b.default).toBe("reuse");
+    expect(b.default).toBe("reuse");
     done()
   }).catch(e => {
 		done();
diff --git a/test/configCases/dll-plugin/1-use-dll/index.js b/test/configCases/dll-plugin/1-use-dll/index.js
@@ -34,7 +34,7 @@ it("should load a module with loader applied", function() {
 });
 
 it("should give modules the correct ids", function() {
-	Object.keys(__webpack_modules__).filter(m =>expect( !m.startsWith("../.."))).toEqual([
+	expect(Object.keys(__webpack_modules__).filter(m => !m.startsWith("../.."))).toEqual([
 		"./index.js",
 		"dll-reference ../0-create-dll/dll.js",
 		"dll/a.js",
diff --git a/test/configCases/dll-plugin/2-use-dll-without-scope/index.js b/test/configCases/dll-plugin/2-use-dll-without-scope/index.js
@@ -34,7 +34,7 @@ it("should load a module with loader applied", function() {
 });
 
 it("should give modules the correct ids", function() {
-	Object.keys(__webpack_modules__).filter(m =>expect( !m.startsWith("../.."))).toEqual([
+	expect(Object.keys(__webpack_modules__).filter(m => !m.startsWith("../.."))).toEqual([
 		"../0-create-dll/a.js",
 		"../0-create-dll/b.js",
 		"../0-create-dll/d.js",
diff --git a/test/configCases/filename-template/module-filename-template/index.js b/test/configCases/filename-template/module-filename-template/index.js
@@ -2,7 +2,7 @@ it("should include test.js in SourceMap", function() {
 	var fs = require("fs");
 	var source = fs.readFileSync(__filename + ".map", "utf-8");
 	var map = JSON.parse(source);
-	expect(map.sources).toMatch("dummy:///./test.js");
+	expect(map.sources).toContain("dummy:///./test.js");
 });
 
 require.include("./test.js");
diff --git a/test/configCases/parsing/harmony-this-concat/index.js b/test/configCases/parsing/harmony-this-concat/index.js
@@ -25,9 +25,9 @@ import * as New from "./new";
 
 it("should be possible to use new correctly", function() {
 	x
-	expect(new C()).toMatch({ok: true});
+	expect(new C()).toEqual({ok: true});
 	x
-	expect(new C2()).toMatch({ok: true});
+	expect(new C2()).toEqual({ok: true});
 	x
-	expect(new New.C()).toMatch({ok: true});
+	expect(new New.C()).toEqual({ok: true});
 });
diff --git a/test/configCases/parsing/harmony-this/index.js b/test/configCases/parsing/harmony-this/index.js
@@ -34,7 +34,7 @@ it("should have this = undefined on imported non-strict functions", function() {
 	expect(abc.a()).toMatchObject({});
 	x
 	var thing = abc.a();
-	expect(Object.keys(thing)).toBe(Object.keys(abc));
+	expect(Object.keys(thing)).toEqual(Object.keys(abc));
 });
 
 import C2, { C } from "./new";
@@ -43,9 +43,9 @@ import * as New from "./new";
 
 it("should be possible to use new correctly", function() {
 	x
-	expect(new C()).toMatch({ok: true});
+	expect(new C()).toEqual({ok: true});
 	x
-	expect(new C2()).toMatch({ok: true});
+	expect(new C2()).toEqual({ok: true});
 	x
-	expect(new New.C()).toMatch({ok: true});
+	expect(new New.C()).toEqual({ok: true});
 });
diff --git a/test/configCases/plugins/lib-manifest-plugin/index.js b/test/configCases/plugins/lib-manifest-plugin/index.js
@@ -10,8 +10,9 @@ it("should complete", function(done) {
 
 it("should write the correct manifest", function() {
 	var manifest = JSON.parse(fs.readFileSync(path.join(__dirname, 'bundle0-manifest.json'), "utf-8"));
-	expect(manifest).to.have.key("content", "name");
-	expect(manifest.content).not.toHaveProperty("./a.js");
-	expect(manifest.content).toHaveProperty("./index.js");
+	expect(manifest).toHaveProperty("content");
+	expect(manifest).toHaveProperty("name");
+	expect(manifest.content).not.toHaveProperty(["./a.js"]);
+	expect(manifest.content).toHaveProperty(["./index.js"]);
 	expect(manifest.content["./index.js"]).toHaveProperty("id", module.id);
 });
diff --git a/test/configCases/plugins/progress-plugin/index.js b/test/configCases/plugins/progress-plugin/index.js
@@ -1,6 +1,6 @@
 it("should contain the custom progres messages", function() {
 	var data = require(__dirname + "/data");
-	expect(data).toMatch("optimizing");
-	expect(data).toMatch("optimizing|CustomPlugin");
-	expect(data).toMatch("optimizing|CustomPlugin|custom category|custom message");
+	expect(data).toContain("optimizing");
+	expect(data).toContain("optimizing|CustomPlugin");
+	expect(data).toContain("optimizing|CustomPlugin|custom category|custom message");
 });
diff --git a/test/configCases/source-map/exclude-chunks-source-map/index.js b/test/configCases/source-map/exclude-chunks-source-map/index.js
@@ -2,7 +2,7 @@ it("should include test.js in SourceMap for bundle0 chunk", function() {
 	var fs = require("fs");
 	var source = fs.readFileSync(__filename + ".map", "utf-8");
 	var map = JSON.parse(source);
-	expect(map.sources).toMatch("webpack:///./test.js");
+	expect(map.sources).toContain("webpack:///./test.js");
 });
 
 it("should not produce a SourceMap for vendors chunk", function() {
diff --git a/test/configCases/source-map/line-to-line/index.js b/test/configCases/source-map/line-to-line/index.js
@@ -2,7 +2,7 @@ it("should include test.js in SourceMap", function() {
 	var fs = require("fs");
 	var source = fs.readFileSync(__filename + ".map", "utf-8");
 	var map = JSON.parse(source);
-	expect(map.sources).toMatch("webpack:///./test.js");
+	expect(map.sources).toContain("webpack:///./test.js");
 });
 
 require.include("./test.js");
diff --git a/test/configCases/source-map/module-names/index.js b/test/configCases/source-map/module-names/index.js
@@ -7,14 +7,14 @@ function getSourceMap(filename) {
 
 it("should include test.js in SourceMap", function() {
 	var map = getSourceMap("bundle0.js");
-	expect(map.sources).toMatch("module");
-	expect(map.sources).toMatch("fallback");
-	expect(map.sources).toMatch("fallback**");
+	expect(map.sources).toContain("module");
+	expect(map.sources).toContain("fallback");
+	expect(map.sources).toContain("fallback**");
 	map = getSourceMap("chunk-a.js");
-	expect(map.sources).toMatch("fallback*");
+	expect(map.sources).toContain("fallback*");
 	map = getSourceMap("chunk-b.js");
-	expect(map.sources).toMatch("fallback*");
-	expect(map.sources).toMatch("fallback***");
+	expect(map.sources).toContain("fallback*");
+	expect(map.sources).toContain("fallback***");
 });
 
 require.ensure(["./test.js"], function(require) {}, "chunk-a");
diff --git a/test/configCases/source-map/namespace-source-path.library/index.js b/test/configCases/source-map/namespace-source-path.library/index.js
@@ -2,7 +2,7 @@ it("should include webpack://mylibrary/./test.js in SourceMap", function() {
 	var fs = require("fs");
 	var source = fs.readFileSync(__filename + ".map", "utf-8");
 	var map = JSON.parse(source);
-	expect(map.sources).toMatch("webpack://mylibrary/./test.js");
+	expect(map.sources).toContain("webpack://mylibrary/./test.js");
 });
 
 require.include("./test.js");
diff --git a/test/configCases/source-map/namespace-source-path/index.js b/test/configCases/source-map/namespace-source-path/index.js
@@ -2,7 +2,7 @@ it("should include webpack://mynamespace/./test.js in SourceMap", function() {
 	var fs = require("fs");
 	var source = fs.readFileSync(__filename + ".map", "utf-8");
 	var map = JSON.parse(source);
-	expect(map.sources).toMatch("webpack://mynamespace/./test.js");
+	expect(map.sources).toContain("webpack://mynamespace/./test.js");
 });
 
 require.include("./test.js");
diff --git a/test/configCases/source-map/relative-source-map-path/index.js b/test/configCases/source-map/relative-source-map-path/index.js
@@ -7,6 +7,7 @@ it("should have a relative url to the source-map", function() {
 
 it("should have a relative url to the source-map with prefix", function(done) {
 	require.ensure([], function(require) {
+		global.expect = expect;
 		require("./test.js");
 		done();
 	});
diff --git a/test/configCases/source-map/sources-array-production/index.js b/test/configCases/source-map/sources-array-production/index.js
@@ -2,7 +2,7 @@ it("should include test.js in SourceMap", function() {
 	var fs = require("fs");
 	var source = fs.readFileSync(__filename + ".map", "utf-8");
 	var map = JSON.parse(source);
-	expect(map.sources).toMatch("webpack:///./test.js");
+	expect(map.sources).toContain("webpack:///./test.js");
 });
 
 require.include("./test.js");
diff --git a/test/configCases/target/webworker/index.js b/test/configCases/target/webworker/index.js
@@ -6,8 +6,8 @@ it("should provide a global Buffer constructor", function() {
 });
 
 it("should provide a global console shim", function () {
-	expect(console).toBeInstanceOf(Object);
-	expect(console.time).toBeInstanceOf(Function);
+	expect(console).toBeTypeOf("object");
+	expect(console.time).toBeTypeOf("function");
 });
 
 it("should provide a global process shim", function () {

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,9 @@ import * as New from "./new";`
`20`	`20`
`21`	`21`	`it("should be possible to use new correctly", function() {`
`22`	`22`	`x`
`23`		`- expect(new C()).toMatch({ok: true});`
	`23`	`+ expect(new C()).toEqual({ok: true});`
`24`	`24`	`x`
`25`		`- expect(new C2()).toMatch({ok: true});`
	`25`	`+ expect(new C2()).toEqual({ok: true});`
`26`	`26`	`x`
`27`		`- expect(new New.C()).toMatch({ok: true});`
	`27`	`+ expect(new New.C()).toEqual({ok: true});`
`28`	`28`	`});`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ import * as New from "./new";`
`25`	`25`
`26`	`26`	`it("should be possible to use new correctly", function() {`
`27`	`27`	`x`
`28`		`- expect(new C()).toMatch({ok: true});`
	`28`	`+ expect(new C()).toEqual({ok: true});`
`29`	`29`	`x`
`30`		`- expect(new C2()).toMatch({ok: true});`
	`30`	`+ expect(new C2()).toEqual({ok: true});`
`31`	`31`	`x`
`32`		`- expect(new New.C()).toMatch({ok: true});`
	`32`	`+ expect(new New.C()).toEqual({ok: true});`
`33`	`33`	`});`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ it("should have this = undefined on imported non-strict functions", function() {`
`34`	`34`	`expect(abc.a()).toMatchObject({});`
`35`	`35`	`x`
`36`	`36`	`var thing = abc.a();`
`37`		`- expect(Object.keys(thing)).toBe(Object.keys(abc));`
	`37`	`+ expect(Object.keys(thing)).toEqual(Object.keys(abc));`
`38`	`38`	`});`
`39`	`39`
`40`	`40`	`import C2, { C } from "./new";`
`@@ -43,9 +43,9 @@ import * as New from "./new";`
`43`	`43`
`44`	`44`	`it("should be possible to use new correctly", function() {`
`45`	`45`	`x`
`46`		`- expect(new C()).toMatch({ok: true});`
	`46`	`+ expect(new C()).toEqual({ok: true});`
`47`	`47`	`x`
`48`		`- expect(new C2()).toMatch({ok: true});`
	`48`	`+ expect(new C2()).toEqual({ok: true});`
`49`	`49`	`x`
`50`		`- expect(new New.C()).toMatch({ok: true});`
	`50`	`+ expect(new New.C()).toEqual({ok: true});`
`51`	`51`	`});`