diff options
Diffstat (limited to 'server/tests/api/videos/video-playlists.ts')
-rw-r--r-- | server/tests/api/videos/video-playlists.ts | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/server/tests/api/videos/video-playlists.ts b/server/tests/api/videos/video-playlists.ts index e57d86c14..40f61ca19 100644 --- a/server/tests/api/videos/video-playlists.ts +++ b/server/tests/api/videos/video-playlists.ts | |||
@@ -13,9 +13,6 @@ import { | |||
13 | setAccessTokensToServers, | 13 | setAccessTokensToServers, |
14 | setDefaultVideoChannel, | 14 | setDefaultVideoChannel, |
15 | testImage, | 15 | testImage, |
16 | updateVideo, | ||
17 | uploadVideo, | ||
18 | uploadVideoAndGetId, | ||
19 | wait, | 16 | wait, |
20 | waitJobs | 17 | waitJobs |
21 | } from '@shared/extra-utils' | 18 | } from '@shared/extra-utils' |
@@ -99,14 +96,14 @@ describe('Test video playlists', function () { | |||
99 | for (const server of servers) { | 96 | for (const server of servers) { |
100 | for (let i = 0; i < 7; i++) { | 97 | for (let i = 0; i < 7; i++) { |
101 | const name = `video ${i} server ${server.serverNumber}` | 98 | const name = `video ${i} server ${server.serverNumber}` |
102 | const resVideo = await uploadVideo(server.url, server.accessToken, { name, nsfw: false }) | 99 | const video = await server.videosCommand.upload({ attributes: { name, nsfw: false } }) |
103 | 100 | ||
104 | server.videos.push(resVideo.body.video) | 101 | server.videos.push(video) |
105 | } | 102 | } |
106 | } | 103 | } |
107 | } | 104 | } |
108 | 105 | ||
109 | nsfwVideoServer1 = (await uploadVideoAndGetId({ server: servers[0], videoName: 'NSFW video', nsfw: true })).id | 106 | nsfwVideoServer1 = (await servers[0].videosCommand.quickUpload({ name: 'NSFW video', nsfw: true })).id |
110 | 107 | ||
111 | userTokenServer1 = await servers[0].usersCommand.generateUserAndToken('user1') | 108 | userTokenServer1 = await servers[0].usersCommand.generateUserAndToken('user1') |
112 | 109 | ||
@@ -620,9 +617,9 @@ describe('Test video playlists', function () { | |||
620 | return commands[0].addElement({ token: userTokenServer1, playlistId: playlistServer1Id2, attributes }) | 617 | return commands[0].addElement({ token: userTokenServer1, playlistId: playlistServer1Id2, attributes }) |
621 | } | 618 | } |
622 | 619 | ||
623 | video1 = (await uploadVideoAndGetId({ server: servers[0], videoName: 'video 89', token: userTokenServer1 })).uuid | 620 | video1 = (await servers[0].videosCommand.quickUpload({ name: 'video 89', token: userTokenServer1 })).uuid |
624 | video2 = (await uploadVideoAndGetId({ server: servers[1], videoName: 'video 90' })).uuid | 621 | video2 = (await servers[1].videosCommand.quickUpload({ name: 'video 90' })).uuid |
625 | video3 = (await uploadVideoAndGetId({ server: servers[0], videoName: 'video 91', nsfw: true })).uuid | 622 | video3 = (await servers[0].videosCommand.quickUpload({ name: 'video 91', nsfw: true })).uuid |
626 | 623 | ||
627 | await waitJobs(servers) | 624 | await waitJobs(servers) |
628 | 625 | ||
@@ -640,7 +637,7 @@ describe('Test video playlists', function () { | |||
640 | const position = 1 | 637 | const position = 1 |
641 | 638 | ||
642 | { | 639 | { |
643 | await updateVideo(servers[0].url, servers[0].accessToken, video1, { privacy: VideoPrivacy.PRIVATE }) | 640 | await servers[0].videosCommand.update({ id: video1, attributes: { privacy: VideoPrivacy.PRIVATE } }) |
644 | await waitJobs(servers) | 641 | await waitJobs(servers) |
645 | 642 | ||
646 | await checkPlaylistElementType(groupUser1, playlistServer1UUID2, VideoPlaylistElementType.REGULAR, position, name, 3) | 643 | await checkPlaylistElementType(groupUser1, playlistServer1UUID2, VideoPlaylistElementType.REGULAR, position, name, 3) |
@@ -650,7 +647,7 @@ describe('Test video playlists', function () { | |||
650 | } | 647 | } |
651 | 648 | ||
652 | { | 649 | { |
653 | await updateVideo(servers[0].url, servers[0].accessToken, video1, { privacy: VideoPrivacy.PUBLIC }) | 650 | await servers[0].videosCommand.update({ id: video1, attributes: { privacy: VideoPrivacy.PUBLIC } }) |
654 | await waitJobs(servers) | 651 | await waitJobs(servers) |
655 | 652 | ||
656 | await checkPlaylistElementType(groupUser1, playlistServer1UUID2, VideoPlaylistElementType.REGULAR, position, name, 3) | 653 | await checkPlaylistElementType(groupUser1, playlistServer1UUID2, VideoPlaylistElementType.REGULAR, position, name, 3) |