X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Ftests%2Fapi%2Fcheck-params%2Fvideo-playlists.ts;h=0410e737a1e73e83b862654ba175c5b7edef2dc5;hb=818c449b3c34e9f324ac744120c8774e724ab25e;hp=0f34847633bd778853e1812b8ffff54acee2119c;hpb=94565d52bb2883e09f16d1363170ac9c0dccb7a1;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/check-params/video-playlists.ts b/server/tests/api/check-params/video-playlists.ts index 0f3484763..0410e737a 100644 --- a/server/tests/api/check-params/video-playlists.ts +++ b/server/tests/api/check-params/video-playlists.ts @@ -1,22 +1,22 @@ -/* tslint:disable:no-unused-expression */ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ import 'mocha' import { addVideoInPlaylist, + cleanupTests, createVideoPlaylist, deleteVideoPlaylist, - flushTests, + flushAndRunServer, generateUserAccessToken, getAccountPlaylistsListWithToken, getVideoPlaylist, immutableAssign, - killallServers, makeGetRequest, removeVideoFromPlaylist, reorderVideosPlaylist, - runServer, ServerInfo, - setAccessTokensToServers, setDefaultVideoChannel, + setAccessTokensToServers, + setDefaultVideoChannel, updateVideoPlaylist, updateVideoPlaylistElement, uploadVideoAndGetId @@ -36,16 +36,16 @@ describe('Test video playlists API validator', function () { let privatePlaylistUUID: string let watchLaterPlaylistId: number let videoId: number + // eslint-disable-next-line @typescript-eslint/no-unused-vars let videoId2: number + let playlistElementId: number // --------------------------------------------------------------- before(async function () { this.timeout(30000) - await flushTests() - - server = await runServer(1) + server = await flushAndRunServer(1) await setAccessTokensToServers([ server ]) await setDefaultVideoChannel([ server ]) @@ -55,7 +55,7 @@ describe('Test video playlists API validator', function () { videoId2 = (await uploadVideoAndGetId({ server, videoName: 'video 2' })).id { - const res = await getAccountPlaylistsListWithToken(server.url, server.accessToken, 'root',0, 5, VideoPlaylistType.WATCH_LATER) + const res = await getAccountPlaylistsListWithToken(server.url, server.accessToken, 'root', 0, 5, VideoPlaylistType.WATCH_LATER) watchLaterPlaylistId = res.body.data[0].id } @@ -134,18 +134,18 @@ describe('Test video playlists API validator', function () { }) describe('When listing videos of a playlist', function () { - const path = '/api/v1/video-playlists' + const path = '/api/v1/video-playlists/' it('Should fail with a bad start pagination', async function () { - await checkBadStartPagination(server.url, path, server.accessToken) + await checkBadStartPagination(server.url, path + playlistUUID + '/videos', server.accessToken) }) it('Should fail with a bad count pagination', async function () { - await checkBadCountPagination(server.url, path, server.accessToken) + await checkBadCountPagination(server.url, path + playlistUUID + '/videos', server.accessToken) }) - it('Should fail with a bad filter', async function () { - await checkBadSortPagination(server.url, path, server.accessToken) + it('Should success with the correct parameters', async function () { + await makeGetRequest({ url: server.url, path: path + playlistUUID + '/videos', statusCodeExpected: 200 }) }) }) @@ -207,7 +207,6 @@ describe('Test video playlists API validator', function () { const params = getBase({ displayName: undefined }) await createVideoPlaylist(params) - await updateVideoPlaylist(getUpdate(params, playlistUUID)) }) it('Should fail with an incorrect display name', async function () { @@ -271,17 +270,6 @@ describe('Test video playlists API validator', function () { )) }) - it('Should fail to update to private a public/unlisted playlist', async function () { - const params = getBase({ privacy: VideoPlaylistPrivacy.PUBLIC }, { expectedStatus: 200 }) - - const res = await createVideoPlaylist(params) - const playlist = res.body.videoPlaylist - - const paramsUpdate = getBase({ privacy: VideoPlaylistPrivacy.PRIVATE }, { expectedStatus: 400 }) - - await updateVideoPlaylist(getUpdate(paramsUpdate, playlist.id)) - }) - it('Should fail to update the watch later playlist', async function () { await updateVideoPlaylist(getUpdate( getBase({}, { expectedStatus: 400 }), @@ -310,7 +298,7 @@ describe('Test video playlists API validator', function () { token: server.accessToken, playlistId: playlistUUID, elementAttrs: Object.assign({ - videoId: videoId, + videoId, startTimestamp: 2, stopTimestamp: 3 }, elementAttrs) @@ -358,7 +346,8 @@ describe('Test video playlists API validator', function () { it('Succeed with the correct params', async function () { const params = getBase({}, { expectedStatus: 200 }) - await addVideoInPlaylist(params) + const res = await addVideoInPlaylist(params) + playlistElementId = res.body.videoPlaylistElement.id }) it('Should fail if the video was already added in the playlist', async function () { @@ -376,7 +365,7 @@ describe('Test video playlists API validator', function () { startTimestamp: 1, stopTimestamp: 2 }, elementAttrs), - videoId: videoId, + playlistElementId, playlistId: playlistUUID, expectedStatus: 400 }, wrapper) @@ -404,14 +393,14 @@ describe('Test video playlists API validator', function () { } }) - it('Should fail with an unknown or incorrect video id', async function () { + it('Should fail with an unknown or incorrect playlistElement id', async function () { { - const params = getBase({}, { videoId: 'toto' }) + const params = getBase({}, { playlistElementId: 'toto' }) await updateVideoPlaylistElement(params) } { - const params = getBase({}, { videoId: 42, expectedStatus: 404 }) + const params = getBase({}, { playlistElementId: 42, expectedStatus: 404 }) await updateVideoPlaylistElement(params) } }) @@ -429,7 +418,7 @@ describe('Test video playlists API validator', function () { }) it('Should fail with an unknown element', async function () { - const params = getBase({}, { videoId: videoId2, expectedStatus: 404 }) + const params = getBase({}, { playlistElementId: 888, expectedStatus: 404 }) await updateVideoPlaylistElement(params) }) @@ -461,7 +450,7 @@ describe('Test video playlists API validator', function () { videoId3 = (await uploadVideoAndGetId({ server, videoName: 'video 3' })).id videoId4 = (await uploadVideoAndGetId({ server, videoName: 'video 4' })).id - for (let id of [ videoId3, videoId4 ]) { + for (const id of [ videoId3, videoId4 ]) { await addVideoInPlaylist({ url: server.url, token: server.accessToken, @@ -488,7 +477,7 @@ describe('Test video playlists API validator', function () { } { - const params = getBase({}, { playlistId: 42, expectedStatus: 404 }) + const params = getBase({}, { playlistId: 42, expectedStatus: 404 }) await reorderVideosPlaylist(params) } }) @@ -601,7 +590,7 @@ describe('Test video playlists API validator', function () { return Object.assign({ url: server.url, token: server.accessToken, - videoId: videoId, + playlistElementId, playlistId: playlistUUID, expectedStatus: 400 }, wrapper) @@ -631,18 +620,18 @@ describe('Test video playlists API validator', function () { it('Should fail with an unknown or incorrect video id', async function () { { - const params = getBase({ videoId: 'toto' }) + const params = getBase({ playlistElementId: 'toto' }) await removeVideoFromPlaylist(params) } { - const params = getBase({ videoId: 42, expectedStatus: 404 }) + const params = getBase({ playlistElementId: 42, expectedStatus: 404 }) await removeVideoFromPlaylist(params) } }) it('Should fail with an unknown element', async function () { - const params = getBase({ videoId: videoId2, expectedStatus: 404 }) + const params = getBase({ playlistElementId: 888, expectedStatus: 404 }) await removeVideoFromPlaylist(params) }) @@ -671,11 +660,6 @@ describe('Test video playlists API validator', function () { }) after(async function () { - killallServers([ server ]) - - // Keep the logs if the test failed - if (this['ok']) { - await flushTests() - } + await cleanupTests([ server ]) }) })