Test with AVA 6

Author: novemberborn

ava.config.js

@@ -4,7 +4,9 @@ const skipWatchMode = process.env.TEST_AVA_SKIP_WATCH_MODE ? ['!test/watch-mode/
 
 export default { // eslint-disable-line import/no-anonymous-default-export
 	files: ['test/**', '!test/**/{fixtures,helpers}/**', ...skipWatchMode],
-	ignoredByWatcher: ['{coverage,docs,media,test-types,test-tap}/**'],
+	watchMode: {
+		ignoreChanges: ['{coverage,docs,media,test-types,test-tap}/**'],
+	},
 	environmentVariables: {
 		AVA_FAKE_SCM_ROOT: '.fake-root', // This is an internal test flag.
 	},

package-lock.json

@@ -4,9 +4,9 @@ set -ex
 # Set environment variable to have the AVA config skip wathch mode tests.
 TEST_AVA_SKIP_WATCH_MODE=1 npx c8 --report=none npx test-ava
 
-# Reduce concurrency and be generous with timeouts to give watch mode tests a
-# better chance of succeeding in a CI environment.
-npx c8 --report=none --no-clean npx test-ava --serial --timeout 30s test/watch-mode
+# Reduce concurrency to give watch mode tests a better chance of succeeding in
+# a CI environment.
+npx c8 --report=none --no-clean npx test-ava --serial test/watch-mode
 
 # Only run reporter tests on Linux where they're least likely to flake out.
 case "$(uname -s)" in

scripts/ci.sh

@@ -80,15 +80,13 @@ export const withFixture = fixture => async (t, task) => {
 				const assertIdle = async next => {
 					assertingIdle = true;
 
-					// TODO: When testing using AVA 6, enable for better managed timeouts.
-					// t.timeout(10_000);
+					t.timeout(30_000);
 
 					const promise = Promise.all([delay(5000, null, {ref: false}), next?.()]).finally(() => {
 						if (idlePromise === promise) {
 							idlePromise = new Promise(() => {});
 							assertingIdle = false;
-							// TODO: When testing using AVA 6, enable for better managed timeouts.
-							// t.timeout.clear();
+							t.timeout.clear();
 							if (failedIdleAssertion) {
 								failedIdleAssertion = false;
 								t.fail('Watcher performed a test run while it should have been idle');