Skip to content

Commit

Permalink
Attempt to fix glob tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@phated
phated committed Dec 28, 2017
1 parent cde757a commit a92f089
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 22 deletions.
16 changes: 13 additions & 3 deletions index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ var isGlob = require('is-glob');
var isAbsolute = require('path-is-absolute');
var inherits = require('inherits');
var braces = require('braces');
var normalizePath = require('normalize-path')

var NodeFsHandler = require('./lib/nodefs-handler');
var FsEventsHandler = require('./lib/fsevents-handler');
Expand Down Expand Up @@ -586,6 +587,7 @@ FSWatcher.prototype._closePath = function(path) {

// Returns an instance of FSWatcher for chaining.
FSWatcher.prototype.add = function(paths, _origAdd, _internal) {
var disableGlobbing = this.options.disableGlobbing;
var cwd = this.options.cwd;
this.closed = false;
paths = flatten(arrify(paths));
Expand All @@ -595,12 +597,20 @@ FSWatcher.prototype.add = function(paths, _origAdd, _internal) {
}

if (cwd) paths = paths.map(function(path) {
var absPath;
if (isAbsolute(path)) {
return path;
absPath = path;
} else if (path[0] === '!') {
return '!' + sysPath.join(cwd, path.substring(1));
absPath = '!' + sysPath.join(cwd, path.substring(1));
} else {
return sysPath.join(cwd, path);
absPath = sysPath.join(cwd, path);
}

// Check `path` instead of `absPath` because the cwd portion can't be a glob
if (disableGlobbing || !isGlob(path)) {
return absPath;
} else {
return normalizePath(absPath);
}
});

Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
"inherits": "^2.0.1",
"is-binary-path": "^1.0.0",
"is-glob": "^4.0.0",
"normalize-path": "^2.1.1",
"path-is-absolute": "^1.0.0",
"readdirp": "^2.0.0"
}
Expand Down
48 changes: 29 additions & 19 deletions test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ function getFixturePath (subPath) {
subPath
);
}
function getGlobPath (subPath) {
return upath.join(
__dirname,
'test-fixtures',
subdir && subdir.toString() || '',
subPath
);
}

var watcher,
watcher2,
Expand Down Expand Up @@ -516,10 +524,10 @@ function runTests(baseopts) {
before(closeWatchers);
it('should correctly watch and emit based on glob input', function(done) {
var spy = sinon.spy();
var testPath = getFixturePath('*a*.txt');
var watchPath = getGlobPath('*a*.txt');
var addPath = getFixturePath('add.txt');
var changePath = getFixturePath('change.txt');
watcher = chokidar.watch(testPath, options)
watcher = chokidar.watch(watchPath, options)
.on('all', spy)
.on('ready', function() {
spy.should.have.been.calledWith('add', changePath);
Expand All @@ -538,10 +546,10 @@ function runTests(baseopts) {
});
it('should respect negated glob patterns', function(done) {
var spy = sinon.spy();
var testPath = getFixturePath('*');
var negatedPath = '!' + getFixturePath('*a*.txt');
var watchPath = getGlobPath('*');
var negatedWatchPath = '!' + getGlobPath('*a*.txt');
var unlinkPath = getFixturePath('unlink.txt');
watcher = chokidar.watch([testPath, negatedPath], options)
watcher = chokidar.watch([watchPath, negatedWatchPath], options)
.on('all', spy)
.on('ready', function() {
spy.should.have.been.calledOnce;
Expand All @@ -556,7 +564,7 @@ function runTests(baseopts) {
});
it('should traverse subdirs to match globstar patterns', function(done) {
var spy = sinon.spy();
var watchPath = getFixturePath('../../test-*/' + subdir + '/**/a*.txt');
var watchPath = getGlobPath('../../test-*/' + subdir + '/**/a*.txt');
fs.mkdirSync(getFixturePath('subdir'), 0x1ed);
fs.mkdirSync(getFixturePath('subdir/subsub'), 0x1ed);
fs.writeFileSync(getFixturePath('subdir/a.txt'), 'b');
Expand Down Expand Up @@ -587,12 +595,12 @@ function runTests(baseopts) {
});
it('should resolve relative paths with glob patterns', function(done) {
var spy = sinon.spy();
var testPath = 'test-*/' + subdir + '/*a*.txt';
var watchPath = 'test-*/' + subdir + '/*a*.txt';
// getFixturePath() returns absolute paths, so use sysPath.join() instead
var addPath = sysPath.join('test-fixtures', subdir.toString(), 'add.txt');
var changePath = sysPath.join('test-fixtures', subdir.toString(), 'change.txt');
var unlinkPath = sysPath.join('test-fixtures', subdir.toString(), 'unlink.txt');
watcher = chokidar.watch(testPath, options)
watcher = chokidar.watch(watchPath, options)
.on('all', spy)
.on('ready', function() {
spy.should.have.been.calledWith('add', changePath);
Expand All @@ -615,7 +623,7 @@ function runTests(baseopts) {
var changePath = getFixturePath('change.txt');
var unlinkPath = getFixturePath('unlink.txt');
var addPath = getFixturePath('add.txt');
var watchPaths = [getFixturePath('change*'), getFixturePath('unlink*')];
var watchPaths = [getGlobPath('change*'), getGlobPath('unlink*')];
watcher = chokidar.watch(watchPaths, options)
.on('all', spy)
.on('ready', function() {
Expand All @@ -639,7 +647,7 @@ function runTests(baseopts) {
it('should correctly handle intersecting glob patterns', function(done) {
var spy = sinon.spy();
var changePath = getFixturePath('change.txt');
var watchPaths = [getFixturePath('cha*'), getFixturePath('*nge.*')];
var watchPaths = [getGlobPath('cha*'), getGlobPath('*nge.*')];
watcher = chokidar.watch(watchPaths, options)
.on('all', spy)
.on('ready', function() {
Expand Down Expand Up @@ -674,10 +682,11 @@ function runTests(baseopts) {
var spy = sinon.spy();
var filePath = getFixturePath('nota[glob]/a.txt');
var watchPath = getFixturePath('nota[glob]');
var testDir = getFixturePath('nota[glob]');
var matchingDir = getFixturePath('notag');
var matchingFile = getFixturePath('notag/b.txt');
var matchingFile2 = getFixturePath('notal');
fs.mkdirSync(watchPath, 0x1ed);
fs.mkdirSync(testDir, 0x1ed);
fs.writeFileSync(filePath, 'b');
fs.mkdirSync(matchingDir, 0x1ed);
fs.writeFileSync(matchingFile, 'c');
Expand All @@ -700,6 +709,7 @@ function runTests(baseopts) {
options.disableGlobbing = true;
var spy = sinon.spy();
var filePath = getFixturePath('nota[glob]');
// This isn't using getGlobPath because it isn't treated as a glob
var watchPath = getFixturePath('nota[glob]');
var matchingDir = getFixturePath('notag');
var matchingFile = getFixturePath('notag/a.txt');
Expand All @@ -725,7 +735,7 @@ function runTests(baseopts) {
it('should not prematurely filter dirs against complex globstar patterns', function(done) {
var spy = sinon.spy();
var deepFile = getFixturePath('subdir/subsub/subsubsub/a.txt');
var watchPath = getFixturePath('../../test-*/' + subdir + '/**/subsubsub/*.txt');
var watchPath = getGlobPath('../../test-*/' + subdir + '/**/subsubsub/*.txt');
fs.mkdirSync(getFixturePath('subdir'), 0x1ed);
fs.mkdirSync(getFixturePath('subdir/subsub'), 0x1ed);
fs.mkdirSync(getFixturePath('subdir/subsub/subsubsub'), 0x1ed);
Expand All @@ -744,7 +754,7 @@ function runTests(baseopts) {
it('should emit matching dir events', function(done) {
var spy = sinon.spy();
// test with and without globstar matches
var watchPaths = [getFixturePath('*'), getFixturePath('subdir/subsub/**/*')];
var watchPaths = [getGlobPath('*'), getGlobPath('subdir/subsub/**/*')];
var deepDir = getFixturePath('subdir/subsub/subsubsub');
var deepFile = sysPath.join(deepDir, 'a.txt');
fs.mkdirSync(getFixturePath('subdir'), 0x1ed);
Expand All @@ -770,7 +780,7 @@ function runTests(baseopts) {
});
it('should correctly handle glob with braces', function(done) {
var spy = sinon.spy();
var watchPath = upath.normalizeSafe(getFixturePath('{subdir/*,subdir1/subsub1}/subsubsub/*.txt'));
var watchPath = upath.normalizeSafe(getGlobPath('{subdir/*,subdir1/subsub1}/subsubsub/*.txt'));
var deepFileA = getFixturePath('subdir/subsub/subsubsub/a.txt');
var deepFileB = getFixturePath('subdir1/subsub1/subsubsub/a.txt');
fs.mkdirSync(getFixturePath('subdir'), 0x1ed);
Expand Down Expand Up @@ -966,8 +976,8 @@ function runTests(baseopts) {
var dirSpy = sinon.spy(function dirSpy(){});
var addSpy = sinon.spy(function addSpy(){});
// test with relative path to ensure proper resolution
var watchDir = sysPath.relative(process.cwd(), linkedDir);
watcher = chokidar.watch(sysPath.join(watchDir, '**/*'), options)
var watchDir = upath.relative(process.cwd(), linkedDir);
watcher = chokidar.watch(upath.join(watchDir, '**/*'), options)
.on('addDir', dirSpy)
.on('add', addSpy)
.on('ready', function() {
Expand Down Expand Up @@ -1413,7 +1423,7 @@ function runTests(baseopts) {
var options2 = {};
Object.keys(options).forEach(function(key) { options2[key] = options[key] });
options2.cwd = getFixturePath('subdir');
watcher = chokidar.watch(getFixturePath('**'), options)
watcher = chokidar.watch(getGlobPath('**'), options)
.on('all', spy1)
.on('ready', w(function() {
watcher2 = chokidar.watch(fixturesPath, options2)
Expand Down Expand Up @@ -1754,8 +1764,8 @@ function runTests(baseopts) {
.on('all', spy)
.on('ready', w(function() {
// test with both relative and absolute paths
var subdirRel = sysPath.relative(process.cwd(), getFixturePath('subdir'));
watcher.unwatch([subdirRel, getFixturePath('unl*')]);
var subdirRel = upath.relative(process.cwd(), getFixturePath('subdir'));
watcher.unwatch([subdirRel, getGlobPath('unl*')]);
w(function() {
fs.unlink(getFixturePath('unlink.txt'), simpleCb);
fs.writeFile(getFixturePath('subdir/add.txt'), Date.now(), simpleCb);
Expand Down

0 comments on commit a92f089

Please sign in to comment.