Merge branch 'release/4.2.0' into develop

[github/Chocobozzz/PeerTube.git] / server / tests / api / server / contact-form.ts

diff --git a/server/tests/api/server/contact-form.ts b/server/tests/api/server/contact-form.ts
index 79c4c674857f6b16858f3161e18ac70dcd8d4a05..4f01f6fd50fb41f3b5d4ca876a9f3c96df79b51a 100644 (file)
--- a/server/tests/api/server/contact-form.ts
+++ b/server/tests/api/server/contact-form.ts
@@ -2,14 +2,22 @@
 
 import 'mocha'
 import * as chai from 'chai'
-import { HttpStatusCode } from '@shared/core-utils'
-import { cleanupTests, flushAndRunServer, MockSmtpServer, ServerInfo, setAccessTokensToServers, wait, waitJobs } from '@shared/extra-utils'
-import { ContactFormCommand } from '@shared/extra-utils/server'
+import { MockSmtpServer } from '@server/tests/shared'
+import { wait } from '@shared/core-utils'
+import { HttpStatusCode } from '@shared/models'
+import {
+  cleanupTests,
+  ContactFormCommand,
+  createSingleServer,
+  PeerTubeServer,
+  setAccessTokensToServers,
+  waitJobs
+} from '@shared/server-commands'
 
 const expect = chai.expect
 
 describe('Test contact form', function () {
-  let server: ServerInfo
+  let server: PeerTubeServer
   const emails: object[] = []
   let command: ContactFormCommand
 
@@ -24,10 +32,10 @@ describe('Test contact form', function () {
         port
       }
     }
-    server = await flushAndRunServer(1, overrideConfig)
+    server = await createSingleServer(1, overrideConfig)
     await setAccessTokensToServers([ server ])
 
-    command = server.contactFormCommand
+    command = server.contactForm
   })
 
   it('Should send a contact form', async function () {
@@ -53,6 +61,13 @@ describe('Test contact form', function () {
     expect(email['text']).contains('my super message')
   })
 
+  it('Should not have duplicated email adress in text message', async function () {
+    const text = emails[0]['text'] as string
+
+    const matches = text.match(/toto@example.com/g)
+    expect(matches).to.have.lengthOf(1)
+  })
+
   it('Should not be able to send another contact form because of the anti spam checker', async function () {
     this.timeout(10000)