Upgrade ava and ensure correct cleanup after tests

electerious · electerious · commit 226d4885ac98 · 2026-02-21T14:56:13.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
     "@apollo/client": "^3.14.0",
     "@electerious/eslint-config": "^5.2.2",
     "@electerious/prettier-config": "^4.0.1",
-    "ava": "^5.3.1",
+    "ava": "^6.4.1",
     "classnames": "^2.5.1",
     "eslint": "^9.39.3",
     "formbase": "^12.0.3",
diff --git a/src/utils/salt.js b/src/utils/salt.js
@@ -8,6 +8,6 @@ let salt = generate()
 const rule = new schedule.RecurrenceRule()
 rule.hour = 0
 
-schedule.scheduleJob(rule, () => (salt = generate()))
+export const job = schedule.scheduleJob(rule, () => (salt = generate()))
 
 export default () => salt
diff --git a/test/resolvers/_utils.js b/test/resolvers/_utils.js
@@ -9,6 +9,7 @@ import Record from '../../src/models/Record.js'
 import Token from '../../src/models/Token.js'
 import connect from '../../src/utils/connect.js'
 import createArray from '../../src/utils/createArray.js'
+import { job as saltJob } from '../../src/utils/salt.js'
 import { day, minute } from '../../src/utils/times.js'
 
 const mongoDb = MongoMemoryServer.create()
@@ -71,9 +72,16 @@ export const cleanupDatabase = async (t) => {
   })
 }
 
-export const disconnectFromDatabase = async () => {
-  mongoose.disconnect()
-  ;(await mongoDb).stop()
+export const cleanup = (server) => async () => {
+  // Ensure database is disconnected and in-memory MongoDB is stopped
+  await mongoose.disconnect()
+  await (await mongoDb).stop()
+
+  // Cancel the daily salt generation job
+  saltJob.cancel()
+
+  // Close the server to prevent open handles
+  server.close()
 }
 
 export const api = async (base, body, token, headers = {}) => {
diff --git a/test/resolvers/actions.js b/test/resolvers/actions.js
@@ -3,7 +3,7 @@ import { randomUUID as uuid } from 'node:crypto'
 import listen from 'test-listen'
 
 import server from '../../src/server.js'
-import { api, cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase, gql } from './_utils.js'
+import { api, cleanup, cleanupDatabase, connectToDatabase, fillDatabase, gql } from './_utils.js'
 
 const base = listen(server)
 
@@ -16,7 +16,7 @@ const updatedKey = uuid()
 const updatedValue = null
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/resolvers/domainStatistics/browsers.js b/test/resolvers/domainStatistics/browsers.js
@@ -2,13 +2,13 @@ import test from 'ava'
 import listen from 'test-listen'
 
 import server from '../../../src/server.js'
-import { cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase } from '../_utils.js'
+import { cleanup, cleanupDatabase, connectToDatabase, fillDatabase } from '../_utils.js'
 import { getStats } from './_utils.js'
 
 const base = listen(server)
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/resolvers/domainStatistics/devices.js b/test/resolvers/domainStatistics/devices.js
@@ -2,13 +2,13 @@ import test from 'ava'
 import listen from 'test-listen'
 
 import server from '../../../src/server.js'
-import { cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase } from '../_utils.js'
+import { cleanup, cleanupDatabase, connectToDatabase, fillDatabase } from '../_utils.js'
 import { getStats } from './_utils.js'
 
 const base = listen(server)
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/resolvers/domainStatistics/durations.js b/test/resolvers/domainStatistics/durations.js
@@ -3,13 +3,13 @@ import listen from 'test-listen'
 
 import server from '../../../src/server.js'
 import { minute } from '../../../src/utils/times.js'
-import { cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase } from '../_utils.js'
+import { cleanup, cleanupDatabase, connectToDatabase, fillDatabase } from '../_utils.js'
 import { getStats } from './_utils.js'
 
 const base = listen(server)
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/resolvers/domainStatistics/languages.js b/test/resolvers/domainStatistics/languages.js
@@ -2,13 +2,13 @@ import test from 'ava'
 import listen from 'test-listen'
 
 import server from '../../../src/server.js'
-import { cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase } from '../_utils.js'
+import { cleanup, cleanupDatabase, connectToDatabase, fillDatabase } from '../_utils.js'
 import { getStats } from './_utils.js'
 
 const base = listen(server)
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/resolvers/domainStatistics/pages.js b/test/resolvers/domainStatistics/pages.js
@@ -2,13 +2,13 @@ import test from 'ava'
 import listen from 'test-listen'
 
 import server from '../../../src/server.js'
-import { cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase } from '../_utils.js'
+import { cleanup, cleanupDatabase, connectToDatabase, fillDatabase } from '../_utils.js'
 import { getStats } from './_utils.js'
 
 const base = listen(server)
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/resolvers/domainStatistics/referrers.js b/test/resolvers/domainStatistics/referrers.js
@@ -2,13 +2,13 @@ import test from 'ava'
 import listen from 'test-listen'
 
 import server from '../../../src/server.js'
-import { cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase } from '../_utils.js'
+import { cleanup, cleanupDatabase, connectToDatabase, fillDatabase } from '../_utils.js'
 import { getStats } from './_utils.js'
 
 const base = listen(server)
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/resolvers/domainStatistics/sizes.js b/test/resolvers/domainStatistics/sizes.js
@@ -2,13 +2,13 @@ import test from 'ava'
 import listen from 'test-listen'
 
 import server from '../../../src/server.js'
-import { cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase } from '../_utils.js'
+import { cleanup, cleanupDatabase, connectToDatabase, fillDatabase } from '../_utils.js'
 import { getStats } from './_utils.js'
 
 const base = listen(server)
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/resolvers/domainStatistics/systems.js b/test/resolvers/domainStatistics/systems.js
@@ -2,13 +2,13 @@ import test from 'ava'
 import listen from 'test-listen'
 
 import server from '../../../src/server.js'
-import { cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase } from '../_utils.js'
+import { cleanup, cleanupDatabase, connectToDatabase, fillDatabase } from '../_utils.js'
 import { getStats } from './_utils.js'
 
 const base = listen(server)
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/resolvers/domainStatistics/views.js b/test/resolvers/domainStatistics/views.js
@@ -2,13 +2,13 @@ import test from 'ava'
 import listen from 'test-listen'
 
 import server from '../../../src/server.js'
-import { cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase } from '../_utils.js'
+import { cleanup, cleanupDatabase, connectToDatabase, fillDatabase } from '../_utils.js'
 import { getStats } from './_utils.js'
 
 const base = listen(server)
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/resolvers/domains.js b/test/resolvers/domains.js
@@ -3,7 +3,7 @@ import { randomUUID as uuid } from 'node:crypto'
 import listen from 'test-listen'
 
 import server from '../../src/server.js'
-import { api, cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase, gql } from './_utils.js'
+import { api, cleanup, cleanupDatabase, connectToDatabase, fillDatabase, gql } from './_utils.js'
 
 const base = listen(server)
 
@@ -13,7 +13,7 @@ const defaultTitle = uuid()
 const updatedTitle = uuid()
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/resolvers/eventStatistics/chart.js b/test/resolvers/eventStatistics/chart.js
@@ -2,13 +2,13 @@ import test from 'ava'
 import listen from 'test-listen'
 
 import server from '../../../src/server.js'
-import { cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase } from '../_utils.js'
+import { cleanup, cleanupDatabase, connectToDatabase, fillDatabase } from '../_utils.js'
 import { getStats } from './_utils.js'
 
 const base = listen(server)
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/resolvers/eventStatistics/list.js b/test/resolvers/eventStatistics/list.js
@@ -2,13 +2,13 @@ import test from 'ava'
 import listen from 'test-listen'
 
 import server from '../../../src/server.js'
-import { cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase } from '../_utils.js'
+import { cleanup, cleanupDatabase, connectToDatabase, fillDatabase } from '../_utils.js'
 import { getStats } from './_utils.js'
 
 const base = listen(server)
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/resolvers/events.js b/test/resolvers/events.js
@@ -3,7 +3,7 @@ import { randomUUID as uuid } from 'node:crypto'
 import listen from 'test-listen'
 
 import server from '../../src/server.js'
-import { api, cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase, gql } from './_utils.js'
+import { api, cleanup, cleanupDatabase, connectToDatabase, fillDatabase, gql } from './_utils.js'
 
 const base = listen(server)
 
@@ -15,7 +15,7 @@ const updatedTitle = uuid()
 const updatedType = 'TOTAL_LIST'
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/resolvers/facts.js b/test/resolvers/facts.js
@@ -2,12 +2,12 @@ import test from 'ava'
 import listen from 'test-listen'
 
 import server from '../../src/server.js'
-import { api, cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase, gql } from './_utils.js'
+import { api, cleanup, cleanupDatabase, connectToDatabase, fillDatabase, gql } from './_utils.js'
 
 const base = listen(server)
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/resolvers/permanentTokens.js b/test/resolvers/permanentTokens.js
@@ -3,7 +3,7 @@ import { randomUUID as uuid } from 'node:crypto'
 import listen from 'test-listen'
 
 import server from '../../src/server.js'
-import { api, cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase, gql } from './_utils.js'
+import { api, cleanup, cleanupDatabase, connectToDatabase, fillDatabase, gql } from './_utils.js'
 
 const base = listen(server)
 
@@ -13,7 +13,7 @@ const defaultTitle = uuid()
 const updatedTitle = uuid()
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/resolvers/records.js b/test/resolvers/records.js
@@ -2,15 +2,15 @@ import test from 'ava'
 import listen from 'test-listen'
 
 import server from '../../src/server.js'
-import { api, cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase, gql } from './_utils.js'
+import { api, cleanup, cleanupDatabase, connectToDatabase, fillDatabase, gql } from './_utils.js'
 
 const base = listen(server)
 
 let validRecord
 let ignoredRecord
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/resolvers/tokens.js b/test/resolvers/tokens.js
@@ -3,14 +3,14 @@ import mockedEnv from 'mocked-env'
 import listen from 'test-listen'
 
 import server from '../../src/server.js'
-import { api, cleanupDatabase, connectToDatabase, disconnectFromDatabase, fillDatabase, gql } from './_utils.js'
+import { api, cleanup, cleanupDatabase, connectToDatabase, fillDatabase, gql } from './_utils.js'
 
 const base = listen(server)
 
 let validToken
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(fillDatabase)
 test.afterEach.always(cleanupDatabase)
 
diff --git a/test/server.js b/test/server.js
@@ -3,9 +3,15 @@ import { randomUUID as uuid } from 'node:crypto'
 import listen from 'test-listen'
 
 import server from '../src/server.js'
+import { job as saltJob } from '../src/utils/salt.js'
 
 const base = listen(server)
 
+test.after.always(() => {
+  server.close()
+  saltJob.cancel()
+})
+
 test('return 404', async (t) => {
   const url = new URL(`/${uuid()}`, await base)
   const { status } = await fetch(url.href)
diff --git a/test/serverWithAutoCors.js b/test/serverWithAutoCors.js
@@ -5,12 +5,12 @@ import listen from 'test-listen'
 
 import Domain from '../src/models/Domain.js'
 import server from '../src/server.js'
-import { connectToDatabase, disconnectFromDatabase } from './resolvers/_utils.js'
+import { cleanup, connectToDatabase } from './resolvers/_utils.js'
 
 const base = listen(server)
 
 test.before(connectToDatabase)
-test.after.always(disconnectFromDatabase)
+test.after.always(cleanup(server))
 test.beforeEach(async (t) => {
   t.context.domain1 = await Domain.create({ title: 'fqdn.example.com' })
   t.context.domain2 = await Domain.create({ title: 'No fqdn' })
diff --git a/test/serverWithCors.js b/test/serverWithCors.js
@@ -3,9 +3,15 @@ import mockedEnv from 'mocked-env'
 import listen from 'test-listen'
 
 import server from '../src/server.js'
+import { job as saltJob } from '../src/utils/salt.js'
 
 const base = listen(server)
 
+test.after.always(() => {
+  server.close()
+  saltJob.cancel()
+})
+
 test('return cors headers if env var specifies one', async (t) => {
   const url = new URL('/api', await base)
 
diff --git a/test/serverWithMultipleCors.js b/test/serverWithMultipleCors.js
diff --git a/test/serverWithUnlistedCors.js b/test/serverWithUnlistedCors.js
diff --git a/test/serverWithWildcardCors.js b/test/serverWithWildcardCors.js
diff --git a/test/serverWithoutCors.js b/test/serverWithoutCors.js
diff --git a/test/utils/identifier.js b/test/utils/identifier.js
diff --git a/test/utils/salt.js b/test/utils/salt.js
