diff options
author | Chocobozzz <me@florianbigard.com> | 2020-11-16 13:49:09 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-11-16 13:57:14 +0100 |
commit | 19149d45b8f68569535f7188ef25e09e3d62c8b4 (patch) | |
tree | 92da0e0db2b0e277b2110a630f502433c86c9119 /server/tests/api/videos/video-playlists.ts | |
parent | 8872828d59a5152e27734711ae30ebe86e84f570 (diff) | |
parent | f1273314593a4a7dc7ec9594ce0c6c3ae8f62b34 (diff) | |
download | PeerTube-19149d45b8f68569535f7188ef25e09e3d62c8b4.tar.gz PeerTube-19149d45b8f68569535f7188ef25e09e3d62c8b4.tar.zst PeerTube-19149d45b8f68569535f7188ef25e09e3d62c8b4.zip |
Merge branch 'feature/admin-comments' into develop
Diffstat (limited to 'server/tests/api/videos/video-playlists.ts')
-rw-r--r-- | server/tests/api/videos/video-playlists.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/server/tests/api/videos/video-playlists.ts b/server/tests/api/videos/video-playlists.ts index 0bfb5bcd4..b194665ba 100644 --- a/server/tests/api/videos/video-playlists.ts +++ b/server/tests/api/videos/video-playlists.ts | |||
@@ -628,7 +628,7 @@ describe('Test video playlists', function () { | |||
628 | let video3: string | 628 | let video3: string |
629 | 629 | ||
630 | before(async function () { | 630 | before(async function () { |
631 | this.timeout(30000) | 631 | this.timeout(60000) |
632 | 632 | ||
633 | groupUser1 = [ Object.assign({}, servers[0], { accessToken: userAccessTokenServer1 }) ] | 633 | groupUser1 = [ Object.assign({}, servers[0], { accessToken: userAccessTokenServer1 }) ] |
634 | groupWithoutToken1 = [ Object.assign({}, servers[0], { accessToken: undefined }) ] | 634 | groupWithoutToken1 = [ Object.assign({}, servers[0], { accessToken: undefined }) ] |
@@ -656,6 +656,8 @@ describe('Test video playlists', function () { | |||
656 | video2 = (await uploadVideoAndGetId({ server: servers[1], videoName: 'video 90' })).uuid | 656 | video2 = (await uploadVideoAndGetId({ server: servers[1], videoName: 'video 90' })).uuid |
657 | video3 = (await uploadVideoAndGetId({ server: servers[0], videoName: 'video 91', nsfw: true })).uuid | 657 | video3 = (await uploadVideoAndGetId({ server: servers[0], videoName: 'video 91', nsfw: true })).uuid |
658 | 658 | ||
659 | await waitJobs(servers) | ||
660 | |||
659 | await addVideo({ videoId: video1, startTimestamp: 15, stopTimestamp: 28 }) | 661 | await addVideo({ videoId: video1, startTimestamp: 15, stopTimestamp: 28 }) |
660 | await addVideo({ videoId: video2, startTimestamp: 35 }) | 662 | await addVideo({ videoId: video2, startTimestamp: 35 }) |
661 | await addVideo({ videoId: video3 }) | 663 | await addVideo({ videoId: video3 }) |