fix for #625 broken historyApiFallback (#627)

* fix for #625 broken historyApiFallback

* historyApiFallback rewrite option tests added

Author: mac2000

lib/Server.js

@@ -279,11 +279,11 @@ function Server(compiler, options) {
 	var defaultFeatures = ["setup", "headers", "middleware"];
 	if(options.proxy)
 		defaultFeatures.push("proxy", "middleware");
+	if(options.historyApiFallback)
+		defaultFeatures.push("historyApiFallback", "middleware");
 	defaultFeatures.push("magicHtml");
 	if(options.contentBase !== false)
 		defaultFeatures.push("contentBase");
-	if(options.historyApiFallback)
-		defaultFeatures.push("historyApiFallback", "middleware");
 	// compress is placed last and uses unshift so that it will be the first middleware used
 	if(options.compress)
 		defaultFeatures.unshift("compress");

test/HistoryApiFallback.test.js

@@ -47,8 +47,7 @@ describe("HistoryApiFallback", function() {
 			server = helper.start(config2, {
 				contentBase: path.join(__dirname, "fixtures/historyapifallback-2-config"),
 				historyApiFallback: {
-					index: "/bar.html",
-					disableDotRule: true
+					index: "/bar.html"
 				}
 			}, done);
 			req = request(server.app);
@@ -72,4 +71,43 @@ describe("HistoryApiFallback", function() {
 			.expect(200, /Other file/, done);
 		});
 	});
+
+	describe("as object with contentBase and rewrites", function() {
+		before(function(done) {
+			server = helper.start(config2, {
+				contentBase: path.join(__dirname, "fixtures/historyapifallback-2-config"),
+				historyApiFallback: {
+					rewrites: [
+						{
+							from: /other/,
+							to: "/other.html"
+						},
+						{
+							from: /.*/,
+							to: "/bar.html"
+						}
+					]
+				}
+			}, done);
+			req = request(server.app);
+		});
+
+		it("historyApiFallback respect rewrites for index", function(done) {
+			req.get("/")
+			.accept("html")
+			.expect(200, /Foobar/, done);
+		});
+
+		it("historyApiFallback respect rewrites and shows index for unknown urls", function(done) {
+			req.get("/acme")
+			.accept("html")
+			.expect(200, /Foobar/, done);
+		});
+
+		it("historyApiFallback respect any other specified rewrites", function(done) {
+			req.get("/other")
+			.accept("html")
+			.expect(200, /Other file/, done);
+		});
+	});
 });