X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fserver%2Fbulk.ts;h=66d791a0f2cb13dea859e28489f3df42c5dbd71d;hb=81f14b911211be065448e92bcc253f470c5ff2a9;hp=16cbcd5c38f5887134f8816f1b14585c361cc1f9;hpb=a24bd1ed41b43790bab6ba789580bb4e85f07d85;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/server/bulk.ts b/server/tests/api/server/bulk.ts index 16cbcd5c3..66d791a0f 100644 --- a/server/tests/api/server/bulk.ts +++ b/server/tests/api/server/bulk.ts @@ -1,7 +1,6 @@ /* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ -import 'mocha' -import * as chai from 'chai' +import { expect } from 'chai' import { BulkCommand, cleanupTests, @@ -10,9 +9,7 @@ import { PeerTubeServer, setAccessTokensToServers, waitJobs -} from '@shared/extra-utils' - -const expect = chai.expect +} from '@shared/server-commands' describe('Test bulk actions', function () { const commentsUser3: { videoId: number, commentId: number }[] = [] @@ -25,7 +22,7 @@ describe('Test bulk actions', function () { let bulkCommand: BulkCommand before(async function () { - this.timeout(30000) + this.timeout(120000) servers = await createMultipleServers(2) @@ -80,7 +77,7 @@ describe('Test bulk actions', function () { const { data } = await servers[1].comments.listThreads({ videoId: video.id }) const comment = data.find(c => c.text === 'comment by user 3') - if (video.account.host === 'localhost:' + servers[0].port) { + if (video.account.host === servers[0].host) { expect(comment).to.not.exist } else { expect(comment).to.exist @@ -90,7 +87,7 @@ describe('Test bulk actions', function () { } before(async function () { - this.timeout(120000) + this.timeout(240000) await servers[0].videos.upload({ attributes: { name: 'video 1 server 1' } }) await servers[0].videos.upload({ attributes: { name: 'video 2 server 1' } }) @@ -154,7 +151,7 @@ describe('Test bulk actions', function () { await bulkCommand.removeCommentsOf({ attributes: { - accountName: 'user3@localhost:' + servers[1].port, + accountName: 'user3@' + servers[1].host, scope: 'instance' } })