Add missing hotkeys to the watch page

[github/Chocobozzz/PeerTube.git] / server / tests / api / videos / video-nsfw.ts

diff --git a/server/tests/api/videos/video-nsfw.ts b/server/tests/api/videos/video-nsfw.ts
index 370e69d2a4f15eac3987efcdcfe755cbbf62360e..ad6a4b43f3e7eeaf578135c218d39ed08fc90102 100644 (file)
--- a/server/tests/api/videos/video-nsfw.ts
+++ b/server/tests/api/videos/video-nsfw.ts
@@ -2,23 +2,23 @@
 
 import * as chai from 'chai'
 import 'mocha'
-import { flushTests, getVideosList, killallServers, ServerInfo, setAccessTokensToServers, uploadVideo } from '../../utils/index'
-import { userLogin } from '../../utils/users/login'
-import { createUser } from '../../utils/users/users'
-import { getMyVideos } from '../../utils/videos/videos'
+import { cleanupTests, getVideosList, ServerInfo, setAccessTokensToServers, uploadVideo } from '../../../../shared/extra-utils/index'
+import { userLogin } from '../../../../shared/extra-utils/users/login'
+import { createUser } from '../../../../shared/extra-utils/users/users'
+import { getMyVideos } from '../../../../shared/extra-utils/videos/videos'
 import {
+  flushAndRunServer,
   getAccountVideos,
   getConfig,
   getCustomConfig,
   getMyUserInformation,
   getVideoChannelVideos,
   getVideosListWithToken,
-  runServer,
   searchVideo,
   searchVideoWithToken,
   updateCustomConfig,
   updateMyUser
-} from '../../utils'
+} from '../../../../shared/extra-utils'
 import { ServerConfig } from '../../../../shared/models'
 import { CustomConfig } from '../../../../shared/models/server/custom-config.model'
 import { User } from '../../../../shared/models/users'
@@ -34,7 +34,7 @@ describe('Test video NSFW policy', function () {
     return getMyUserInformation(server.url, server.accessToken)
       .then(res => {
         const user: User = res.body
-        const videoChannelUUID = user.videoChannels[0].uuid
+        const videoChannelName = user.videoChannels[0].name
         const accountName = user.account.name + '@' + user.account.host
 
         if (token) {
@@ -42,7 +42,7 @@ describe('Test video NSFW policy', function () {
             getVideosListWithToken(server.url, token, query),
             searchVideoWithToken(server.url, 'n', token, query),
             getAccountVideos(server.url, token, accountName, 0, 5, undefined, query),
-            getVideoChannelVideos(server.url, token, videoChannelUUID, 0, 5, undefined, query)
+            getVideoChannelVideos(server.url, token, videoChannelName, 0, 5, undefined, query)
           ])
         }
 
@@ -50,16 +50,14 @@ describe('Test video NSFW policy', function () {
           getVideosList(server.url),
           searchVideo(server.url, 'n'),
           getAccountVideos(server.url, undefined, accountName, 0, 5),
-          getVideoChannelVideos(server.url, undefined, videoChannelUUID, 0, 5)
+          getVideoChannelVideos(server.url, undefined, videoChannelName, 0, 5)
         ])
       })
   }
 
   before(async function () {
     this.timeout(50000)
-
-    await flushTests()
-    server = await runServer(1)
+    server = await flushAndRunServer(1)
 
     // Get the access tokens
     await setAccessTokensToServers([ server ])
@@ -137,7 +135,7 @@ describe('Test video NSFW policy', function () {
     it('Should create a user having the default nsfw policy', async function () {
       const username = 'user1'
       const password = 'my super password'
-      await createUser(server.url, server.accessToken, username, password)
+      await createUser({ url: server.url, accessToken: server.accessToken, username: username, password: password })
 
       userAccessToken = await userLogin(server, { username, password })
 
@@ -148,6 +146,9 @@ describe('Test video NSFW policy', function () {
     })
 
     it('Should display NSFW videos with blur user NSFW policy', async function () {
+      customConfig.instance.defaultNSFWPolicy = 'do_not_list'
+      await updateCustomConfig(server.url, server.accessToken, customConfig)
+
       for (const res of await getVideosFunctions(userAccessToken)) {
         expect(res.body.total).to.equal(2)
 
@@ -234,6 +235,6 @@ describe('Test video NSFW policy', function () {
   })
 
   after(async function () {
-    killallServers([ server ])
+    await cleanupTests([ server ])
   })
 })