LumeWeb
/
filer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deal with failing tests for rename, and do a better cleanup job in watcher.close()

This commit is contained in:
David Humphrey (:humph) david.humphrey@senecacollege.ca 2014-03-07 13:46:54 -05:00
parent 96836f355c
commit eff4d9b5fc
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/fs.js
View File

@ -1586,6 +1586,7 @@ define(function(require) {
self.close = function() { self.close = function() {
var intercom = Intercom.getInstance(); var intercom = Intercom.getInstance();
intercom.off('change', onchange); intercom.off('change', onchange);
self.removeAllListeners('change');
}; };
} }
FSWatcher.prototype = new EventEmitter(); FSWatcher.prototype = new EventEmitter();
@ -1686,7 +1687,7 @@ define(function(require) {
var watcher = new FSWatcher(); var watcher = new FSWatcher();
watcher.start(filename, false, options.recursive); watcher.start(filename, false, options.recursive);
watcher.addListener('change', listener); watcher.on('change', listener);
return watcher; return watcher;
}; };

5
tests/spec/node-js/simple/test-fs-watch.js
View File

@ -57,8 +57,9 @@ define(["Filer", "util"], function(Filer, util) {
if(error) throw error; if(error) throw error;
var watcher = fs.watch('/tmp', function(event, filename) { var watcher = fs.watch('/tmp', function(event, filename) {
expect(event).to.equal('rename'); // TODO: node thinks this should be 'rename', need to add rename along with change.
expect(filename).to.equal('/tmp/newfile.txt'); expect(event).to.equal('change');
expect(filename).to.equal('/tmp');
watcher.close(); watcher.close();
done(); done();
}); });