Merge pull request #291 from mehiel/issue-289-unwatch-watch

Cleanup watcher's state after unwatching a path (fixes #289)
paulmillr · Jul 22, 2015 · 6c7b411 · 6c7b411
2 parents 01263e3 + 6fb6999
commit 6c7b411
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/index.js b/index.js
@@ -449,6 +449,8 @@ FSWatcher.prototype.unwatch = function(paths) {
   paths.forEach(function(path) {
     if (this._closers[path]) {
       this._closers[path]();
+      delete this._closers[path];
+      this._getWatchedDir(sysPath.dirname(path)).remove(sysPath.basename(path));
     } else {
       this._ignoredPaths[path] = true;
       if (path in this._watched) this._ignoredPaths[path + '/**/*'] = true;

diff --git a/test.js b/test.js
@@ -1283,6 +1283,23 @@ function runTests(options) {
           }));
       })();
     });
+    it('should watch paths the were unwatched and added again', function(done) {
+      var spy = sinon.spy();
+      var watchPaths = [getFixturePath('change.txt')];
+      watcher = chokidar.watch(watchPaths, options)
+        .on('all', spy)
+        .on('ready', d(function() {
+          watcher.unwatch(getFixturePath('change.txt'));
+          watcher.add(getFixturePath('change.txt'));
+
+          fs.writeFileSync(getFixturePath('change.txt'), 'c');
+          waitFor([spy], function() {
+            spy.should.have.been.calledWith('change', getFixturePath('change.txt'));
+            spy.should.have.been.calledOnce;
+            done();
+          });
+        }));
+    });
   });
   describe('close', function() {
     beforeEach(clean);