Introduce server commands

[github/Chocobozzz/PeerTube.git] / server / tests / api / server / email.ts

diff --git a/server/tests/api/server/email.ts b/server/tests/api/server/email.ts
index 53f96a94fa17776150572b2accef06f597fbd348..5d997713b6aa549855068c2361e28fb20802deba 100644 (file)
--- a/server/tests/api/server/email.ts
+++ b/server/tests/api/server/email.ts
@@ -2,16 +2,14 @@
 
 import 'mocha'
 import * as chai from 'chai'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
 import {
-  addVideoToBlacklist,
   askResetPassword,
   askSendVerifyEmail,
   blockUser,
   cleanupTests,
   createUser,
   flushAndRunServer,
-  removeVideoFromBlacklist,
-  reportAbuse,
   resetPassword,
   ServerInfo,
   setAccessTokensToServers,
@@ -20,7 +18,7 @@ import {
   userLogin,
   verifyEmail
 } from '../../../../shared/extra-utils'
-import { MockSmtpServer } from '../../../../shared/extra-utils/miscs/email'
+import { MockSmtpServer } from '../../../../shared/extra-utils/mock-servers/mock-email'
 import { waitJobs } from '../../../../shared/extra-utils/server/jobs'
 
 const expect = chai.expect
@@ -97,7 +95,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')
@@ -116,7 +114,7 @@ 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 () {
@@ -124,7 +122,7 @@ describe('Test emails', function () {
     })
 
     it('Should not reset the password with the same verification string', async function () {
-      await resetPassword(server.url, userId, verificationString, 'super_password3', 403)
+      await resetPassword(server.url, userId, verificationString, 'super_password3', HttpStatusCode.FORBIDDEN_403)
     })
 
     it('Should login with this new password', async function () {
@@ -150,7 +148,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')
@@ -169,7 +167,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 () {
@@ -189,14 +187,14 @@ describe('Test emails', function () {
       this.timeout(10000)
 
       const reason = 'my super bad reason'
-      await reportAbuse({ url: server.url, token: server.accessToken, videoId, reason })
+      await server.abusesCommand.report({ 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')
@@ -210,32 +208,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')
@@ -248,14 +246,14 @@ describe('Test emails', function () {
       this.timeout(10000)
 
       const reason = 'my super reason'
-      await addVideoToBlacklist(server.url, server.accessToken, videoUserUUID, reason)
+      await server.blacklistCommand.add({ videoId: videoUserUUID, reason })
 
       await waitJobs(server)
       expect(emails).to.have.lengthOf(6)
 
       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')
@@ -266,14 +264,14 @@ describe('Test emails', function () {
     it('Should send the notification email', async function () {
       this.timeout(10000)
 
-      await removeVideoFromBlacklist(server.url, server.accessToken, videoUserUUID)
+      await server.blacklistCommand.remove({ videoId: videoUserUUID })
 
       await waitJobs(server)
       expect(emails).to.have.lengthOf(7)
 
       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')
@@ -298,7 +296,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')
@@ -317,7 +315,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 () {