diff --git a/lib/cli/transforms/copyCLIIgnoreToWatchOptions.ts b/lib/cli/transforms/copyCLIIgnoreToWatchOptions.ts index 72a646246..cb8bc7189 100644 --- a/lib/cli/transforms/copyCLIIgnoreToWatchOptions.ts +++ b/lib/cli/transforms/copyCLIIgnoreToWatchOptions.ts @@ -5,7 +5,6 @@ export function copyCLIIgnoreToWatchOptions(incoming) { return incoming; } return incoming.updateIn(["watchOptions", "ignored"], List([]), ignored => { - const userIgnore = List([]).concat(incoming.get("ignore")); - return ignored.concat(userIgnore); + return List([]).concat(ignored, incoming.get("ignore")); }); } diff --git a/test/specs/cli/cli.options.watch.js b/test/specs/cli/cli.options.watch.js index 8928bb639..f1c031d4a 100644 --- a/test/specs/cli/cli.options.watch.js +++ b/test/specs/cli/cli.options.watch.js @@ -122,4 +122,17 @@ describe("CLI: Options: Merging Watch Option", function() { config.getIn(["watchOptions", "ignored"]).contains("*.json2") ); }); + it("merges from server, serveStatic + ignore path + watchOptions.ignore (string)", function() { + var input = { + server: ["."], + watch: true, + ignore: ["*.json", "*.json2"], + watchOptions: { ignored: "*.txt" } + }; + var config = merge(input); + + assert.ok(config.getIn(["watchOptions", "ignored"]).contains("*.json")); + assert.ok(config.getIn(["watchOptions", "ignored"]).contains("*.json2")); + assert.ok(config.getIn(["watchOptions", "ignored"]).contains("*.txt")); + }); });