removeUser,
updateMyUser,
userLogin
-} from '../../utils'
-import { getMyUserInformation, killallServers, ServerInfo, testImage, updateMyAvatar, uploadVideo } from '../../utils/index'
-import { checkActorFilesWereRemoved, getAccount, getAccountsList } from '../../utils/users/accounts'
-import { setAccessTokensToServers } from '../../utils/users/login'
+} 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 '../../utils/server/jobs'
+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
}
{
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')
}
})
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)
}
})