Fix "no content base" option, this time with tests

Author: SpaceK33z

bin/webpack-dev-server.js

@@ -199,16 +199,16 @@ function processOptions(wpOpt) {
 	if(!options.clientLogLevel)
 		options.clientLogLevel = argv["client-log-level"];
 
-	if(!options.contentBase) {
+	if(options.contentBase === undefined) {
 		if(argv["content-base"]) {
 			options.contentBase = argv["content-base"];
 			if(/^[0-9]$/.test(options.contentBase))
 				options.contentBase = +options.contentBase;
 			else if(!/^(https?:)?\/\//.test(options.contentBase))
 				options.contentBase = path.resolve(options.contentBase);
 		// It is possible to disable the contentBase by using `--no-content-base`, which results in arg["content-base"] = false
-		} else if(argv["content-base"] !== false) {
-			options.contentBase = process.cwd();
+		} else if(argv["content-base"] === false) {
+			options.contentBase = false;
 		}
 	}
 

lib/Server.js

@@ -105,7 +105,12 @@ function Server(compiler, options) {
 		res.end("</body></html>");
 	}.bind(this));
 
-	var contentBase = options.contentBase || process.cwd();
+	var contentBase;
+	if(options.contentBase !== undefined) {
+		contentBase = options.contentBase;
+	} else {
+		contentBase = process.cwd();
+	}
 
 	var features = {
 		compress: function() {
@@ -222,7 +227,7 @@ function Server(compiler, options) {
 				// Fall back to /index.html if nothing else matches.
 				app.use(
 					historyApiFallback(typeof options.historyApiFallback === "object" ? options.historyApiFallback : null),
-					express.static(contentBase)
+					contentBase ? express.static(contentBase) : undefined
 				);
 			}
 		},
@@ -286,12 +291,12 @@ function Server(compiler, options) {
 	var defaultFeatures = ["setup", "headers", "middleware"];
 	if(options.proxy)
 		defaultFeatures.push("proxy", "middleware");
-	if(options.contentBase !== false)
+	if(contentBase !== false)
 		defaultFeatures.push("contentBaseFiles");
 	if(options.historyApiFallback)
 		defaultFeatures.push("historyApiFallback", "middleware");
 	defaultFeatures.push("magicHtml");
-	if(options.contentBase !== false)
+	if(contentBase !== false)
 		defaultFeatures.push("contentBaseIndex");
 	// compress is placed last and uses unshift so that it will be the first middleware used
 	if(options.compress)

package.json

@@ -30,9 +30,11 @@
     "less": "^2.5.1",
     "less-loader": "~2.2.0",
     "mocha": "^3.0.2",
+    "mocha-sinon": "^1.1.6",
     "pug": "^2.0.0-beta5",
     "pug-loader": "^2.3.0",
     "should": "^11.1.0",
+    "sinon": "^1.17.6",
     "style-loader": "~0.13.0",
     "supertest": "^2.0.0",
     "url-loader": "~0.5.6",

test/ContentBase.js renamed to test/ContentBase.test.js

@@ -2,6 +2,7 @@ var request = require("supertest");
 var path = require("path");
 var helper = require("./helper");
 var config = require("./fixtures/contentbase-config/webpack.config");
+require("mocha-sinon");
 
 var contentBasePublic = path.join(__dirname, "fixtures/contentbase-config/public");
 var contentBaseOther = path.join(__dirname, "fixtures/contentbase-config/other");
@@ -86,4 +87,36 @@ describe("ContentBase", function() {
 			.expect(302, done);
 		});
 	});
+
+	describe("default to PWD", function() {
+		before(function(done) {
+			this.sinon.stub(process, "cwd");
+			process.cwd.returns(contentBasePublic);
+			server = helper.start(config, {}, done);
+			req = request(server.app);
+		});
+
+		it("Request to page", function(done) {
+			req.get("/other.html")
+			.expect(200, done);
+		});
+	});
+
+	describe("disable", function() {
+		before(function(done) {
+			// This is a somewhat weird test, but it is important that we mock
+			// the PWD here, and test if /other.html in our "fake" PWD really is not requested.
+			this.sinon.stub(process, "cwd");
+			process.cwd.returns(contentBasePublic);
+			server = helper.start(config, {
+				contentBase: false
+			}, done);
+			req = request(server.app);
+		});
+
+		it("Request to page", function(done) {
+			req.get("/other.html")
+			.expect(404, done);
+		});
+	});
 });