chore: update tests

webpack · Feb 4, 2019 · 3c567be · 3c567be
1 parent 186f683
commit 3c567be
Show file tree

Hide file tree

Showing 7 changed files with 366 additions and 370 deletions.
diff --git a/junit.xml b/junit.xml
diff --git a/test/binCases/watch/info-verbosity-off/info-verbosity-off.test.js b/test/binCases/watch/info-verbosity-off/info-verbosity-off.test.js
@@ -67,7 +67,6 @@ test("info-verbosity-off", async done => {
 				hash1 = extractHash(data);
 				summary = extractSummary(data);
 
-				expect(summary).not.toContain("webpack is watching the files…");
 				expect(summary).toMatchSnapshot();
 
 				// change file

diff --git a/test/binCases/watch/info-verbosity-verbose/info-verbosity-verbose.test.js b/test/binCases/watch/info-verbosity-verbose/info-verbosity-verbose.test.js
@@ -55,25 +55,14 @@ test("info-verbosity-verbose", async done => {
 	// 6. Compilation  finished
 	// 7. Hash and other info
 	var chunkNumber = 0;
+	var stderrNumber = 0;
 	var hash1, hash2;
 
 	webpackProc.stdout.on("data", data => {
 		data = data.toString();
 		chunkNumber++;
-
 		switch (chunkNumber) {
 			case 1:
-			case 5:
-				expect(data).toContain("Compilation  starting");
-				break;
-			case 2:
-				expect(data).toContain("webpack is watching the files");
-				break;
-			case 3:
-			case 6:
-				expect(data).toContain("Compilation  finished");
-				break;
-			case 4:
 				expect(extractSummary(data)).toMatchSnapshot();
 
 				hash1 = extractHash(data);
@@ -85,7 +74,7 @@ test("info-verbosity-verbose", async done => {
 				appendDataIfFileExists(__dirname, fileToChange, "//junk-comment");
 
 				break;
-			case 7:
+			case 2:
 				hash2 = extractHash(data);
 
 				expect(hash2.hash).not.toBe(hash1.hash);
@@ -100,6 +89,24 @@ test("info-verbosity-verbose", async done => {
 
 	webpackProc.stderr.on("data", error => {
 		// fail test case if there is any error
-		done(error.toString());
+		stderrNumber++;
+
+		switch (stderrNumber) {
+			case 1:
+			case 4:
+				expect(error.toString()).toContain("Compilation  starting");
+				break;
+			case 3:
+			case 5:
+			case 7:
+				expect(error.toString()).toContain("Compilation  finished");
+				break;
+			case 2:
+				expect(error.toString()).toContain("webpack is watching the files");
+				break;
+			default:
+				break;
+		}
+
 	});
 });
diff --git a/test/binCases/watch/multi-config-watch-opt/multi-config-watch-opt.test.js b/test/binCases/watch/multi-config-watch-opt/multi-config-watch-opt.test.js
@@ -58,9 +58,6 @@ test("multi-config-watch-opt", async done => {
 
 		switch (chunkNumber) {
 			case 1:
-				expect(data).toContain("webpack is watching the files");
-				break;
-			case 2:
 				expect(extractSummary(data)).toMatchSnapshot();
 
 				hash1 = extractHash(data);
@@ -72,7 +69,7 @@ test("multi-config-watch-opt", async done => {
 				appendDataIfFileExists(__dirname, fileToChange, "//junk-comment");
 
 				break;
-			case 3:
+			case 2:
 				hash2 = extractHash(data);
 
 				expect(hash2.hash).not.toBe(hash1.hash);
@@ -86,8 +83,7 @@ test("multi-config-watch-opt", async done => {
 	});
 
 	webpackProc.stderr.on("data", error => {
-		// fail test case if there is any error
-		done(error.toString());
+		expect(error.toString()).toContain("webpack is watching the files");
 	});
 });
 
diff --git a/test/binCases/watch/multi-config/multi-config.test.js b/test/binCases/watch/multi-config/multi-config.test.js
@@ -43,12 +43,8 @@ test("multi-config", async done => {
 	webpackProc.stdout.on("data", data => {
 		data = data.toString();
 		chunkNumber++;
-
 		switch (chunkNumber) {
 			case 1:
-				expect(data).toContain("webpack is watching the files");
-				break;
-			case 2:
 				expect(extractSummary(data)).toMatchSnapshot();
 
 				hash1 = extractHash(data);
@@ -60,7 +56,7 @@ test("multi-config", async done => {
 				appendDataIfFileExists(__dirname, fileToChange, "//junk-comment");
 
 				break;
-			case 3:
+			case 2:
 				hash2 = extractHash(data);
 
 				expect(hash2.hash).not.toBe(hash1.hash);
@@ -74,7 +70,6 @@ test("multi-config", async done => {
 	});
 
 	webpackProc.stderr.on("data", error => {
-		// fail test case if there is any error
-		done(error.toString());
+		expect(error.toString()).toContain("webpack is watching the files");
 	});
 });
diff --git a/test/binCases/watch/single-config-watch-opt/single-config-watch-opt.test.js b/test/binCases/watch/single-config-watch-opt/single-config-watch-opt.test.js
@@ -58,9 +58,6 @@ test("single-config-watch-opt", async done => {
 
 		switch (chunkNumber) {
 			case 1:
-				expect(data).toContain("webpack is watching the files");
-				break;
-			case 2:
 				expect(extractSummary(data)).toMatchSnapshot();
 
 				hash1 = extractHash(data);
@@ -72,7 +69,7 @@ test("single-config-watch-opt", async done => {
 				appendDataIfFileExists(__dirname, fileToChange, "//junk-comment");
 
 				break;
-			case 3:
+			case 2:
 				hash2 = extractHash(data);
 
 				expect(hash2.hash).not.toBe(hash1.hash);
@@ -86,8 +83,7 @@ test("single-config-watch-opt", async done => {
 	});
 
 	webpackProc.stderr.on("data", error => {
-		// fail test case if there is any error
-		done(error.toString());
+		expect(error.toString()).toContain("webpack is watching the files");
 	});
 });
 
diff --git a/test/binCases/watch/single-config/single-config.test.js b/test/binCases/watch/single-config/single-config.test.js
@@ -58,9 +58,6 @@ test("single-config", async(done) => {
 
 		switch (chunkNumber) {
 			case 1:
-				expect(data).toContain("webpack is watching the files");
-				break;
-			case 2:
 				expect(extractSummary(data)).toMatchSnapshot();
 
 				hash1 = extractHash(data);
@@ -72,7 +69,7 @@ test("single-config", async(done) => {
 				appendDataIfFileExists(__dirname, fileToChange, "//junk-comment");
 
 				break;
-			case 3:
+			case 2:
 				hash2 = extractHash(data);
 
 				expect(hash2.hash).not.toBe(hash1.hash);
@@ -86,7 +83,6 @@ test("single-config", async(done) => {
 	});
 
 	webpackProc.stderr.on("data", error => {
-		// fail test case if there is any error
-		done(error.toString());
+		expect(error.toString()).toContain("webpack is watching the files");
 	});
 });