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

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

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);

test/binCases/watch/multi-config-watch-opt/index.js

@@ -0,0 +1 @@
+module.exports = "foo";

test/binCases/watch/multi-config-watch-opt/index2.js

@@ -0,0 +1 @@
+module.exports = "bar";

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();
+};

test/binCases/watch/multi-config-watch-opt/test.opts

@@ -0,0 +1 @@
+--watch

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")
+	}
+];

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();
+};

test/binCases/watch/single-config-watch-opt/test.opts

@@ -0,0 +1 @@
+--watch

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")
+};