getVideoChannelsList,
removeUser,
updateMyUser,
- userLogin,
- wait
-} from '../../utils'
-import { flushTests, getMyUserInformation, killallServers, ServerInfo, testImage, updateMyAvatar, uploadVideo } from '../../utils/index'
-import { checkActorFilesWereRemoved, getAccount, getAccountsList } from '../../utils/users/accounts'
-import { setAccessTokensToServers } from '../../utils/users/login'
+ userLogin
+} from '../../../../shared/utils'
+import { getMyUserInformation, killallServers, ServerInfo, testImage, updateMyAvatar, uploadVideo } from '../../../../shared/utils/index'
+import { checkActorFilesWereRemoved, getAccount, getAccountsList } from '../../../../shared/utils/users/accounts'
+import { setAccessTokensToServers } from '../../../../shared/utils/users/login'
import { User } from '../../../../shared/models/users'
import { VideoChannel } from '../../../../shared/models/videos'
+import { waitJobs } from '../../../../shared/utils/server/jobs'
const expect = chai.expect
let servers: ServerInfo[] = []
let user: User
let userAccountName: string
+ let userAccountUUID: string
let userVideoChannelUUID: string
let userId: number
let videoUUID: string
{
const res = await getMyUserInformation(servers[0].url, userAccessToken)
- userAccountName = res.body.account.name + '@' + res.body.account.host
+ const account: Account = res.body.account
+ userAccountName = account.name + '@' + account.host
+ userAccountUUID = account.uuid
}
{
videoUUID = resVideo.body.video.uuid
}
- await wait(5000)
+ await waitJobs(servers)
})
it('Should be able to update my display name', async function () {
user = res.body
expect(user.account.displayName).to.equal('my super display name')
- await wait(5000)
+ await waitJobs(servers)
})
it('Should be able to update my description', async function () {
expect(user.account.displayName).to.equal('my super display name')
expect(user.account.description).to.equal('my super description updated')
- await wait(5000)
+ await waitJobs(servers)
})
it('Should be able to update my avatar', async function () {
await testImage(servers[0].url, 'avatar2-resized', user.account.avatar.path, '.png')
- await wait(5000)
+ await waitJobs(servers)
})
it('Should have updated my profile on other servers too', async function () {
expect(rootServer1Get.displayName).to.equal('my super display name')
expect(rootServer1Get.description).to.equal('my super description updated')
+ if (server.serverNumber === 1) {
+ expect(rootServer1Get.userId).to.be.a('number')
+ } else {
+ expect(rootServer1Get.userId).to.be.undefined
+ }
+
await testImage(server.url, 'avatar2-resized', rootServer1Get.avatar.path, '.png')
}
})
const resVideoChannels = await getVideoChannelsList(server.url, 0, 10)
const videoChannelDeleted = resVideoChannels.body.data.find(a => {
- return a.displayName === 'Default user1 channel' && a.host === 'localhost:9001'
+ return a.displayName === 'Main user1 channel' && a.host === 'localhost:9001'
}) as VideoChannel
expect(videoChannelDeleted).not.to.be.undefined
}
await removeUser(servers[0].url, userId, servers[0].accessToken)
- await wait(5000)
+ await waitJobs(servers)
for (const server of servers) {
const resAccounts = await getAccountsList(server.url, '-createdAt')
const resVideoChannels = await getVideoChannelsList(server.url, 0, 10)
const videoChannelDeleted = resVideoChannels.body.data.find(a => {
- return a.name === 'Default user1 channel' && a.host === 'localhost:9001'
+ return a.name === 'Main user1 channel' && a.host === 'localhost:9001'
}) as VideoChannel
expect(videoChannelDeleted).to.be.undefined
}
it('Should not have actor files', async () => {
for (const server of servers) {
- await checkActorFilesWereRemoved(userAccountName, server.serverNumber)
+ await checkActorFilesWereRemoved(userAccountUUID, server.serverNumber)
await checkActorFilesWereRemoved(userVideoChannelUUID, server.serverNumber)
}
})
after(async function () {
killallServers(servers)
-
- // Keep the logs if the test failed
- if (this[ 'ok' ]) {
- await flushTests()
- }
})
})