From a25a31c10570794539524a46576741173476795e Mon Sep 17 00:00:00 2001
From: X1a0t <405028157@qq.com>
Date: Mon, 11 Sep 2023 17:30:39 +0800
Subject: [PATCH] test: always exec afterEach in ava test (#4303)

Co-authored-by: Peng Xiao <pengxiao@outlook.com>
---
 apps/server/src/tests/app.e2e.ts                 | 2 +-
 apps/server/src/tests/auth.spec.ts               | 2 +-
 apps/server/src/tests/config.spec.ts             | 9 +++++++--
 apps/server/src/tests/doc.spec.ts                | 2 +-
 apps/server/src/tests/exception-logger.e2e.ts    | 2 +-
 apps/server/src/tests/mailer.e2e.ts              | 2 +-
 apps/server/src/tests/mailer.spec.ts             | 2 +-
 apps/server/src/tests/prometheus-metrics.spec.ts | 2 +-
 apps/server/src/tests/session.spec.ts            | 2 +-
 apps/server/src/tests/user.e2e.ts                | 2 +-
 apps/server/src/tests/workspace-blobs.spec.ts    | 2 +-
 apps/server/src/tests/workspace-invite.e2e.ts    | 2 +-
 apps/server/src/tests/workspace-usage.spec.ts    | 2 +-
 apps/server/src/tests/workspace.e2e.ts           | 2 +-
 14 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/apps/server/src/tests/app.e2e.ts b/apps/server/src/tests/app.e2e.ts
index d6ba99bcfb..b8b1c7f44d 100644
--- a/apps/server/src/tests/app.e2e.ts
+++ b/apps/server/src/tests/app.e2e.ts
@@ -68,7 +68,7 @@ test.beforeEach(async t => {
   await t.context.app.init();
 });
 
-test.afterEach(async t => {
+test.afterEach.always(async t => {
   await t.context.app.close();
 });
 
diff --git a/apps/server/src/tests/auth.spec.ts b/apps/server/src/tests/auth.spec.ts
index f8981c1407..1f0816534f 100644
--- a/apps/server/src/tests/auth.spec.ts
+++ b/apps/server/src/tests/auth.spec.ts
@@ -42,7 +42,7 @@ test.beforeEach(async () => {
   auth = module.get(AuthService);
 });
 
-test.afterEach(async () => {
+test.afterEach.always(async () => {
   await module.close();
 });
 
diff --git a/apps/server/src/tests/config.spec.ts b/apps/server/src/tests/config.spec.ts
index c8a1b1885e..e4c78a7f61 100644
--- a/apps/server/src/tests/config.spec.ts
+++ b/apps/server/src/tests/config.spec.ts
@@ -1,16 +1,21 @@
-import { Test } from '@nestjs/testing';
+import { Test, TestingModule } from '@nestjs/testing';
 import test from 'ava';
 
 import { Config, ConfigModule } from '../config';
 
 let config: Config;
+let module: TestingModule;
 test.beforeEach(async () => {
-  const module = await Test.createTestingModule({
+  module = await Test.createTestingModule({
     imports: [ConfigModule.forRoot()],
   }).compile();
   config = module.get(Config);
 });
 
+test.afterEach.always(async () => {
+  await module.close();
+});
+
 test('should be able to get config', t => {
   t.true(typeof config.host === 'string');
   t.is(config.env, 'test');
diff --git a/apps/server/src/tests/doc.spec.ts b/apps/server/src/tests/doc.spec.ts
index 10b8960c06..a48875f0b1 100644
--- a/apps/server/src/tests/doc.spec.ts
+++ b/apps/server/src/tests/doc.spec.ts
@@ -40,7 +40,7 @@ test.beforeEach(async () => {
   await app.init();
 });
 
-test.afterEach(async () => {
+test.afterEach.always(async () => {
   await app.close();
   await m.close();
   timer.restore();
diff --git a/apps/server/src/tests/exception-logger.e2e.ts b/apps/server/src/tests/exception-logger.e2e.ts
index 73e917f20a..ee798596e3 100644
--- a/apps/server/src/tests/exception-logger.e2e.ts
+++ b/apps/server/src/tests/exception-logger.e2e.ts
@@ -54,7 +54,7 @@ test.beforeEach(async () => {
   await app.init();
 });
 
-test.afterEach(async () => {
+test.afterEach.always(async () => {
   await app.close();
 });
 
diff --git a/apps/server/src/tests/mailer.e2e.ts b/apps/server/src/tests/mailer.e2e.ts
index c75714c448..71d735b39f 100644
--- a/apps/server/src/tests/mailer.e2e.ts
+++ b/apps/server/src/tests/mailer.e2e.ts
@@ -65,7 +65,7 @@ test.beforeEach(async () => {
   auth = module.get(AuthService);
 });
 
-test.afterEach(async () => {
+test.afterEach.always(async () => {
   await module.close();
 });
 
diff --git a/apps/server/src/tests/mailer.spec.ts b/apps/server/src/tests/mailer.spec.ts
index a507017209..19e82bbdb4 100644
--- a/apps/server/src/tests/mailer.spec.ts
+++ b/apps/server/src/tests/mailer.spec.ts
@@ -114,7 +114,7 @@ test.beforeEach(async () => {
   mail = module.get(MailService);
 });
 
-test.afterEach(async () => {
+test.afterEach.always(async () => {
   await app.close();
 });
 
diff --git a/apps/server/src/tests/prometheus-metrics.spec.ts b/apps/server/src/tests/prometheus-metrics.spec.ts
index b9daf8ac5d..a736d2fc43 100644
--- a/apps/server/src/tests/prometheus-metrics.spec.ts
+++ b/apps/server/src/tests/prometheus-metrics.spec.ts
@@ -17,7 +17,7 @@ test.beforeEach(async () => {
   metrics = module.get(Metrics);
 });
 
-test.afterEach(async () => {
+test.afterEach.always(async () => {
   await module.close();
 });
 
diff --git a/apps/server/src/tests/session.spec.ts b/apps/server/src/tests/session.spec.ts
index 0bad83ee2d..bdb9a135d2 100644
--- a/apps/server/src/tests/session.spec.ts
+++ b/apps/server/src/tests/session.spec.ts
@@ -27,7 +27,7 @@ test.beforeEach(async t => {
   t.context.session = session;
 });
 
-test.afterEach(async t => {
+test.afterEach.always(async t => {
   await t.context.app.close();
 });
 
diff --git a/apps/server/src/tests/user.e2e.ts b/apps/server/src/tests/user.e2e.ts
index ad91a9fff6..403916991f 100644
--- a/apps/server/src/tests/user.e2e.ts
+++ b/apps/server/src/tests/user.e2e.ts
@@ -33,7 +33,7 @@ test.beforeEach(async () => {
   await app.init();
 });
 
-test.afterEach(async () => {
+test.afterEach.always(async () => {
   await app.close();
 });
 
diff --git a/apps/server/src/tests/workspace-blobs.spec.ts b/apps/server/src/tests/workspace-blobs.spec.ts
index 41701d6974..617b2e9a28 100644
--- a/apps/server/src/tests/workspace-blobs.spec.ts
+++ b/apps/server/src/tests/workspace-blobs.spec.ts
@@ -45,7 +45,7 @@ test.beforeEach(async () => {
   await app.init();
 });
 
-test.afterEach(async () => {
+test.afterEach.always(async () => {
   await app.close();
 });
 
diff --git a/apps/server/src/tests/workspace-invite.e2e.ts b/apps/server/src/tests/workspace-invite.e2e.ts
index 8a93698734..2809be93de 100644
--- a/apps/server/src/tests/workspace-invite.e2e.ts
+++ b/apps/server/src/tests/workspace-invite.e2e.ts
@@ -56,7 +56,7 @@ test.beforeEach(async t => {
   t.context.mail = mail;
 });
 
-test.afterEach(async t => {
+test.afterEach.always(async t => {
   await t.context.app.close();
 });
 
diff --git a/apps/server/src/tests/workspace-usage.spec.ts b/apps/server/src/tests/workspace-usage.spec.ts
index b42aa859d8..17a426bbee 100644
--- a/apps/server/src/tests/workspace-usage.spec.ts
+++ b/apps/server/src/tests/workspace-usage.spec.ts
@@ -59,7 +59,7 @@ test.beforeEach(async t => {
   await t.context.app.init();
 });
 
-test.afterEach(async t => {
+test.afterEach.always(async t => {
   await t.context.app.close();
 });
 
diff --git a/apps/server/src/tests/workspace.e2e.ts b/apps/server/src/tests/workspace.e2e.ts
index 2c764fb339..83473528e0 100644
--- a/apps/server/src/tests/workspace.e2e.ts
+++ b/apps/server/src/tests/workspace.e2e.ts
@@ -48,7 +48,7 @@ test.beforeEach(async t => {
   t.context.app = app;
 });
 
-test.afterEach(async t => {
+test.afterEach.always(async t => {
   await t.context.app.close();
 });