Fix regression with watch cli opt, add tests for this case

malstoun · malstoun · commit 0ec7de9fae5c · 2017-01-17T16:25:55.000+03:00
diff --git a/bin/webpack.js b/bin/webpack.js
@@ -344,8 +344,8 @@ function processOptions(options) {
 			});
 		}
 	}
-	if(firstOptions.watch) {
-		var watchOptions = firstOptions.watchOptions || firstOptions.watch || {};
+	if(firstOptions.watch || options.watch) {
+		var watchOptions = firstOptions.watchOptions || firstOptions.watch || options.watch || {};
 		if(watchOptions.stdin) {
 			process.stdin.on("end", function() {
 				process.exit(0); // eslint-disable-line
diff --git a/test/BinTestCases.test.js b/test/BinTestCases.test.js
@@ -93,7 +93,7 @@ describe("BinTestCases", function() {
 
 							setTimeout(() => {
 								if(env.code) {
-									done(env.error)
+									done(`Watch didn't run ${env.error}`)
 								}
 
 								const stdout = convertToArrayOfLines(env.stdout);
diff --git a/test/binCases/watch/multi-config-watch-opt/async b/test/binCases/watch/multi-config-watch-opt/async
diff --git a/test/binCases/watch/multi-config-watch-opt/index.js b/test/binCases/watch/multi-config-watch-opt/index.js
@@ -0,0 +1 @@
+module.exports = "foo";
diff --git a/test/binCases/watch/multi-config-watch-opt/index2.js b/test/binCases/watch/multi-config-watch-opt/index2.js
@@ -0,0 +1 @@
+module.exports = "bar";
diff --git a/test/binCases/watch/multi-config-watch-opt/test.js b/test/binCases/watch/multi-config-watch-opt/test.js
@@ -0,0 +1,10 @@
+"use strict";
+
+module.exports = function testAssertions(stdout, stderr, done) {
+	stdout.should.be.ok();
+	stdout[0].should.containEql("");
+	stdout[1].should.containEql("Webpack is watching the files…");
+
+	stderr.should.be.empty();
+	done();
+};
diff --git a/test/binCases/watch/multi-config-watch-opt/test.opts b/test/binCases/watch/multi-config-watch-opt/test.opts
@@ -0,0 +1 @@
+--watch
diff --git a/test/binCases/watch/multi-config-watch-opt/webpack.config.js b/test/binCases/watch/multi-config-watch-opt/webpack.config.js
@@ -0,0 +1,10 @@
+var path = require("path");
+
+module.exports = [
+	{
+		entry: path.resolve(__dirname, "./index")
+	},
+	{
+		entry: path.resolve(__dirname, "./index2")
+	}
+];
diff --git a/test/binCases/watch/single-config-watch-opt/async b/test/binCases/watch/single-config-watch-opt/async
diff --git a/test/binCases/watch/single-config-watch-opt/test.js b/test/binCases/watch/single-config-watch-opt/test.js
@@ -0,0 +1,10 @@
+"use strict";
+
+module.exports = function testAssertions(stdout, stderr, done) {
+	stdout.should.be.ok();
+	stdout[0].should.containEql("");
+	stdout[1].should.containEql("Webpack is watching the files…");
+
+	stderr.should.be.empty();
+	done();
+};
diff --git a/test/binCases/watch/single-config-watch-opt/test.opts b/test/binCases/watch/single-config-watch-opt/test.opts
@@ -0,0 +1 @@
+--watch
diff --git a/test/binCases/watch/single-config-watch-opt/webpack.config.js b/test/binCases/watch/single-config-watch-opt/webpack.config.js
@@ -0,0 +1,5 @@
+var path = require("path");
+
+module.exports = {
+	entry: path.resolve(__dirname, "./index")
+};

Original file line number	Diff line number	Diff line change
`@@ -344,8 +344,8 @@ function processOptions(options) {`
`344`	`344`	`});`
`345`	`345`	`}`
`346`	`346`	`}`
`347`		`- if(firstOptions.watch) {`
`348`		`- var watchOptions = firstOptions.watchOptions \|\| firstOptions.watch \|\| {};`
	`347`	`+ if(firstOptions.watch \|\| options.watch) {`
	`348`	`+ var watchOptions = firstOptions.watchOptions \|\| firstOptions.watch \|\| options.watch \|\| {};`
`349`	`349`	`if(watchOptions.stdin) {`
`350`	`350`	`process.stdin.on("end", function() {`
`351`	`351`	`process.exit(0); // eslint-disable-line`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ describe("BinTestCases", function() {`
`93`	`93`
`94`	`94`	`setTimeout(() => {`
`95`	`95`	`if(env.code) {`
`96`		`- done(env.error)`
	`96`	+ done(`Watch didn't run ${env.error}`)
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`const stdout = convertToArrayOfLines(env.stdout);`