From 5b94394a1a6d471f897d14ac62fe7bec5f9a74c2 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 27 Feb 2023 10:44:32 +0100
Subject: Fix E2E with firefox

---
 server/tests/shared/mock-servers/mock-email.ts | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'server/tests/shared')

diff --git a/server/tests/shared/mock-servers/mock-email.ts b/server/tests/shared/mock-servers/mock-email.ts
index c518679c9..79bc22d58 100644
--- a/server/tests/shared/mock-servers/mock-email.ts
+++ b/server/tests/shared/mock-servers/mock-email.ts
@@ -1,4 +1,3 @@
-import { ChildProcess } from 'child_process'
 import MailDev from '@peertube/maildev'
 import { parallelTests, randomInt } from '@shared/core-utils'
 
@@ -6,7 +5,7 @@ class MockSmtpServer {
 
   private static instance: MockSmtpServer
   private started = false
-  private emailChildProcess: ChildProcess
+  private maildev: any
   private emails: object[]
 
   private constructor () { }
@@ -20,18 +19,18 @@ class MockSmtpServer {
         return res(undefined)
       }
 
-      const maildev = new MailDev({
+      this.maildev = new MailDev({
         ip: '127.0.0.1',
         smtp: port,
         disableWeb: true,
         silent: true
       })
 
-      maildev.on('new', email => {
+      this.maildev.on('new', email => {
         this.emails.push(email)
       })
 
-      maildev.listen(err => {
+      this.maildev.listen(err => {
         if (err) return rej(err)
 
         this.started = true
@@ -42,11 +41,11 @@ class MockSmtpServer {
   }
 
   kill () {
-    if (!this.emailChildProcess) return
+    if (!this.maildev) return
 
-    process.kill(this.emailChildProcess.pid)
+    this.maildev.shutdown()
 
-    this.emailChildProcess = null
+    this.maildev = null
     MockSmtpServer.instance = null
   }
 
-- 
cgit v1.2.3