From cc50d0baa2b52186d261f5fd855f64eab43a565b Mon Sep 17 00:00:00 2001 From: Yuhei Yasuda Date: Sat, 1 Feb 2020 23:24:47 +0900 Subject: [PATCH] Set serveStaticOptions for server.routes as well --- .../browser-sync/lib/server/static-server.js | 2 +- .../e2e/server/e2e.server.serveStatic.js | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/packages/browser-sync/lib/server/static-server.js b/packages/browser-sync/lib/server/static-server.js index edcade984..a16723072 100644 --- a/packages/browser-sync/lib/server/static-server.js +++ b/packages/browser-sync/lib/server/static-server.js @@ -69,7 +69,7 @@ module.exports = function createServer(bs) { id: "Browsersync Server Routes Middleware - " + _routes++, - handle: serveStatic(resolve(root)) + handle: serveStatic(resolve(root), serveStaticOptions) }; }) ); diff --git a/packages/browser-sync/test/specs/e2e/server/e2e.server.serveStatic.js b/packages/browser-sync/test/specs/e2e/server/e2e.server.serveStatic.js index 0565c287d..e8eab16a6 100644 --- a/packages/browser-sync/test/specs/e2e/server/e2e.server.serveStatic.js +++ b/packages/browser-sync/test/specs/e2e/server/e2e.server.serveStatic.js @@ -38,6 +38,40 @@ describe("E2E server test with serve static options", function() { }); }); }); + it("also sets the index of serve-static to routes", function(done) { + browserSync.reset(); + + var config = { + server: { + baseDir: "test/fixtures", + serveStaticOptions: { + index: "inputs.html" + }, + routes: { + "/subdir": "test/fixtures" + } + }, + logLevel: "silent", + open: false + }; + + browserSync.create().init(config, function(err, bs) { + request(bs.server) + .get("/subdir/") + .expect(200) + .end(function(err, res) { + assert.deepEqual( + require("fs").readFileSync( + "test/fixtures/inputs.html", + "utf-8" + ), + res.text + ); + bs.cleanup(); + done(); + }); + }); + }); it("sets uses the default for serve static index", function(done) { browserSync.reset();