split out teardown into its own file

JaneJeon · Dec 20, 2021 · 93cf4b5 · 93cf4b5
1 parent 954a1b6
commit 93cf4b5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -8,5 +8,8 @@ module.exports = {
   notify: true,
   globalSetup: './tests/utils/setup-db.js',
   globalTeardown: './tests/utils/teardown-db.js',
-  setupFilesAfterEnv: ['./tests/utils/trxify-tests.js']
+  setupFilesAfterEnv: [
+    './tests/utils/trxify-tests.js',
+    './tests/utils/teardown-db.js'
+  ]
 }
diff --git a/tests/utils/teardown-db.js b/tests/utils/teardown-db.js
@@ -1,5 +1,10 @@
 const knex = require('./knex')
 
+if (typeof afterAll !== 'undefined')
+  afterAll(async () => {
+    await knex.destroy()
+  })
+
 module.exports = async () => {
   await knex.destroy()
 }
diff --git a/tests/utils/trxify-tests.js b/tests/utils/trxify-tests.js
@@ -25,7 +25,3 @@ afterEach(done => {
   afterDone = done
   BaseModel.knex().rollback()
 })
-
-afterAll(async () => {
-  await knex.destroy()
-})