/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-import 'mocha'
-import * as chai from 'chai'
-import {
- cleanupTests,
- flushAndRunServer,
- getAccountVideos,
- getMyVideos,
- getVideoChannelVideos,
- getVideosList,
- getVideosListWithToken,
- ServerInfo,
- setAccessTokensToServers,
- uploadVideo
-} from '@shared/extra-utils'
+import { expect } from 'chai'
+import { cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands'
import { BooleanBothQuery, CustomConfig, ResultList, Video, VideosOverview } from '@shared/models'
-const expect = chai.expect
-
function createOverviewRes (overview: VideosOverview) {
const videos = overview.categories[0].videos
return { data: videos, total: videos.length }
}
describe('Test video NSFW policy', function () {
- let server: ServerInfo
+ let server: PeerTubeServer
let userAccessToken: string
let customConfig: CustomConfig
async function getVideosFunctions (token?: string, query: { nsfw?: BooleanBothQuery } = {}) {
- const user = await server.usersCommand.getMyInfo()
- const videoChannelName = user.videoChannels[0].name
+ const user = await server.users.getMyInfo()
+
+ const channelName = user.videoChannels[0].name
const accountName = user.account.name + '@' + user.account.host
+
const hasQuery = Object.keys(query).length !== 0
let promises: Promise<ResultList<Video>>[]
if (token) {
promises = [
- getVideosListWithToken(server.url, token, query).then(res => res.body),
- server.searchCommand.advancedVideoSearch({ token, search: { search: 'n', sort: '-publishedAt', ...query } }),
- getAccountVideos(server.url, token, accountName, 0, 5, undefined, query).then(res => res.body),
- getVideoChannelVideos(server.url, token, videoChannelName, 0, 5, undefined, query).then(res => res.body)
+ server.search.advancedVideoSearch({ token, search: { search: 'n', sort: '-publishedAt', ...query } }),
+ server.videos.listWithToken({ token, ...query }),
+ server.videos.listByAccount({ token, handle: accountName, ...query }),
+ server.videos.listByChannel({ token, handle: channelName, ...query })
]
// Overviews do not support video filters
if (!hasQuery) {
- const p = server.overviewsCommand.getVideos({ page: 1, token })
+ const p = server.overviews.getVideos({ page: 1, token })
.then(res => createOverviewRes(res))
promises.push(p)
}
}
promises = [
- getVideosList(server.url).then(res => res.body),
- server.searchCommand.searchVideos({ search: 'n', sort: '-publishedAt' }),
- getAccountVideos(server.url, undefined, accountName, 0, 5).then(res => res.body),
- getVideoChannelVideos(server.url, undefined, videoChannelName, 0, 5).then(res => res.body)
+ server.search.searchVideos({ search: 'n', sort: '-publishedAt' }),
+ server.videos.list(),
+ server.videos.listByAccount({ token: null, handle: accountName }),
+ server.videos.listByChannel({ token: null, handle: channelName })
]
// Overviews do not support video filters
if (!hasQuery) {
- const p = server.overviewsCommand.getVideos({ page: 1 })
+ const p = server.overviews.getVideos({ page: 1 })
.then(res => createOverviewRes(res))
promises.push(p)
}
before(async function () {
this.timeout(50000)
- server = await flushAndRunServer(1)
+ server = await createSingleServer(1)
// Get the access tokens
await setAccessTokensToServers([ server ])
{
const attributes = { name: 'nsfw', nsfw: true, category: 1 }
- await uploadVideo(server.url, server.accessToken, attributes)
+ await server.videos.upload({ attributes })
}
{
const attributes = { name: 'normal', nsfw: false, category: 1 }
- await uploadVideo(server.url, server.accessToken, attributes)
+ await server.videos.upload({ attributes })
}
- customConfig = await server.configCommand.getCustomConfig()
+ customConfig = await server.config.getCustomConfig()
})
describe('Instance default NSFW policy', function () {
+
it('Should display NSFW videos with display default NSFW policy', async function () {
- const serverConfig = await server.configCommand.getConfig()
+ const serverConfig = await server.config.getConfig()
expect(serverConfig.instance.defaultNSFWPolicy).to.equal('display')
for (const body of await getVideosFunctions()) {
it('Should not display NSFW videos with do_not_list default NSFW policy', async function () {
customConfig.instance.defaultNSFWPolicy = 'do_not_list'
- await server.configCommand.updateCustomConfig({ newCustomConfig: customConfig })
+ await server.config.updateCustomConfig({ newCustomConfig: customConfig })
- const serverConfig = await server.configCommand.getConfig()
+ const serverConfig = await server.config.getConfig()
expect(serverConfig.instance.defaultNSFWPolicy).to.equal('do_not_list')
for (const body of await getVideosFunctions()) {
it('Should display NSFW videos with blur default NSFW policy', async function () {
customConfig.instance.defaultNSFWPolicy = 'blur'
- await server.configCommand.updateCustomConfig({ newCustomConfig: customConfig })
+ await server.config.updateCustomConfig({ newCustomConfig: customConfig })
- const serverConfig = await server.configCommand.getConfig()
+ const serverConfig = await server.config.getConfig()
expect(serverConfig.instance.defaultNSFWPolicy).to.equal('blur')
for (const body of await getVideosFunctions()) {
it('Should create a user having the default nsfw policy', async function () {
const username = 'user1'
const password = 'my super password'
- await server.usersCommand.create({ username: username, password: password })
+ await server.users.create({ username, password })
- userAccessToken = await server.loginCommand.getAccessToken({ username, password })
+ userAccessToken = await server.login.getAccessToken({ username, password })
- const user = await server.usersCommand.getMyInfo({ token: userAccessToken })
+ const user = await server.users.getMyInfo({ token: userAccessToken })
expect(user.nsfwPolicy).to.equal('blur')
})
it('Should display NSFW videos with blur user NSFW policy', async function () {
customConfig.instance.defaultNSFWPolicy = 'do_not_list'
- await server.configCommand.updateCustomConfig({ newCustomConfig: customConfig })
+ await server.config.updateCustomConfig({ newCustomConfig: customConfig })
for (const body of await getVideosFunctions(userAccessToken)) {
expect(body.total).to.equal(2)
})
it('Should display NSFW videos with display user NSFW policy', async function () {
- await server.usersCommand.updateMe({ nsfwPolicy: 'display' })
+ await server.users.updateMe({ nsfwPolicy: 'display' })
for (const body of await getVideosFunctions(server.accessToken)) {
expect(body.total).to.equal(2)
})
it('Should not display NSFW videos with do_not_list user NSFW policy', async function () {
- await server.usersCommand.updateMe({ nsfwPolicy: 'do_not_list' })
+ await server.users.updateMe({ nsfwPolicy: 'do_not_list' })
for (const body of await getVideosFunctions(server.accessToken)) {
expect(body.total).to.equal(1)
})
it('Should be able to see my NSFW videos even with do_not_list user NSFW policy', async function () {
- const res = await getMyVideos(server.url, server.accessToken, 0, 5)
- expect(res.body.total).to.equal(2)
+ const { total, data } = await server.videos.listMyVideos()
+ expect(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')
+ expect(data).to.have.lengthOf(2)
+ expect(data[0].name).to.equal('normal')
+ expect(data[1].name).to.equal('nsfw')
})
it('Should display NSFW videos when the nsfw param === true', async function () {