Skip to content

Commit d022c1d

Browse files
committed
fix(extensions): Ensure 'extensions' options is respected when array received - fixes #1220
1 parent 33efb4f commit d022c1d

File tree

2 files changed

+41
-0
lines changed

2 files changed

+41
-0
lines changed

lib/cli/cli-options.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,10 @@ opts.callbacks = {
259259
return Immutable.List(split);
260260
}
261261
}
262+
if (Immutable.List.isList(value)) {
263+
return value;
264+
}
265+
return value;
262266
}
263267
};
264268

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
"use strict";
2+
3+
var browserSync = require("../../../../index");
4+
var assert = require("chai").assert;
5+
var utils = require("../../../utils");
6+
var Rx = require("rx");
7+
8+
describe("E2E server test with extension option", function () {
9+
10+
it("serves using 'extensions'", function (done) {
11+
12+
browserSync.reset();
13+
14+
var config = {
15+
server: {
16+
baseDir: "test/fixtures"
17+
},
18+
extensions: ['html'],
19+
snippetOptions: {
20+
blacklist: ['/forms']
21+
},
22+
logLevel: "silent",
23+
open: false
24+
};
25+
26+
browserSync.create().init(config, function (err, bs) {
27+
assert.equal(bs.options.getIn(["server", "serveStaticOptions", "extensions", 0]), "html");
28+
var reqs = utils.getRequests([
29+
["/forms", require("fs").readFileSync("test/fixtures/forms.html", "utf-8")]
30+
], bs.server);
31+
Rx.Observable.concat(reqs).subscribeOnCompleted(function () {
32+
bs.cleanup();
33+
done();
34+
});
35+
});
36+
});
37+
});

0 commit comments

Comments
 (0)