wip

ooflorent · ooflorent · commit 7a7002097429 · 2018-01-24T23:31:57.000+01:00
diff --git a/test/watchCases/cache/child-compilation-cache/0/index.js b/test/watchCases/cache/child-compilation-cache/0/index.js
@@ -2,13 +2,13 @@ it("should use correct caches in compilation and child compilations", function()
 	var x = require("./report-cache-counters-loader!./changing-file");
 	switch(WATCH_STEP) {
 		case "0":
-			x.should.be.eql([1, 1]);
+			expect(x).toEqual([1, 1]);
 			break;
 		case "1":
-			x.should.be.eql([2, 1]);
+			expect(x).toEqual([2, 1]);
 			break;
 		case "2":
-			x.should.be.eql([3, 2]);
+			expect(x).toEqual([3, 2]);
 			break;
 		default:
 			throw new Error("Not handled step");
diff --git a/test/watchCases/context/delete-in-context/0/index.js b/test/watchCases/context/delete-in-context/0/index.js
@@ -1,4 +1,4 @@
 it("should detect changes in a context", function() {
 	var context = require.context("./directory");
-	context.keys().length.should.be.eql((+WATCH_STEP) % 3 * 2);
+	expect(context.keys().length).toBe((+WATCH_STEP) % 3 * 2);
 });
diff --git a/test/watchCases/parsing/caching-harmony/0/index.js b/test/watchCases/parsing/caching-harmony/0/index.js
@@ -2,13 +2,13 @@ import m from "./module";
 import cm from "./changing-module";
 
 it("should flag harmony modules correctly", function() {
-	m.should.be.eql("module" + WATCH_STEP);
+	expect(m).toBe("module" + WATCH_STEP);
 	switch(WATCH_STEP) {
 		case "0":
-			cm.should.be.eql("original");
+			expect(cm).toBe("original");
 			break;
 		case "1":
-			cm.should.be.eql("change");
+			expect(cm).toBe("change");
 			break;
 	}
 });
diff --git a/test/watchCases/parsing/switching-harmony/0/index.js b/test/watchCases/parsing/switching-harmony/0/index.js
@@ -4,20 +4,20 @@ import ch from "./ch";
 import cc from "./cc";
 
 it("should flag modules correctly", function() {
-	hh.should.be.eql("hh" + WATCH_STEP);
-	cc.should.be.eql("cc" + WATCH_STEP);
-	hc.should.be.eql("hc" + WATCH_STEP);
-	ch.should.be.eql("ch" + WATCH_STEP);
-	require("./hh").default.should.be.eql("hh" + WATCH_STEP);
-	require("./cc").should.be.eql("cc" + WATCH_STEP);
+	expect(hh).toBe("hh" + WATCH_STEP);
+	expect(cc).toBe("cc" + WATCH_STEP);
+	expect(hc).toBe("hc" + WATCH_STEP);
+	expect(ch).toBe("ch" + WATCH_STEP);
+	expect(require("./hh").default).toBe("hh" + WATCH_STEP);
+	expect(require("./cc")).toBe("cc" + WATCH_STEP);
 	switch(WATCH_STEP) {
 		case "0":
-			require("./hc").default.should.be.eql("hc0");
-			require("./ch").should.be.eql("ch0");
+			expect(require("./hc").default).toBe("hc0");
+			expect(require("./ch")).toBe("ch0");
 			break;
 		case "1":
-			require("./hc").should.be.eql("hc1");
-			require("./ch").default.should.be.eql("ch1");
+			expect(require("./hc")).toBe("hc1");
+			expect(require("./ch").default).toBe("ch1");
 			break;
 	}
 });
diff --git a/test/watchCases/plugins/automatic-prefetch-plugin/0/index.js b/test/watchCases/plugins/automatic-prefetch-plugin/0/index.js
@@ -1,7 +1,7 @@
 it("should watch for changes", function() {
-	require("./foo/" + WATCH_STEP).should.be.eql('This is only a test.' + WATCH_STEP);
+	expect(require("./foo/" + WATCH_STEP)).toBe('This is only a test.' + WATCH_STEP);
 	if(+WATCH_STEP > 0) {
 		for(var m of STATS_JSON.modules.filter(m => /(a|b|c)\.js$/.test(m.identifier)))
-			m.prefetched.should.be.true();
+			expect(m.prefetched).toBe(true);
 	}
 });
diff --git a/test/watchCases/plugins/dll-reference-plugin/1/index.js b/test/watchCases/plugins/dll-reference-plugin/1/index.js
@@ -1,5 +1,5 @@
 import value from "dll/module";
 
 it("should have the correct default export", function() {
-	value.should.be.eql("ok");
+	expect(value).toBe("ok");
 });
diff --git a/test/watchCases/plugins/dll-reference-plugin/2/index.js b/test/watchCases/plugins/dll-reference-plugin/2/index.js
@@ -1,5 +1,5 @@
 import value from "dll/module";
 
 it("should have still the correct default export", function() {
-	value.should.be.eql("ok");
+	expect(value).toBe("ok");
 });
diff --git a/test/watchCases/plugins/module-concatenation-plugin/0/index.js b/test/watchCases/plugins/module-concatenation-plugin/0/index.js
@@ -1,13 +1,13 @@
 it("should watch for changes", function() {
 	if(WATCH_STEP === '0') {
-		require("./foo/" + WATCH_STEP).should.be.eql('This is only a test.' + WATCH_STEP);
+		expect(require("./foo/" + WATCH_STEP)).toBe('This is only a test.' + WATCH_STEP);
 	}
 	else if(WATCH_STEP === '1') {
-		require("./foo/" + WATCH_STEP).should.be.eql('This should be a test.' + WATCH_STEP);
+		expect(require("./foo/" + WATCH_STEP)).toBe('This should be a test.' + WATCH_STEP);
 	}
 	else if(WATCH_STEP === '2') {
-		require("./foo/" + WATCH_STEP).should.be.eql('This should be working.' + WATCH_STEP);
+		expect(require("./foo/" + WATCH_STEP)).toBe('This should be working.' + WATCH_STEP);
 	}
 
-	STATS_JSON.modules.length.should.equal(4 + Number(WATCH_STEP));
+	expect(STATS_JSON.modules.length).toBe(4 + Number(WATCH_STEP));
 });
diff --git a/test/watchCases/plugins/watch-ignore-plugin/0/index.js b/test/watchCases/plugins/watch-ignore-plugin/0/index.js
@@ -2,7 +2,7 @@ import value from "./file"
 import a from "./a"
 const req = require.context("./foo", false, /^.*\.js$/);
 it("should ignore change to file and directory", function() {
-	a.should.be.eql(+WATCH_STEP);
-	req.keys().should.be.deepEqual(["./0.js"])
-	value.should.be.eql(1);
+	expect(a).toBe(+WATCH_STEP);
+	expect(req.keys()).toEqual(["./0.js"])
+	expect(value).toBe(1);
 });
diff --git a/test/watchCases/recover-from-error/missing-module/0/index.js b/test/watchCases/recover-from-error/missing-module/0/index.js
@@ -1,12 +1,12 @@
 it("should recover from missing module", function() {
 	switch(WATCH_STEP) {
 		case "0":
-			(function() {
+			expect(function() {
 				require("some-module");
-			}).should.throw();
+			}).toThrow();
 			break;
 		case "1":
-			require("some-module").should.be.eql("ok");
+			expect(require("some-module")).toBe("ok");
 			break;
 	}
 });
diff --git a/test/watchCases/runtime/dynamic-import/0/index.js b/test/watchCases/runtime/dynamic-import/0/index.js
@@ -1,12 +1,12 @@
 it("should change chunkhash of main chunk", function () {
 	const mainChunk = STATS_JSON.chunks.find((chunk) => chunk.names.indexOf("main") !== -1);
-	(!mainChunk).should.be.false("Main chunk not found");
+	expect(mainChunk).toBeDefined();
 	switch (WATCH_STEP) {
 		case "0":
 			STATE.hash = mainChunk.hash;
 			break;
 		case "1":
-			mainChunk.hash.should.be.not.eql(STATE.hash);
+			expect(mainChunk.hash).not.toBe(STATE.hash);
 			break;
 	}
 });
@@ -17,10 +17,10 @@ it("should load additional chunk", function() {
 		.then((dynamic) => {
 			switch (step) {
 				case "0":
-					dynamic.default.should.be.eql("Normal");
+					expect(dynamic.default).toBe("Normal");
 					break;
 				case "1":
-					dynamic.default.should.be.eql("Changed");
+					expect(dynamic.default).toBe("Changed");
 					break;
 			}
 		});
diff --git a/test/watchCases/runtime/static-import/0/index.js b/test/watchCases/runtime/static-import/0/index.js
@@ -1,26 +1,24 @@
-require("should");
-
 import * as both from './dynamic-and-static'
 import * as staticModule from './static'
 
 it("should not change chunkhash of manifest chunk", function () {
 	const manifestChunk = STATS_JSON.chunks.find((chunk) => chunk.names.indexOf("main-runtime") !== -1);
-	(!manifestChunk).should.be.false("Main chunk not found");
+	expect(manifestChunk).toBeDefined();
 	switch (WATCH_STEP) {
 		case "0":
 			STATE.hash = manifestChunk.hash;
-			staticModule.should.be.eql("Normal");
-			both.should.be.eql("Normal");
+			expect(staticModule).toBe("Normal");
+			expect(both).toBe("Normal");
 			break;
 		case "1":
-			manifestChunk.hash.should.be.eql(STATE.hash);
-			staticModule.should.be.eql("Changed");
-			both.should.be.eql("Normal");
+			expect(manifestChunk.hash).toBe(STATE.hash);
+			expect(staticModule).toBe("Changed");
+			expect(both).toBe("Normal");
 			break;
 		case "2":
-			manifestChunk.hash.should.be.eql(STATE.hash);
-			staticModule.should.be.eql("Changed");
-			both.should.be.eql("Changed");
+			expect(manifestChunk.hash).toBe(STATE.hash);
+			expect(staticModule).toBe("Changed");
+			expect(both).toBe("Changed");
 			break;
 	}
 });
@@ -32,10 +30,10 @@ it("should load additional chunk", function() {
 			switch (step) {
 				case "0":
 				case "1":
-					dynamic.default.should.be.eql("Normal");
+					expect(dynamic.default).toBe("Normal");
 					break;
 				case "2":
-					dynamic.default.should.be.eql("Changed");
+					expect(dynamic.default).toBe("Changed");
 					break;
 			}
 		});
diff --git a/test/watchCases/simple/multi-compiler/0/index.js b/test/watchCases/simple/multi-compiler/0/index.js
@@ -2,10 +2,10 @@ require("./changing-file")
 it("should watch for changes", function() {
 	switch(WATCH_STEP) {
 		case "0":
-			STATS_JSON.children.should.have.size(2);
+			expect(STATS_JSON.children).toHaveLength(2);
 			break;
 		case "1":
-			STATS_JSON.children.should.have.size(1);
+			expect(STATS_JSON.children).toHaveLength(1);
 			break;
 	}
 })
diff --git a/test/watchCases/simple/simple/0/index.js b/test/watchCases/simple/simple/0/index.js
@@ -1,3 +1,3 @@
 it("should watch for changes", function() {
-	require("./changing-file").should.be.eql(WATCH_STEP);
+	expect(require("./changing-file")).toBe(WATCH_STEP);
 })
diff --git a/test/watchCases/warnings/warnings-contribute-to-hash/0/index.js b/test/watchCases/warnings/warnings-contribute-to-hash/0/index.js
@@ -6,7 +6,7 @@ it("should detect a change on warnings change", function() {
 			STATE.hash = STATS_JSON.hash;
 			break;
 		case "1":
-			STATS_JSON.hash.should.be.not.eql(STATE.hash);
+			expect(STATS_JSON.hash).not.toBe(STATE.hash);
 			break;
 	}
 });

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`it("should watch for changes", function() {`
`2`	`2`	`if(WATCH_STEP === '0') {`
`3`		`- require("./foo/" + WATCH_STEP).should.be.eql('This is only a test.' + WATCH_STEP);`
	`3`	`+ expect(require("./foo/" + WATCH_STEP)).toBe('This is only a test.' + WATCH_STEP);`
`4`	`4`	`}`
`5`	`5`	`else if(WATCH_STEP === '1') {`
`6`		`- require("./foo/" + WATCH_STEP).should.be.eql('This should be a test.' + WATCH_STEP);`
	`6`	`+ expect(require("./foo/" + WATCH_STEP)).toBe('This should be a test.' + WATCH_STEP);`
`7`	`7`	`}`
`8`	`8`	`else if(WATCH_STEP === '2') {`
`9`		`- require("./foo/" + WATCH_STEP).should.be.eql('This should be working.' + WATCH_STEP);`
	`9`	`+ expect(require("./foo/" + WATCH_STEP)).toBe('This should be working.' + WATCH_STEP);`
`10`	`10`	`}`
`11`	`11`
`12`		`- STATS_JSON.modules.length.should.equal(4 + Number(WATCH_STEP));`
	`12`	`+ expect(STATS_JSON.modules.length).toBe(4 + Number(WATCH_STEP));`
`13`	`13`	`});`