X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fcheck-params%2Fjobs.ts;h=22e23796477b99f4d6a92acd5fc5fcda2d0d2760;hb=c06be129506de9ac8d9910fed473c86724ca0e4e;hp=89760ff98b097891117ef4eef653d358b28f3ba7;hpb=b9f234371bfaf0d9cfa81e02fcea92cac1f9ae13;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/check-params/jobs.ts b/server/tests/api/check-params/jobs.ts index 89760ff98..22e237964 100644 --- a/server/tests/api/check-params/jobs.ts +++ b/server/tests/api/check-params/jobs.ts @@ -6,17 +6,18 @@ import { createUser, flushTests, killallServers, - runServer, + flushAndRunServer, ServerInfo, setAccessTokensToServers, - userLogin -} from '../../../../shared/utils' + userLogin, + cleanupTests +} from '../../../../shared/extra-utils' import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination -} from '../../../../shared/utils/requests/check-api-params' -import { makeGetRequest } from '../../../../shared/utils/requests/requests' +} from '../../../../shared/extra-utils/requests/check-api-params' +import { makeGetRequest } from '../../../../shared/extra-utils/requests/requests' describe('Test jobs API validators', function () { const path = '/api/v1/jobs/failed' @@ -28,9 +29,7 @@ describe('Test jobs API validators', function () { before(async function () { this.timeout(120000) - await flushTests() - - server = await runServer(1) + server = await flushAndRunServer(1) await setAccessTokensToServers([ server ]) @@ -38,7 +37,7 @@ describe('Test jobs API validators', function () { username: 'user1', password: 'my super password' } - await createUser(server.url, server.accessToken, user.username, user.password) + await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password }) userAccessToken = await userLogin(server, user) }) @@ -52,6 +51,17 @@ describe('Test jobs API validators', function () { }) }) + it('Should fail with an incorrect job type', async function () { + await makeGetRequest({ + url: server.url, + token: server.accessToken, + path, + query: { + jobType: 'toto' + } + }) + }) + it('Should fail with a bad start pagination', async function () { await checkBadStartPagination(server.url, path, server.accessToken) }) @@ -80,14 +90,10 @@ describe('Test jobs API validators', function () { statusCodeExpected: 403 }) }) + }) after(async function () { - killallServers([ server ]) - - // Keep the logs if the test failed - if (this['ok']) { - await flushTests() - } + await cleanupTests([ server ]) }) })