X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftests%2Fapi%2Fusers%2Fusers-multiple-servers.ts;h=16372b03945f6b16f799cbc161dcaa7698a6090c;hb=83903cb65d531a6b6b91715387493ba8312b264d;hp=e304e5d67f6d5331dd87da64f0f5ebc75bbc187b;hpb=c0e8b12e7fd554ba4d2ceb0c4900804c6a4c63ea;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/tests/api/users/users-multiple-servers.ts b/server/tests/api/users/users-multiple-servers.ts index e304e5d67..16372b039 100644 --- a/server/tests/api/users/users-multiple-servers.ts +++ b/server/tests/api/users/users-multiple-servers.ts @@ -7,21 +7,24 @@ import { checkTmpIsEmpty, checkVideoFilesWereRemoved, cleanupTests, - doubleFollow, createMultipleServers, + doubleFollow, PeerTubeServer, + saveVideoInServers, setAccessTokensToServers, testImage, waitJobs } from '@shared/extra-utils' -import { User } from '@shared/models' +import { MyUser } from '@shared/models' const expect = chai.expect describe('Test users with multiple servers', function () { let servers: PeerTubeServer[] = [] - let user: User + + let user: MyUser let userId: number + let videoUUID: string let userAccessToken: string let userAvatarFilename: string @@ -45,18 +48,17 @@ describe('Test users with multiple servers', function () { await servers[0].videos.upload() { - const user = { - username: 'user1', - password: 'password' - } - const created = await servers[0].users.create(user) + const username = 'user1' + const created = await servers[0].users.create({ username }) userId = created.id - userAccessToken = await servers[0].login.getAccessToken(user) + userAccessToken = await servers[0].login.getAccessToken(username) } { const { uuid } = await servers[0].videos.upload({ token: userAccessToken }) videoUUID = uuid + + await saveVideoInServers(servers, videoUUID) } await waitJobs(servers) @@ -195,7 +197,7 @@ describe('Test users with multiple servers', function () { it('Should not have video files', async () => { for (const server of servers) { - await checkVideoFilesWereRemoved(videoUUID, server) + await checkVideoFilesWereRemoved({ server, video: server.store.videoDetails }) } })