make tests stricter for file events

test.js

@@ -17,29 +17,42 @@ const rmdir =
 				exec(`rmdir /s /q ${path.replace(/\//g, '\\')} 2> nul`).catch(() => {})
 		: path => exec('rm -rf ' + path);
 
-const sleep = (ms = 1000) => new Promise(res => setTimeout(res, ms));
+const sleep = (ms = 500) => new Promise(res => setTimeout(res, ms));
 
 function getEvents(watch) {
-	const events = new Set();
+	const files = new Set();
+	const directories = new Set();
 	watch.on('+', ({ path, stats, isNew }) => {
-		const event = `${isNew ? 'new' : 'updated'} ${
-			stats.isFile() ? 'file' : ''
-		}${stats.isDirectory() ? 'directory' : ''} ${path}`;
-		if (stats.isFile() && events.has(event)) {
-			throw new Error(`Duplicate event: ${event}`);
+		if (stats.isFile()) {
+			const event = `${isNew ? 'added' : 'updated'} ${path}`;
+			if (files.has(event)) {
+				throw new Error(`Duplicate event: ${event}`);
+			}
+			files.add(event);
+		}
+		if (stats.isDirectory()) {
+			const event = `${isNew ? 'added' : 'updated'} ${path}`;
+			directories.add(event);
 		}
-		events.add(event);
 	});
 	watch.on('-', ({ path, stats }) => {
-		const event = `deleted ${stats.isFile() ? 'file' : ''}${
-			stats.isDirectory() ? 'directory' : ''
-		} ${path}`;
-		if (stats.isFile() && events.has(event)) {
-			throw new Error(`Duplicate event: ${event}`);
+		if (stats.isFile()) {
+			const event = `deleted ${path}`;
+			if (files.has(event)) {
+				throw new Error(`Duplicate event: ${event}`);
+			}
+			files.add(event);
+		}
+		if (stats.isDirectory()) {
+			const event = `deleted ${path}`;
+			directories.add(event);
 		}
-		events.add(event);
 	});
-	return events;
+	const clear = () => {
+		files.clear();
+		directories.clear();
+	};
+	return { files, directories, clear };
 }
 
 (async () => {
@@ -50,103 +63,119 @@ function getEvents(watch) {
 
 	console.log('running tests ...');
 
-	const watch = new CheapWatch({ dir: process.cwd() });
-	const events = getEvents(watch);
-
-	await writeFile('foo', '');
-	await mkdir('bar');
-	await writeFile('bar/baz', '');
-	await watch.init();
-	assert.equal(watch.paths.size, 3);
-	assert.ok(watch.paths.get('foo').isFile());
-	assert.ok(watch.paths.get('bar').isDirectory());
-	assert.ok(watch.paths.get('bar/baz').isFile());
-
-	await writeFile('foo', '');
-	await sleep();
-	assert.ok(events.has('updated file foo'));
-	events.clear();
-
-	await writeFile('bar/qux', '');
-	await sleep();
-	assert.ok(events.has('new file bar/qux'));
-	assert.ok(events.has('updated directory bar'));
-	events.clear();
-
-	await rmdir('bar');
-	await sleep();
-	assert.ok(events.has('deleted directory bar'));
-	assert.ok(events.has('deleted file bar/baz'));
-	assert.ok(events.has('deleted file bar/qux'));
-	events.clear();
-
-	await unlink('foo');
-	await sleep();
-	assert.ok(events.has('deleted file foo'));
-	events.clear();
-
-	await Promise.all([writeFile('foo', ''), writeFile('bar', '')]);
-	await sleep();
-	assert.ok(events.has('new file foo'));
-	assert.ok(events.has('new file bar'));
-	events.clear();
-
-	watch.close();
-
-	await writeFile('foo', '');
-	await sleep();
-	assert.equal(events.size, 0);
-
-	const watch2 = new CheapWatch({
-		dir: process.cwd(),
-		filter: ({ path, stats }) =>
-			(stats.isFile() && !path.includes('skip-file')) ||
-			(stats.isDirectory() && !path.includes('skip-directory')),
-	});
-	const events2 = getEvents(watch2);
-
-	await watch2.init();
-
-	await writeFile('skip-file', '');
-	await sleep();
-	assert.equal(events2.size, 0);
-
-	await writeFile('foo', '');
-	await sleep();
-	assert.ok(events2.has('updated file foo'));
-	events2.clear();
-
-	await mkdir('skip-directory');
-	await sleep();
-	assert.equal(events2.size, 0);
-
-	await writeFile('skip-directory/foo', '');
-	await sleep();
-	assert.equal(events2.size, 0);
-
-	await mkdir('included-directory');
-	await sleep();
-	assert.ok(events2.has('new directory included-directory'));
-	await writeFile('included-directory/foo', '');
-	await sleep();
-	events2.clear();
-
-	await rename('included-directory/foo', 'included-directory/foo-2');
-	await sleep();
-	assert.ok(events2.has('deleted file included-directory/foo'));
-	assert.ok(events2.has('new file included-directory/foo-2'));
-	assert.ok(events2.has('updated directory included-directory'));
-	events2.clear();
-
-	await rename('included-directory', 'included-directory-2');
-	await sleep();
-	assert.ok(events2.has('deleted directory included-directory'));
-	assert.ok(events2.has('deleted file included-directory/foo-2'));
-	assert.ok(events2.has('new directory included-directory-2'));
-	assert.ok(events2.has('new file included-directory-2/foo-2'));
-	events2.clear();
-
-	watch2.close();
+	{
+		const watch = new CheapWatch({ dir: process.cwd() });
+		const { files, directories, clear } = getEvents(watch);
+
+		await writeFile('foo', '');
+		await mkdir('bar');
+		await writeFile('bar/baz', '');
+		await sleep();
+		await watch.init();
+		assert.equal(watch.paths.size, 3);
+		assert.ok(watch.paths.get('foo').isFile());
+		assert.ok(watch.paths.get('bar').isDirectory());
+		assert.ok(watch.paths.get('bar/baz').isFile());
+		assert.equal(files.size, 0);
+		assert.equal(directories.size, 0);
+
+		await writeFile('foo', '');
+		await sleep();
+		assert.equal(files.size, 1);
+		assert.ok(files.has('updated foo'));
+		clear();
+
+		await writeFile('bar/qux', '');
+		await sleep();
+		assert.equal(files.size, 1);
+		assert.ok(files.has('added bar/qux'));
+		assert.ok(directories.has('updated bar'));
+		clear();
+
+		await rmdir('bar');
+		await sleep();
+		assert.ok(directories.has('deleted bar'));
+		assert.equal(files.size, 2);
+		assert.ok(files.has('deleted bar/baz'));
+		assert.ok(files.has('deleted bar/qux'));
+		clear();
+
+		await unlink('foo');
+		await sleep();
+		assert.equal(files.size, 1);
+		assert.ok(files.has('deleted foo'));
+		clear();
+
+		await Promise.all([writeFile('foo', ''), writeFile('bar', '')]);
+		await sleep();
+		assert.equal(files.size, 2);
+		assert.ok(files.has('added foo'));
+		assert.ok(files.has('added bar'));
+		clear();
+
+		watch.close();
+
+		await writeFile('foo', '');
+		await sleep();
+		assert.equal(files.size, 0);
+	}
+
+	{
+		const watch = new CheapWatch({
+			dir: process.cwd(),
+			filter: ({ path, stats }) =>
+				(stats.isFile() && !path.includes('skip-file')) ||
+				(stats.isDirectory() && !path.includes('skip-directory')),
+		});
+		const { files, directories, clear } = getEvents(watch);
+
+		await watch.init();
+
+		await writeFile('skip-file', '');
+		await sleep();
+		assert.equal(files.size, 0);
+
+		await writeFile('foo', '');
+		await sleep();
+		assert.equal(files.size, 1);
+		assert.ok(files.has('updated foo'));
+		clear();
+
+		await mkdir('skip-directory');
+		await sleep();
+		assert.equal(directories.size, 0);
+
+		await writeFile('skip-directory/foo', '');
+		await sleep();
+		assert.equal(files.size, 0);
+
+		await mkdir('included-directory');
+		await sleep();
+		assert.equal(directories.size, 1);
+		assert.ok(directories.has('added included-directory'));
+		await writeFile('included-directory/foo', '');
+		await sleep();
+		clear();
+
+		await rename('included-directory/foo', 'included-directory/foo-2');
+		await sleep();
+		assert.equal(files.size, 2);
+		assert.ok(files.has('deleted included-directory/foo'));
+		assert.ok(files.has('added included-directory/foo-2'));
+		assert.ok(directories.has('updated included-directory'));
+		clear();
+
+		await rename('included-directory', 'included-directory-2');
+		await sleep();
+		assert.equal(files.size, 2);
+		assert.ok(files.has('deleted included-directory/foo-2'));
+		assert.ok(files.has('added included-directory-2/foo-2'));
+		assert.ok(directories.has('deleted included-directory'));
+		assert.ok(directories.has('added included-directory-2'));
+		clear();
+
+		watch.close();
+	}
 
 	console.log('tests successful!');