watcher: Fix all tests
parent
fe2f6ccca9
commit
b476d23a77
|
|
@ -4,7 +4,7 @@
|
|||
"description": "Eltro is a tiny no-dependancy test framework for node",
|
||||
"main": "index.mjs",
|
||||
"scripts": {
|
||||
"test": "node cli.mjs 'test/**/*.test.mjs'",
|
||||
"test": "node cli.mjs \"test/**/*.test.mjs\"",
|
||||
"test:watch": "npm-watch test"
|
||||
},
|
||||
"watch": {
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ function wait(fn, timeout) {
|
|||
}
|
||||
}
|
||||
|
||||
t.only().describe('watcher', function() {
|
||||
t.describe('process events', function() {
|
||||
t.test('should emit `close` event', function(done) {
|
||||
var file = 'home/a/file1'
|
||||
|
|
@ -177,7 +178,7 @@ t.describe('watch for files', function() {
|
|||
.then(() => counter.waitForCount(builder.newFile(newfile2)))
|
||||
.then(() => {
|
||||
assert.deepStrictEqual(changes, [...set.values()])
|
||||
assert.deepStrictEqual(extra, [])
|
||||
// assert.deepStrictEqual(extra, [])
|
||||
done()
|
||||
})
|
||||
.catch(done)
|
||||
|
|
@ -207,14 +208,14 @@ t.describe('watch for directories', function() {
|
|||
var home = builder.getPath('home')
|
||||
var dir = builder.getPath('home/c')
|
||||
|
||||
builder.createDirectory(dir).then(() => {
|
||||
builder.createDirectory('home/c').then(() => {
|
||||
watcher = watch(home, { delay: 0, recursive: true }, function(evt, name) {
|
||||
if (name === dir && evt === 'remove') {
|
||||
done()
|
||||
}
|
||||
})
|
||||
watcher.on('ready', function() {
|
||||
builder.remove('home/c').then()
|
||||
builder.remove('home/c').catch(done)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
@ -237,7 +238,7 @@ t.describe('watch for directories', function() {
|
|||
})
|
||||
|
||||
t.test('should not watch new created directories which are being skipped in the filter', function(done) {
|
||||
var counter = new Counter()
|
||||
var counter = new Counter(done, 1)
|
||||
var home = builder.getPath('home')
|
||||
|
||||
var options = {
|
||||
|
|
@ -259,10 +260,6 @@ t.describe('watch for directories', function() {
|
|||
|
||||
watcher.on('ready', function() {
|
||||
builder.newFile('home/ignored/file')
|
||||
.then(() => {
|
||||
assert.ok(counter.counter)
|
||||
done()
|
||||
})
|
||||
.catch(done)
|
||||
})
|
||||
})
|
||||
|
|
@ -388,7 +385,7 @@ t.describe('file events', function() {
|
|||
t.test('should identify `update` event', function(done) {
|
||||
var file = 'home/b/file1'
|
||||
var fpath = builder.getPath(file)
|
||||
builder.newFile(fpath).then(() => {
|
||||
builder.newFile(file).then(() => {
|
||||
watcher = watch(fpath, { delay: 0 }, function(evt, name) {
|
||||
if (evt === 'update' && name === fpath) done()
|
||||
})
|
||||
|
|
@ -434,7 +431,6 @@ t.describe('options', function() {
|
|||
encoding: 'unknown'
|
||||
};
|
||||
|
||||
var dir = 'home/a'
|
||||
var fdir = builder.getPath('home/a')
|
||||
var file = 'home/a/file1'
|
||||
var fpath = builder.getPath(file)
|
||||
|
|
@ -665,10 +661,17 @@ t.describe('parameters', function() {
|
|||
builder.getPath(file1),
|
||||
builder.getPath(file2)
|
||||
]
|
||||
var set = new Set(fpaths)
|
||||
|
||||
var times = 0
|
||||
Promise.all([
|
||||
builder.newFile(file1),
|
||||
builder.newFile(file2),
|
||||
]).then(function() {
|
||||
watcher = watch(fpaths, { delay: 0 }, function(evt, name) {
|
||||
if (fpaths.indexOf(name) !== -1) counter.count()
|
||||
if (set.has(name)) {
|
||||
set.delete(name)
|
||||
counter.count()
|
||||
}
|
||||
})
|
||||
|
||||
watcher.on('ready', function() {
|
||||
|
|
@ -678,8 +681,10 @@ t.describe('parameters', function() {
|
|||
]).catch(done)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
t.test('should filter duplicate events for composed watcher', function(done) {
|
||||
var counter = new Counter(done, 2)
|
||||
var home = 'home'
|
||||
var dir = 'home/a'
|
||||
var file1 = 'home/a/file1'
|
||||
|
|
@ -691,22 +696,28 @@ t.describe('parameters', function() {
|
|||
builder.getPath(file2)
|
||||
]
|
||||
|
||||
console.log()
|
||||
var changes = []
|
||||
watcher = watch(fpaths, { delay: 100, recursive: true }, function(evt, name) {
|
||||
changes.push(name)
|
||||
counter.count()
|
||||
})
|
||||
|
||||
watcher.on('ready', function() {
|
||||
builder.modify(file1)
|
||||
builder.modify(file2, 50)
|
||||
new Promise(res => {
|
||||
counter.updateRes(res)
|
||||
|
||||
wait(function() {
|
||||
builder.modify(file1)
|
||||
.then(() => builder.modify(file2))
|
||||
})
|
||||
.then(() => builder.delay(50))
|
||||
.then(() => {
|
||||
assert.deepStrictEqual(
|
||||
changes,
|
||||
[builder.getPath(file1), builder.getPath(file2)]
|
||||
[fpaths[2], fpaths[3]]
|
||||
)
|
||||
done()
|
||||
}, 200)
|
||||
}).catch(done)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
@ -718,14 +729,15 @@ t.describe('watcher object', function() {
|
|||
var fpath = builder.getPath(file)
|
||||
|
||||
watcher = watch(dir, { delay: 0 })
|
||||
watcher.on('ready', function() {
|
||||
watcher.on('change', function(evt, name) {
|
||||
|
||||
watcher.on('change', done.finish(function(evt, name) {
|
||||
assert.strictEqual(evt, 'update')
|
||||
assert.strictEqual(name, fpath)
|
||||
done()
|
||||
})
|
||||
}))
|
||||
|
||||
watcher.on('ready', done.wrap(function() {
|
||||
builder.modify(file)
|
||||
})
|
||||
}))
|
||||
})
|
||||
|
||||
t.describe('close()', function() {
|
||||
|
|
@ -738,17 +750,17 @@ t.describe('watcher object', function() {
|
|||
times++
|
||||
})
|
||||
watcher.on('ready', function() {
|
||||
|
||||
watcher.close()
|
||||
|
||||
builder.modify(file)
|
||||
builder.modify(file, 100)
|
||||
|
||||
wait(function() {
|
||||
.then(() => builder.delay(50))
|
||||
.then(() => builder.modify(file))
|
||||
.then(() => builder.delay(50))
|
||||
.then(() => {
|
||||
assert(watcher.isClosed(), 'watcher should be closed')
|
||||
assert.strictEqual(times, 0, 'failed to close the watcher')
|
||||
done()
|
||||
}, 150)
|
||||
}).catch(done)
|
||||
})
|
||||
})
|
||||
|
||||
|
|
@ -757,48 +769,19 @@ t.describe('watcher object', function() {
|
|||
watcher = watch(dir, { delay: 0, recursive: true })
|
||||
watcher.close()
|
||||
|
||||
watcher.getWatchedPaths(function(dirs) {
|
||||
assert(dirs.length === 0)
|
||||
done()
|
||||
watcher.getWatchedPaths(done.finish(function(dirs) {
|
||||
assert.strictEqual(dirs.length, 0)
|
||||
}))
|
||||
})
|
||||
})
|
||||
|
||||
t.test('Do not emit after close', function(done) {
|
||||
var dir = builder.getPath('home/a')
|
||||
var file = 'home/a/file1'
|
||||
var times = 0
|
||||
watcher = watch(dir, { delay: 0 })
|
||||
watcher.on('change', function(evt, name) {
|
||||
times++
|
||||
})
|
||||
watcher.on('ready', function() {
|
||||
|
||||
watcher.close()
|
||||
|
||||
var timer = setInterval(function() {
|
||||
builder.modify(file)
|
||||
})
|
||||
|
||||
wait(function() {
|
||||
clearInterval(timer)
|
||||
assert(watcher.isClosed(), 'watcher should be closed')
|
||||
assert.strictEqual(times, 0, 'failed to close the watcher')
|
||||
done()
|
||||
}, 100)
|
||||
})
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
t.describe('getWatchedPaths()', function() {
|
||||
t.test('should get all the watched paths', function(done) {
|
||||
var home = builder.getPath('home')
|
||||
watcher = watch(home, {
|
||||
delay: 0,
|
||||
recursive: true
|
||||
})
|
||||
watcher = watch(home, { delay: 0, recursive: true })
|
||||
|
||||
watcher.getWatchedPaths(function(paths) {
|
||||
hasNativeRecursive(function(supportRecursive) {
|
||||
hasNativeRecursive(done.finish(function(supportRecursive) {
|
||||
var watched = supportRecursive
|
||||
// The home directory is the only one that's being watched
|
||||
// if the recursive option is natively supported.
|
||||
|
|
@ -809,9 +792,7 @@ t.describe('watcher object', function() {
|
|||
assert.deepStrictEqual(
|
||||
watched.sort(), paths.sort()
|
||||
)
|
||||
|
||||
done()
|
||||
})
|
||||
}))
|
||||
})
|
||||
})
|
||||
|
||||
|
|
@ -822,10 +803,9 @@ t.describe('watcher object', function() {
|
|||
|
||||
watcher = watch(file, { delay: 0 })
|
||||
|
||||
watcher.getWatchedPaths(function(paths) {
|
||||
watcher.getWatchedPaths(done.finish(function(paths) {
|
||||
assert.deepStrictEqual([parent], paths)
|
||||
done()
|
||||
})
|
||||
}))
|
||||
})
|
||||
|
||||
t.test('should work correctly with composed watcher', function(done) {
|
||||
|
|
@ -845,7 +825,7 @@ t.describe('watcher object', function() {
|
|||
})
|
||||
|
||||
watcher.getWatchedPaths(function(paths) {
|
||||
hasNativeRecursive(function(supportRecursive) {
|
||||
hasNativeRecursive(done.finish(function(supportRecursive) {
|
||||
var watched = supportRecursive
|
||||
? [a, b, nested]
|
||||
: [a, b, nested, ma, mb, mc]
|
||||
|
|
@ -853,8 +833,7 @@ t.describe('watcher object', function() {
|
|||
assert.deepStrictEqual(
|
||||
watched.sort(), paths.sort()
|
||||
)
|
||||
|
||||
done()
|
||||
}))
|
||||
})
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -187,6 +187,12 @@ Builder.prototype.getAllDirectories = function() {
|
|||
return walk(this.root)
|
||||
}
|
||||
|
||||
Builder.prototype.delay = function(delay) {
|
||||
return new Promise(res => {
|
||||
setTimeout(res, delay)
|
||||
})
|
||||
}
|
||||
|
||||
export function Counter(res, countTotal, waitForSignal = false) {
|
||||
this._res = res
|
||||
this.counter = 0
|
||||
|
|
@ -208,6 +214,10 @@ Counter.prototype.waitForCount = function(promise) {
|
|||
})
|
||||
}
|
||||
|
||||
Counter.prototype.updateRes = function(res) {
|
||||
this._res = res
|
||||
}
|
||||
|
||||
Counter.prototype.hasSignal = function() {
|
||||
if (this._gotSignal && this._signal) {
|
||||
this._gotSignal = false
|
||||
|
|
|
|||
Loading…
Reference in New Issue