X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Femail.ts;h=92768d9dfca59c26f34d401b0a1668b6bbe7aa26;hb=693c6586cb896a84ff0f897b1c242bcf7bdcbaee;hp=95b64a45959fd3a95333e15af4b0618619524318;hpb=45f1bd72a08998c60a9dd68ff069cea9de39161c;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/tests/api/server/email.ts b/server/tests/api/server/email.ts
index 95b64a459..92768d9df 100644
--- a/server/tests/api/server/email.ts
+++ b/server/tests/api/server/email.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
 import 'mocha'
+import * as chai from 'chai'
 import {
   addVideoToBlacklist,
   askResetPassword,
@@ -11,7 +11,7 @@ import {
   createUser,
   flushAndRunServer,
   removeVideoFromBlacklist,
-  reportVideoAbuse,
+  reportAbuse,
   resetPassword,
   ServerInfo,
   setAccessTokensToServers,
@@ -22,6 +22,7 @@ import {
 } from '../../../../shared/extra-utils'
 import { MockSmtpServer } from '../../../../shared/extra-utils/miscs/email'
 import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 
 const expect = chai.expect
 
@@ -30,10 +31,15 @@ describe('Test emails', function () {
   let userId: number
   let userId2: number
   let userAccessToken: string
+
   let videoUUID: string
+  let videoId: number
+
   let videoUserUUID: string
+
   let verificationString: string
   let verificationString2: string
+
   const emails: object[] = []
   const user = {
     username: 'user_1',
@@ -76,6 +82,7 @@ describe('Test emails', function () {
       }
       const res = await uploadVideo(server.url, server.accessToken, attributes)
       videoUUID = res.body.video.uuid
+      videoId = res.body.video.id
     }
   })
 
@@ -91,7 +98,7 @@ describe('Test emails', function () {
 
       const email = emails[0]
 
-      expect(email['from'][0]['name']).equal('localhost:' + server.port)
+      expect(email['from'][0]['name']).equal('PeerTube')
       expect(email['from'][0]['address']).equal('test-admin@localhost')
       expect(email['to'][0]['address']).equal('user_1@example.com')
       expect(email['subject']).contains('password')
@@ -110,13 +117,17 @@ describe('Test emails', function () {
     })
 
     it('Should not reset the password with an invalid verification string', async function () {
-      await resetPassword(server.url, userId, verificationString + 'b', 'super_password2', 403)
+      await resetPassword(server.url, userId, verificationString + 'b', 'super_password2', HttpStatusCode.FORBIDDEN_403)
     })
 
     it('Should reset the password', async function () {
       await resetPassword(server.url, userId, verificationString, 'super_password2')
     })
 
+    it('Should not reset the password with the same verification string', async function () {
+      await resetPassword(server.url, userId, verificationString, 'super_password3', HttpStatusCode.FORBIDDEN_403)
+    })
+
     it('Should login with this new password', async function () {
       user.password = 'super_password2'
 
@@ -140,7 +151,7 @@ describe('Test emails', function () {
 
       const email = emails[1]
 
-      expect(email['from'][0]['name']).equal('localhost:' + server.port)
+      expect(email['from'][0]['name']).equal('PeerTube')
       expect(email['from'][0]['address']).equal('test-admin@localhost')
       expect(email['to'][0]['address']).equal('create_password@example.com')
       expect(email['subject']).contains('account')
@@ -159,7 +170,7 @@ describe('Test emails', function () {
     })
 
     it('Should not reset the password with an invalid verification string', async function () {
-      await resetPassword(server.url, userId2, verificationString2 + 'c', 'newly_created_password', 403)
+      await resetPassword(server.url, userId2, verificationString2 + 'c', 'newly_created_password', HttpStatusCode.FORBIDDEN_403)
     })
 
     it('Should reset the password', async function () {
@@ -174,19 +185,19 @@ describe('Test emails', function () {
     })
   })
 
-  describe('When creating a video abuse', 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 reportVideoAbuse(server.url, server.accessToken, videoUUID, reason)
+      await reportAbuse({ url: server.url, token: server.accessToken, videoId, reason })
 
       await waitJobs(server)
       expect(emails).to.have.lengthOf(3)
 
       const email = emails[2]
 
-      expect(email['from'][0]['name']).equal('localhost:' + server.port)
+      expect(email['from'][0]['name']).equal('PeerTube')
       expect(email['from'][0]['address']).equal('test-admin@localhost')
       expect(email['to'][0]['address']).equal('admin' + server.internalServerNumber + '@example.com')
       expect(email['subject']).contains('abuse')
@@ -200,32 +211,32 @@ describe('Test emails', function () {
       this.timeout(10000)
 
       const reason = 'my super bad reason'
-      await blockUser(server.url, userId, server.accessToken, 204, reason)
+      await blockUser(server.url, userId, server.accessToken, HttpStatusCode.NO_CONTENT_204, reason)
 
       await waitJobs(server)
       expect(emails).to.have.lengthOf(4)
 
       const email = emails[3]
 
-      expect(email['from'][0]['name']).equal('localhost:' + server.port)
+      expect(email['from'][0]['name']).equal('PeerTube')
       expect(email['from'][0]['address']).equal('test-admin@localhost')
       expect(email['to'][0]['address']).equal('user_1@example.com')
       expect(email['subject']).contains(' blocked')
       expect(email['text']).contains(' blocked')
-      expect(email['text']).contains(reason)
+      expect(email['text']).contains('bad reason')
     })
 
     it('Should send the notification email when unblocking a user', async function () {
       this.timeout(10000)
 
-      await unblockUser(server.url, userId, server.accessToken, 204)
+      await unblockUser(server.url, userId, server.accessToken, HttpStatusCode.NO_CONTENT_204)
 
       await waitJobs(server)
       expect(emails).to.have.lengthOf(5)
 
       const email = emails[4]
 
-      expect(email['from'][0]['name']).equal('localhost:' + server.port)
+      expect(email['from'][0]['name']).equal('PeerTube')
       expect(email['from'][0]['address']).equal('test-admin@localhost')
       expect(email['to'][0]['address']).equal('user_1@example.com')
       expect(email['subject']).contains(' unblocked')
@@ -245,7 +256,7 @@ describe('Test emails', function () {
 
       const email = emails[5]
 
-      expect(email['from'][0]['name']).equal('localhost:' + server.port)
+      expect(email['from'][0]['name']).equal('PeerTube')
       expect(email['from'][0]['address']).equal('test-admin@localhost')
       expect(email['to'][0]['address']).equal('user_1@example.com')
       expect(email['subject']).contains(' blacklisted')
@@ -263,12 +274,17 @@ describe('Test emails', function () {
 
       const email = emails[6]
 
-      expect(email['from'][0]['name']).equal('localhost:' + server.port)
+      expect(email['from'][0]['name']).equal('PeerTube')
       expect(email['from'][0]['address']).equal('test-admin@localhost')
       expect(email['to'][0]['address']).equal('user_1@example.com')
       expect(email['subject']).contains(' unblacklisted')
       expect(email['text']).contains('my super user video')
     })
+
+    it('Should have the manage preferences link in the email', async function () {
+      const email = emails[6]
+      expect(email['text']).to.contain('Manage your notification preferences')
+    })
   })
 
   describe('When verifying a user email', function () {
@@ -283,7 +299,7 @@ describe('Test emails', function () {
 
       const email = emails[7]
 
-      expect(email['from'][0]['name']).equal('localhost:' + server.port)
+      expect(email['from'][0]['name']).equal('PeerTube')
       expect(email['from'][0]['address']).equal('test-admin@localhost')
       expect(email['to'][0]['address']).equal('user_1@example.com')
       expect(email['subject']).contains('Verify')
@@ -302,7 +318,7 @@ describe('Test emails', function () {
     })
 
     it('Should not verify the email with an invalid verification string', async function () {
-      await verifyEmail(server.url, userId, verificationString + 'b', false, 403)
+      await verifyEmail(server.url, userId, verificationString + 'b', false, HttpStatusCode.FORBIDDEN_403)
     })
 
     it('Should verify the email', async function () {