Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Windows tests in Travis CI #832

Merged
merged 4 commits into from
Apr 25, 2019
Merged

Fix Windows tests in Travis CI #832

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3f6e34
test: Make big timeout to catch error inside Windows tests.
JSMonk Apr 25, 2019
2edf3d8
test: Write and unlink files in paralel mode.
JSMonk Apr 25, 2019
d515f5a
test: Change order of asserts.
JSMonk Apr 25, 2019
7ffc6eb
test: Change strategy of testing subdir global.
JSMonk Apr 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,18 +774,23 @@ const runTests = function(baseopts) {
await delay();
let watcher = chokidar_watch(watchPath, options);
const spy = await aspy(watcher, 'all');
setTimeout(async () => {
await write(addFile, Date.now());
await write(subFile, Date.now());
await fs_unlink(aFile);
await fs_unlink(bFile);
}, 50);
await waitFor([[spy.withArgs('add'), 3], spy.withArgs('unlink'), spy.withArgs('change')]);
spy.withArgs('add').should.have.been.calledThrice;
spy.should.have.been.calledWith('unlink', aFile);
await Promise.all([
write(addFile, Date.now()),
write(subFile, Date.now()),
fs_unlink(aFile),
fs_unlink(bFile),
]);

await waitFor([spy.withArgs('change')]);
spy.withArgs('change').should.have.been.calledOnce;
spy.should.have.been.calledWith('change', subFile);

await waitFor([spy.withArgs('unlink')]);
spy.withArgs('unlink').should.have.been.calledOnce;
spy.withArgs('change').should.have.been.calledOnce;
spy.should.have.been.calledWith('unlink', aFile);

await waitFor([[spy.withArgs('add'), 3]]);
spy.withArgs('add').should.have.been.calledThrice;
});
it('should resolve relative paths with glob patterns', async () => {
const id = subdirId.toString();
Expand All @@ -798,10 +803,10 @@ const runTests = function(baseopts) {
const spy = await aspy(watcher, 'all');

spy.should.have.been.calledWith('add');
setTimeout(async () => {
await write(addPath, Date.now());
await write(changePath, Date.now());
}, 50);
await Promise.all([
write(addPath, Date.now()),
write(changePath, Date.now())
]);
await waitFor([[spy, 3], spy.withArgs('add', addPath)]);
spy.should.have.been.calledWith('add', addPath);
spy.should.have.been.calledWith('change', changePath);
Expand Down Expand Up @@ -2010,7 +2015,7 @@ const runTests = function(baseopts) {
};

describe('chokidar', function() {
this.timeout(6000);
this.timeout(60000);
before(async () => {
let created = 0;
await rimraf(FIXTURES_PATH);
Expand Down