Merge branch 'release/5.1.0' into develop

[github/Chocobozzz/PeerTube.git] / server / tests / api / check-params / users-admin.ts

diff --git a/server/tests/api/check-params/users-admin.ts b/server/tests/api/check-params/users-admin.ts
index f71414a6b682ee7a97457f4ebddd469fa782033c..be2496bb47be80b9b9394289ee82977e238e6bd6 100644 (file)
--- a/server/tests/api/check-params/users-admin.ts
+++ b/server/tests/api/check-params/users-admin.ts
@@ -1,22 +1,19 @@
 /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import 'mocha'
-import { omit } from 'lodash'
+import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination, MockSmtpServer } from '@server/tests/shared'
+import { omit } from '@shared/core-utils'
+import { HttpStatusCode, UserAdminFlag, UserRole } from '@shared/models'
 import {
-  checkBadCountPagination,
-  checkBadSortPagination,
-  checkBadStartPagination,
   cleanupTests,
+  ConfigCommand,
   createSingleServer,
   killallServers,
   makeGetRequest,
   makePostBodyRequest,
   makePutBodyRequest,
-  MockSmtpServer,
   PeerTubeServer,
   setAccessTokensToServers
-} from '@shared/extra-utils'
-import { HttpStatusCode, UserAdminFlag, UserRole } from '@shared/models'
+} from '@shared/server-commands'
 
 describe('Test users admin API validators', function () {
   const path = '/api/v1/users/'
@@ -126,7 +123,7 @@ describe('Test users admin API validators', function () {
     })
 
     it('Should fail with a missing email', async function () {
-      const fields = omit(baseCorrectParams, 'email')
+      const fields = omit(baseCorrectParams, [ 'email' ])
 
       await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
     })
@@ -160,13 +157,7 @@ describe('Test users admin API validators', function () {
 
       await killallServers([ server ])
 
-      const config = {
-        smtp: {
-          hostname: 'localhost',
-          port: emailPort
-        }
-      }
-      await server.run(config)
+      await server.run(ConfigCommand.getEmailOverrideConfig(emailPort))
 
       const fields = {
         ...baseCorrectParams,
@@ -178,7 +169,7 @@ describe('Test users admin API validators', function () {
 
       await makePostBodyRequest({
         url: server.url,
-        path: path,
+        path,
         token: server.accessToken,
         fields,
         expectedStatus: HttpStatusCode.OK_200
@@ -226,13 +217,13 @@ describe('Test users admin API validators', function () {
     })
 
     it('Should fail without a videoQuota', async function () {
-      const fields = omit(baseCorrectParams, 'videoQuota')
+      const fields = omit(baseCorrectParams, [ 'videoQuota' ])
 
       await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
     })
 
     it('Should fail without a videoQuotaDaily', async function () {
-      const fields = omit(baseCorrectParams, 'videoQuotaDaily')
+      const fields = omit(baseCorrectParams, [ 'videoQuotaDaily' ])
 
       await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
     })
@@ -250,7 +241,7 @@ describe('Test users admin API validators', function () {
     })
 
     it('Should fail without a user role', async function () {
-      const fields = omit(baseCorrectParams, 'role')
+      const fields = omit(baseCorrectParams, [ 'role' ])
 
       await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields })
     })