From a385973ea963448d33c5a63fc190843346f9b7b3 Mon Sep 17 00:00:00 2001 From: Remy Sharp Date: Wed, 11 Feb 2015 09:56:41 +0000 Subject: [PATCH] Fixed test failing due to mocked config --- test/monitor/match.test.js | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/test/monitor/match.test.js b/test/monitor/match.test.js index bae6454..e6ce7f9 100644 --- a/test/monitor/match.test.js +++ b/test/monitor/match.test.js @@ -201,7 +201,7 @@ describe('validating files that cause restart', function () { var settings = merge(config, defaults); var script = path.resolve('../../../lib/__init__.py'); - settings.monitor = match.rulesToMonitor(settings.watch, settings.ignore, { dirs: [] }); + settings.monitor = match.rulesToMonitor(settings.watch, settings.ignore, { dirs: [], system: { useFind: true } }); var matched = match([script], settings.monitor, settings.ext.replace(' ', ',')); process.chdir(cwd); @@ -215,7 +215,7 @@ describe('validating files that cause restart', function () { var settings = merge(config, defaults); var script = path.resolve('app.js'); - settings.monitor = match.rulesToMonitor(settings.watch, settings.ignore, { dirs: [] }); + settings.monitor = match.rulesToMonitor(settings.watch, settings.ignore, { dirs: [], system: { useFind: true } }); var matched = match([script], settings.monitor, settings.ext.replace(' ', ',')); assert(matched.result.length === 1, 'found match ' + matched.results); @@ -227,7 +227,7 @@ describe('validating files that cause restart', function () { var settings = merge(config, defaults); var script = 'public/js/chrome.save.js'; - settings.monitor = match.rulesToMonitor(settings.watch, settings.ignore, { dirs: [] }); + settings.monitor = match.rulesToMonitor(settings.watch, settings.ignore, { dirs: [], system: { useFind: true } }); var matched = match([script], settings.monitor, settings.ext.replace(' ', ',')); assert(matched.result.length === 0, 'public/* ignored: ' + matched.results); @@ -242,7 +242,7 @@ describe('validating files that cause restart', function () { var settings = merge(config, defaults); var script = path.resolve('../jsbin/scripts.json'); - settings.monitor = match.rulesToMonitor(settings.watch, settings.ignore, { dirs: [] }); + settings.monitor = match.rulesToMonitor(settings.watch, settings.ignore, { dirs: [], system: { useFind: true } }); var matched = match([script], settings.monitor, settings.ext.replace(' ', ',')); process.chdir(cwd); @@ -253,14 +253,12 @@ describe('validating files that cause restart', function () { }); describe('match rule parser', function () { - var pwd = process.cwd(); - it('should support "--watch ."', function () { var config = { watch: '.' }; var settings = merge(config, defaults); var script = 'index.js'; - settings.monitor = match.rulesToMonitor(settings.watch, [], { dirs: [] }); + settings.monitor = match.rulesToMonitor(settings.watch, [], { dirs: [], system: { useFind: true } }); assert(settings.monitor[0] === '*.*', 'path resolved: ' + settings.monitor[0]); var matched = match([script], settings.monitor, 'js'); @@ -273,7 +271,7 @@ describe('match rule parser', function () { var settings = merge(config, defaults); var script = 'index.js'; - settings.monitor = match.rulesToMonitor(settings.watch, [], { dirs: [] }); + settings.monitor = match.rulesToMonitor(settings.watch, [], { dirs: [], system: { useFind: true } }); assert(settings.monitor[0] === '*.*', 'path resolved: ' + settings.monitor[0]); var matched = match([script], settings.monitor, 'js'); @@ -285,7 +283,7 @@ describe('match rule parser', function () { var config = { watch: 'config.json' }; var settings = merge(config, defaults); - settings.monitor = match.rulesToMonitor(settings.watch, [], { dirs: [] }); + settings.monitor = match.rulesToMonitor(settings.watch, [], { dirs: [], system: { useFind: true } }); var matched = match(['/some/path/to/config.json'], settings.monitor, 'js'); assert(matched.result.length === 1, 'no file matched'); @@ -295,7 +293,7 @@ describe('match rule parser', function () { var config = { watch: '/*/config.json' }; var settings = merge(config, defaults); - settings.monitor = match.rulesToMonitor(settings.watch, [], { dirs: [] }); + settings.monitor = match.rulesToMonitor(settings.watch, [], { dirs: [], system: { useFind: true } }); var matched = match(['/some/path/to/config.json'], settings.monitor, 'js'); assert(matched.result.length === 1, 'no file matched'); @@ -307,7 +305,7 @@ describe('match rule parser', function () { var settings = merge(config, defaults); var script = 'index.js'; - settings.monitor = match.rulesToMonitor(settings.watch, [], { dirs: [] }); + settings.monitor = match.rulesToMonitor(settings.watch, [], { dirs: [], system: { useFind: true } }); assert(settings.monitor[0] === '*.*', 'path resolved: ' + settings.monitor[0]); var matched = match([script], settings.monitor, 'js'); @@ -323,7 +321,7 @@ describe('match rule parser', function () { var settings = merge(config, defaults); var script = pwd + 'index.js'; - settings.monitor = match.rulesToMonitor(settings.watch, [], { dirs: [] }); + settings.monitor = match.rulesToMonitor(settings.watch, [], { dirs: [], system: { useFind: true } }); process.chdir(cwd);