X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Femail.ts;h=9141cc697f1c69be81ad5bd7280aaccb6ee6721c;hb=6a9b3151822461a85bbc72b7a50e12ffb69bec3a;hp=4ab5463fe2d5696bcad683df485b248e018189af;hpb=2732eeff9e6994582293b5aaa0cb158b7e272e9e;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/server/email.ts b/server/tests/api/server/email.ts
index 4ab5463fe..9141cc697 100644
--- a/server/tests/api/server/email.ts
+++ b/server/tests/api/server/email.ts
@@ -3,7 +3,14 @@
 import { expect } from 'chai'
 import { MockSmtpServer } from '@server/tests/shared'
 import { HttpStatusCode } from '@shared/models'
-import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers, waitJobs } from '@shared/server-commands'
+import {
+  cleanupTests,
+  ConfigCommand,
+  createSingleServer,
+  PeerTubeServer,
+  setAccessTokensToServers,
+  waitJobs
+} from '@shared/server-commands'
 
 describe('Test emails', function () {
   let server: PeerTubeServer
@@ -24,21 +31,15 @@ describe('Test emails', function () {
     username: 'user_1',
     password: 'super_password'
   }
-  let emailPort: number
 
   before(async function () {
-    this.timeout(50000)
+    this.timeout(120000)
 
-    emailPort = await MockSmtpServer.Instance.collectEmails(emails)
+    const emailPort = await MockSmtpServer.Instance.collectEmails(emails)
+    server = await createSingleServer(1, ConfigCommand.getEmailOverrideConfig(emailPort))
 
-    const overrideConfig = {
-      smtp: {
-        hostname: '127.0.0.1',
-        port: emailPort
-      }
-    }
-    server = await createSingleServer(1, overrideConfig)
     await setAccessTokensToServers([ server ])
+    await server.config.enableSignup(true)
 
     {
       const created = await server.users.create({ username: user.username, password: user.password })
@@ -123,8 +124,6 @@ describe('Test emails', function () {
   describe('When creating a user without password', function () {
 
     it('Should send a create password email', async function () {
-      this.timeout(10000)
-
       await server.users.create({ username: 'create_password', password: '' })
 
       await waitJobs(server)
@@ -178,8 +177,6 @@ describe('Test emails', function () {
   describe('When creating an abuse', function () {
 
     it('Should send the notification email', async function () {
-      this.timeout(10000)
-
       const reason = 'my super bad reason'
       await server.abuses.report({ token: userAccessToken, videoId, reason })
 
@@ -199,8 +196,6 @@ describe('Test emails', function () {
   describe('When blocking/unblocking user', function () {
 
     it('Should send the notification email when blocking a user', async function () {
-      this.timeout(10000)
-
       const reason = 'my super bad reason'
       await server.users.banUser({ userId, reason })
 
@@ -218,8 +213,6 @@ describe('Test emails', function () {
     })
 
     it('Should send the notification email when unblocking a user', async function () {
-      this.timeout(10000)
-
       await server.users.unbanUser({ userId })
 
       await waitJobs(server)
@@ -237,8 +230,6 @@ describe('Test emails', function () {
 
   describe('When blacklisting a video', function () {
     it('Should send the notification email', async function () {
-      this.timeout(10000)
-
       const reason = 'my super reason'
       await server.blacklist.add({ videoId: videoUserUUID, reason })
 
@@ -256,8 +247,6 @@ describe('Test emails', function () {
     })
 
     it('Should send the notification email', async function () {
-      this.timeout(10000)
-
       await server.blacklist.remove({ videoId: videoUserUUID })
 
       await waitJobs(server)
@@ -281,8 +270,6 @@ describe('Test emails', function () {
   describe('When verifying a user email', function () {
 
     it('Should ask to send the verification email', async function () {
-      this.timeout(10000)
-
       await server.users.askSendVerifyEmail({ email: 'user_1@example.com' })
 
       await waitJobs(server)
@@ -322,6 +309,60 @@ describe('Test emails', function () {
     })
   })
 
+  describe('When verifying a registration email', function () {
+    let registrationId: number
+    let registrationIdEmail: number
+
+    before(async function () {
+      const { id } = await server.registrations.requestRegistration({
+        username: 'request_1',
+        email: 'request_1@example.com',
+        registrationReason: 'tt'
+      })
+      registrationId = id
+    })
+
+    it('Should ask to send the verification email', async function () {
+      await server.registrations.askSendVerifyEmail({ email: 'request_1@example.com' })
+
+      await waitJobs(server)
+      expect(emails).to.have.lengthOf(9)
+
+      const email = emails[8]
+
+      expect(email['from'][0]['name']).equal('PeerTube')
+      expect(email['from'][0]['address']).equal('test-admin@127.0.0.1')
+      expect(email['to'][0]['address']).equal('request_1@example.com')
+      expect(email['subject']).contains('Verify')
+
+      const verificationStringMatches = /verificationString=([a-z0-9]+)/.exec(email['text'])
+      expect(verificationStringMatches).not.to.be.null
+
+      verificationString = verificationStringMatches[1]
+      expect(verificationString).to.not.be.undefined
+      expect(verificationString).to.have.length.above(2)
+
+      const registrationIdMatches = /registrationId=([0-9]+)/.exec(email['text'])
+      expect(registrationIdMatches).not.to.be.null
+
+      registrationIdEmail = parseInt(registrationIdMatches[1], 10)
+
+      expect(registrationId).to.equal(registrationIdEmail)
+    })
+
+    it('Should not verify the email with an invalid verification string', async function () {
+      await server.registrations.verifyEmail({
+        registrationId: registrationIdEmail,
+        verificationString: verificationString + 'b',
+        expectedStatus: HttpStatusCode.FORBIDDEN_403
+      })
+    })
+
+    it('Should verify the email', async function () {
+      await server.registrations.verifyEmail({ registrationId: registrationIdEmail, verificationString })
+    })
+  })
+
   after(async function () {
     MockSmtpServer.Instance.kill()