Fix rerunserver function

[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 4e5ab11ce94b5e0b9313ee1af9823b37d65efe21..811705212b360f7878ee50b3bb3f161c2a807ce4 100644 (file)
--- a/server/tests/api/videos/video-nsfw.ts
+++ b/server/tests/api/videos/video-nsfw.ts
@@ -2,21 +2,33 @@
 
 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 {
-  getConfig, getCustomConfig,
+  flushTests,
+  getVideosList,
+  killallServers,
+  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 {
+  getAccountVideos,
+  getConfig,
+  getCustomConfig,
   getMyUserInformation,
+  getVideoChannelVideos,
   getVideosListWithToken,
-  runServer,
+  flushAndRunServer,
   searchVideo,
-  searchVideoWithToken, updateCustomConfig,
+  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'
 
 const expect = chai.expect
 
@@ -25,11 +37,34 @@ describe('Test video NSFW policy', function () {
   let userAccessToken: string
   let customConfig: CustomConfig
 
+  function getVideosFunctions (token?: string, query = {}) {
+    return getMyUserInformation(server.url, server.accessToken)
+      .then(res => {
+        const user: User = res.body
+        const videoChannelName = user.videoChannels[0].name
+        const accountName = user.account.name + '@' + user.account.host
+
+        if (token) {
+          return Promise.all([
+            getVideosListWithToken(server.url, token, query),
+            searchVideoWithToken(server.url, 'n', token, query),
+            getAccountVideos(server.url, token, accountName, 0, 5, undefined, query),
+            getVideoChannelVideos(server.url, token, videoChannelName, 0, 5, undefined, query)
+          ])
+        }
+
+        return Promise.all([
+          getVideosList(server.url),
+          searchVideo(server.url, 'n'),
+          getAccountVideos(server.url, undefined, accountName, 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 ])
@@ -56,7 +91,7 @@ describe('Test video NSFW policy', function () {
       const serverConfig: ServerConfig = resConfig.body
       expect(serverConfig.instance.defaultNSFWPolicy).to.equal('display')
 
-      for (const res of [ await getVideosList(server.url), await searchVideo(server.url, 'n') ]) {
+      for (const res of await getVideosFunctions()) {
         expect(res.body.total).to.equal(2)
 
         const videos = res.body.data
@@ -74,7 +109,7 @@ describe('Test video NSFW policy', function () {
       const serverConfig: ServerConfig = resConfig.body
       expect(serverConfig.instance.defaultNSFWPolicy).to.equal('do_not_list')
 
-      for (const res of [ await getVideosList(server.url), await searchVideo(server.url, 'n') ]) {
+      for (const res of await getVideosFunctions()) {
         expect(res.body.total).to.equal(1)
 
         const videos = res.body.data
@@ -91,7 +126,7 @@ describe('Test video NSFW policy', function () {
       const serverConfig: ServerConfig = resConfig.body
       expect(serverConfig.instance.defaultNSFWPolicy).to.equal('blur')
 
-      for (const res of [ await getVideosList(server.url), await searchVideo(server.url, 'n') ]) {
+      for (const res of await getVideosFunctions()) {
         expect(res.body.total).to.equal(2)
 
         const videos = res.body.data
@@ -107,7 +142,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 })
 
@@ -118,12 +153,10 @@ describe('Test video NSFW policy', function () {
     })
 
     it('Should display NSFW videos with blur user NSFW policy', async function () {
-      const results = [
-        await getVideosListWithToken(server.url, userAccessToken),
-        await searchVideoWithToken(server.url, 'n', userAccessToken)
-      ]
+      customConfig.instance.defaultNSFWPolicy = 'do_not_list'
+      await updateCustomConfig(server.url, server.accessToken, customConfig)
 
-      for (const res of results) {
+      for (const res of await getVideosFunctions(userAccessToken)) {
         expect(res.body.total).to.equal(2)
 
         const videos = res.body.data
@@ -140,12 +173,7 @@ describe('Test video NSFW policy', function () {
         nsfwPolicy: 'display'
       })
 
-      const results = [
-        await getVideosListWithToken(server.url, server.accessToken),
-        await searchVideoWithToken(server.url, 'n', server.accessToken)
-      ]
-
-      for (const res of results) {
+      for (const res of await getVideosFunctions(server.accessToken)) {
         expect(res.body.total).to.equal(2)
 
         const videos = res.body.data
@@ -162,11 +190,7 @@ describe('Test video NSFW policy', function () {
         nsfwPolicy: 'do_not_list'
       })
 
-      const results = [
-        await getVideosListWithToken(server.url, server.accessToken),
-        await searchVideoWithToken(server.url, 'n', server.accessToken)
-      ]
-      for (const res of results) {
+      for (const res of await getVideosFunctions(server.accessToken)) {
         expect(res.body.total).to.equal(1)
 
         const videos = res.body.data
@@ -184,14 +208,40 @@ describe('Test video NSFW policy', function () {
       expect(videos[ 0 ].name).to.equal('normal')
       expect(videos[ 1 ].name).to.equal('nsfw')
     })
+
+    it('Should display NSFW videos when the nsfw param === true', async function () {
+      for (const res of await getVideosFunctions(server.accessToken, { nsfw: true })) {
+        expect(res.body.total).to.equal(1)
+
+        const videos = res.body.data
+        expect(videos).to.have.lengthOf(1)
+        expect(videos[ 0 ].name).to.equal('nsfw')
+      }
+    })
+
+    it('Should hide NSFW videos when the nsfw param === true', async function () {
+      for (const res of await getVideosFunctions(server.accessToken, { nsfw: false })) {
+        expect(res.body.total).to.equal(1)
+
+        const videos = res.body.data
+        expect(videos).to.have.lengthOf(1)
+        expect(videos[ 0 ].name).to.equal('normal')
+      }
+    })
+
+    it('Should display both videos when the nsfw param === both', async function () {
+      for (const res of await getVideosFunctions(server.accessToken, { nsfw: 'both' })) {
+        expect(res.body.total).to.equal(2)
+
+        const videos = res.body.data
+        expect(videos).to.have.lengthOf(2)
+        expect(videos[ 0 ].name).to.equal('normal')
+        expect(videos[ 1 ].name).to.equal('nsfw')
+      }
+    })
   })
 
-  after(async function () {
+  after(function () {
     killallServers([ server ])
-
-    // Keep the logs if the test failed
-    if (this['ok']) {
-      await flushTests()
-    }
   })
 })