diff options
Diffstat (limited to 'server/tests/api/videos/videos-filter.ts')
-rw-r--r-- | server/tests/api/videos/videos-filter.ts | 49 |
1 files changed, 16 insertions, 33 deletions
diff --git a/server/tests/api/videos/videos-filter.ts b/server/tests/api/videos/videos-filter.ts index 7428b82c5..2306807bf 100644 --- a/server/tests/api/videos/videos-filter.ts +++ b/server/tests/api/videos/videos-filter.ts | |||
@@ -1,25 +1,18 @@ | |||
1 | /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ | 1 | /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ |
2 | 2 | ||
3 | import * as chai from 'chai' | ||
4 | import 'mocha' | 3 | import 'mocha' |
4 | import { expect } from 'chai' | ||
5 | import { | 5 | import { |
6 | cleanupTests, | 6 | cleanupTests, |
7 | createUser, | 7 | createMultipleServers, |
8 | doubleFollow, | 8 | doubleFollow, |
9 | flushAndRunMultipleServers, | ||
10 | makeGetRequest, | 9 | makeGetRequest, |
11 | ServerInfo, | 10 | PeerTubeServer, |
12 | setAccessTokensToServers, | 11 | setAccessTokensToServers |
13 | uploadVideo, | 12 | } from '@shared/extra-utils' |
14 | userLogin | 13 | import { HttpStatusCode, UserRole, Video, VideoPrivacy } from '@shared/models' |
15 | } from '../../../../shared/extra-utils' | 14 | |
16 | import { Video, VideoPrivacy } from '../../../../shared/models/videos' | 15 | async function getVideosNames (server: PeerTubeServer, token: string, filter: string, expectedStatus = HttpStatusCode.OK_200) { |
17 | import { UserRole } from '../../../../shared/models/users' | ||
18 | import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' | ||
19 | |||
20 | const expect = chai.expect | ||
21 | |||
22 | async function getVideosNames (server: ServerInfo, token: string, filter: string, statusCodeExpected = HttpStatusCode.OK_200) { | ||
23 | const paths = [ | 16 | const paths = [ |
24 | '/api/v1/video-channels/root_channel/videos', | 17 | '/api/v1/video-channels/root_channel/videos', |
25 | '/api/v1/accounts/root/videos', | 18 | '/api/v1/accounts/root/videos', |
@@ -38,7 +31,7 @@ async function getVideosNames (server: ServerInfo, token: string, filter: string | |||
38 | sort: 'createdAt', | 31 | sort: 'createdAt', |
39 | filter | 32 | filter |
40 | }, | 33 | }, |
41 | statusCodeExpected | 34 | expectedStatus |
42 | }) | 35 | }) |
43 | 36 | ||
44 | videosResults.push(res.body.data.map(v => v.name)) | 37 | videosResults.push(res.body.data.map(v => v.name)) |
@@ -48,42 +41,32 @@ async function getVideosNames (server: ServerInfo, token: string, filter: string | |||
48 | } | 41 | } |
49 | 42 | ||
50 | describe('Test videos filter', function () { | 43 | describe('Test videos filter', function () { |
51 | let servers: ServerInfo[] | 44 | let servers: PeerTubeServer[] |
52 | 45 | ||
53 | // --------------------------------------------------------------- | 46 | // --------------------------------------------------------------- |
54 | 47 | ||
55 | before(async function () { | 48 | before(async function () { |
56 | this.timeout(160000) | 49 | this.timeout(160000) |
57 | 50 | ||
58 | servers = await flushAndRunMultipleServers(2) | 51 | servers = await createMultipleServers(2) |
59 | 52 | ||
60 | await setAccessTokensToServers(servers) | 53 | await setAccessTokensToServers(servers) |
61 | 54 | ||
62 | for (const server of servers) { | 55 | for (const server of servers) { |
63 | const moderator = { username: 'moderator', password: 'my super password' } | 56 | const moderator = { username: 'moderator', password: 'my super password' } |
64 | await createUser( | 57 | await server.users.create({ username: moderator.username, password: moderator.password, role: UserRole.MODERATOR }) |
65 | { | 58 | server['moderatorAccessToken'] = await server.login.getAccessToken(moderator) |
66 | url: server.url, | ||
67 | accessToken: server.accessToken, | ||
68 | username: moderator.username, | ||
69 | password: moderator.password, | ||
70 | videoQuota: undefined, | ||
71 | videoQuotaDaily: undefined, | ||
72 | role: UserRole.MODERATOR | ||
73 | } | ||
74 | ) | ||
75 | server['moderatorAccessToken'] = await userLogin(server, moderator) | ||
76 | 59 | ||
77 | await uploadVideo(server.url, server.accessToken, { name: 'public ' + server.serverNumber }) | 60 | await server.videos.upload({ attributes: { name: 'public ' + server.serverNumber } }) |
78 | 61 | ||
79 | { | 62 | { |
80 | const attributes = { name: 'unlisted ' + server.serverNumber, privacy: VideoPrivacy.UNLISTED } | 63 | const attributes = { name: 'unlisted ' + server.serverNumber, privacy: VideoPrivacy.UNLISTED } |
81 | await uploadVideo(server.url, server.accessToken, attributes) | 64 | await server.videos.upload({ attributes }) |
82 | } | 65 | } |
83 | 66 | ||
84 | { | 67 | { |
85 | const attributes = { name: 'private ' + server.serverNumber, privacy: VideoPrivacy.PRIVATE } | 68 | const attributes = { name: 'private ' + server.serverNumber, privacy: VideoPrivacy.PRIVATE } |
86 | await uploadVideo(server.url, server.accessToken, attributes) | 69 | await server.videos.upload({ attributes }) |
87 | } | 70 | } |
88 | } | 71 | } |
89 | 72 | ||