Introduce redundancy command

[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 ad6a4b43f3e7eeaf578135c218d39ed08fc90102..24a4c61525f062c6ea2bd6c3f413287b40adf8c1 100644 (file)
--- a/server/tests/api/videos/video-nsfw.ts
+++ b/server/tests/api/videos/video-nsfw.ts
@@ -1,57 +1,82 @@
-/* tslint:disable:no-unused-expression */
+/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
 
-import * as chai from 'chai'
 import 'mocha'
-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 * as chai from 'chai'
 import {
+  cleanupTests,
+  createUser,
   flushAndRunServer,
   getAccountVideos,
   getConfig,
   getCustomConfig,
   getMyUserInformation,
+  getMyVideos,
   getVideoChannelVideos,
+  getVideosList,
   getVideosListWithToken,
-  searchVideo,
-  searchVideoWithToken,
+  ServerInfo,
+  setAccessTokensToServers,
   updateCustomConfig,
-  updateMyUser
-} from '../../../../shared/extra-utils'
-import { ServerConfig } from '../../../../shared/models'
-import { CustomConfig } from '../../../../shared/models/server/custom-config.model'
-import { User } from '../../../../shared/models/users'
+  updateMyUser,
+  uploadVideo,
+  userLogin
+} from '@shared/extra-utils'
+import { BooleanBothQuery, CustomConfig, ServerConfig, User, VideosOverview } from '@shared/models'
 
 const expect = chai.expect
 
+function createOverviewRes (overview: VideosOverview) {
+  const videos = overview.categories[0].videos
+  return { body: { data: videos, total: videos.length } }
+}
+
 describe('Test video NSFW policy', function () {
   let server: ServerInfo
   let userAccessToken: string
   let customConfig: CustomConfig
 
-  function getVideosFunctions (token?: string, query = {}) {
+  function getVideosFunctions (token?: string, query: { nsfw?: BooleanBothQuery } = {}) {
     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
+        const hasQuery = Object.keys(query).length !== 0
+        let promises: Promise<any>[]
 
         if (token) {
-          return Promise.all([
+          promises = [
             getVideosListWithToken(server.url, token, query),
-            searchVideoWithToken(server.url, 'n', token, query),
+            server.searchCommand.advancedVideoSearch({ token, search: { search: 'n', ...query } }),
             getAccountVideos(server.url, token, accountName, 0, 5, undefined, query),
             getVideoChannelVideos(server.url, token, videoChannelName, 0, 5, undefined, query)
-          ])
+          ]
+
+          // Overviews do not support video filters
+          if (!hasQuery) {
+            const p = server.overviewsCommand.getVideos({ page: 1, token })
+                                             .then(res => createOverviewRes(res))
+            promises.push(p)
+          }
+
+          return Promise.all(promises)
         }
 
-        return Promise.all([
+        promises = [
           getVideosList(server.url),
-          searchVideo(server.url, 'n'),
+          server.searchCommand.searchVideos({ search: 'n' }),
           getAccountVideos(server.url, undefined, accountName, 0, 5),
           getVideoChannelVideos(server.url, undefined, videoChannelName, 0, 5)
-        ])
+        ]
+
+        // Overviews do not support video filters
+        if (!hasQuery) {
+          const p = server.overviewsCommand.getVideos({ page: 1 })
+                                           .then(res => createOverviewRes(res))
+          promises.push(p)
+        }
+
+        return Promise.all(promises)
       })
   }
 
@@ -63,12 +88,12 @@ describe('Test video NSFW policy', function () {
     await setAccessTokensToServers([ server ])
 
     {
-      const attributes = { name: 'nsfw', nsfw: true }
+      const attributes = { name: 'nsfw', nsfw: true, category: 1 }
       await uploadVideo(server.url, server.accessToken, attributes)
     }
 
     {
-      const attributes = { name: 'normal', nsfw: false }
+      const attributes = { name: 'normal', nsfw: false, category: 1 }
       await uploadVideo(server.url, server.accessToken, attributes)
     }
 
@@ -89,8 +114,8 @@ describe('Test video NSFW policy', function () {
 
         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')
+        expect(videos[0].name).to.equal('normal')
+        expect(videos[1].name).to.equal('nsfw')
       }
     })
 
@@ -107,7 +132,7 @@ describe('Test video NSFW policy', function () {
 
         const videos = res.body.data
         expect(videos).to.have.lengthOf(1)
-        expect(videos[ 0 ].name).to.equal('normal')
+        expect(videos[0].name).to.equal('normal')
       }
     })
 
@@ -124,8 +149,8 @@ describe('Test video NSFW policy', function () {
 
         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')
+        expect(videos[0].name).to.equal('normal')
+        expect(videos[1].name).to.equal('nsfw')
       }
     })
   })
@@ -154,8 +179,8 @@ describe('Test video NSFW policy', function () {
 
         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')
+        expect(videos[0].name).to.equal('normal')
+        expect(videos[1].name).to.equal('nsfw')
       }
     })
 
@@ -171,8 +196,8 @@ describe('Test video NSFW policy', function () {
 
         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')
+        expect(videos[0].name).to.equal('normal')
+        expect(videos[1].name).to.equal('nsfw')
       }
     })
 
@@ -188,7 +213,7 @@ describe('Test video NSFW policy', function () {
 
         const videos = res.body.data
         expect(videos).to.have.lengthOf(1)
-        expect(videos[ 0 ].name).to.equal('normal')
+        expect(videos[0].name).to.equal('normal')
       }
     })
 
@@ -198,27 +223,27 @@ describe('Test video NSFW policy', function () {
 
       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')
+      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 })) {
+      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')
+        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 })) {
+      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')
+        expect(videos[0].name).to.equal('normal')
       }
     })
 
@@ -228,8 +253,8 @@ describe('Test video NSFW policy', function () {
 
         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')
+        expect(videos[0].name).to.equal('normal')
+        expect(videos[1].name).to.equal('nsfw')
       }
     })
   })