X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fmoderation%2Fabuses.ts;h=568fbefcf06e88c5b608218e0b9ffd0b81c8dfb3;hb=a2fb5fb8b1007e3ce82e707917f5d9a37374e99b;hp=0c3bed3e7e01dc472f9cccb1f255f2960b67a929;hpb=f332d502d5d6a6c7ab62199c8b45f24e488f48e7;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/moderation/abuses.ts b/server/tests/api/moderation/abuses.ts index 0c3bed3e7..568fbefcf 100644 --- a/server/tests/api/moderation/abuses.ts +++ b/server/tests/api/moderation/abuses.ts @@ -2,6 +2,7 @@ import 'mocha' import * as chai from 'chai' +import { AbuseMessage, AbusePredefinedReasonsString, AbuseState, AdminAbuse, UserAbuse } from '@shared/models' import { AbusesCommand, cleanupTests, @@ -9,9 +10,10 @@ import { doubleFollow, PeerTubeServer, setAccessTokensToServers, + setDefaultAccountAvatar, + setDefaultChannelAvatar, waitJobs } from '@shared/server-commands' -import { AbuseMessage, AbusePredefinedReasonsString, AbuseState, AdminAbuse, UserAbuse } from '@shared/models' const expect = chai.expect @@ -27,8 +29,9 @@ describe('Test abuses', function () { // Run servers servers = await createMultipleServers(2) - // Get the access tokens await setAccessTokensToServers(servers) + await setDefaultChannelAvatar(servers) + await setDefaultAccountAvatar(servers) // Server 1 and server 2 follow each other await doubleFollow(servers[0], servers[1]) @@ -165,7 +168,7 @@ describe('Test abuses', function () { expect(abuse2.reporterAccount.name).to.equal('root') expect(abuse2.reporterAccount.host).to.equal(servers[0].host) - expect(abuse2.video.id).to.equal(servers[1].store.videoCreated.id) + expect(abuse2.video.uuid).to.equal(servers[1].store.videoCreated.uuid) expect(abuse2.comment).to.be.null @@ -527,7 +530,7 @@ describe('Test abuses', function () { it('Should keep the comment abuse when deleting the comment', async function () { this.timeout(10000) - const commentServer2 = await getComment(servers[0], servers[1].store.videoCreated.id) + const commentServer2 = await getComment(servers[0], servers[1].store.videoCreated.uuid) await servers[0].comments.delete({ videoId: servers[1].store.videoCreated.uuid, commentId: commentServer2.id })