Add user adminFlags

This commit is contained in:
Chocobozzz
2019-04-15 10:49:46 +02:00
parent 31b48aad47
commit 1eddc9a74f
65 changed files with 982 additions and 591 deletions

View File

@@ -86,7 +86,7 @@ describe('Test blocklist', function () {
{
const user = { username: 'user1', password: 'password' }
await createUser(servers[0].url, servers[0].accessToken, user.username, user.password)
await createUser({ url: servers[ 0 ].url, accessToken: servers[ 0 ].accessToken, username: user.username, password: user.password })
userToken1 = await userLogin(servers[0], user)
await uploadVideo(servers[0].url, userToken1, { name: 'video user 1' })
@@ -94,14 +94,14 @@ describe('Test blocklist', function () {
{
const user = { username: 'moderator', password: 'password' }
await createUser(servers[0].url, servers[0].accessToken, user.username, user.password)
await createUser({ url: servers[ 0 ].url, accessToken: servers[ 0 ].accessToken, username: user.username, password: user.password })
userModeratorToken = await userLogin(servers[0], user)
}
{
const user = { username: 'user2', password: 'password' }
await createUser(servers[1].url, servers[1].accessToken, user.username, user.password)
await createUser({ url: servers[ 1 ].url, accessToken: servers[ 1 ].accessToken, username: user.username, password: user.password })
userToken2 = await userLogin(servers[1], user)
await uploadVideo(servers[1].url, userToken2, { name: 'video user 2' })

View File

@@ -45,7 +45,7 @@ describe('Test users subscriptions', function () {
{
for (const server of servers) {
const user = { username: 'user' + server.serverNumber, password: 'password' }
await createUser(server.url, server.accessToken, user.username, user.password)
await createUser({ url: server.url, accessToken: server.accessToken, username: user.username, password: user.password })
const accessToken = await userLogin(server, user)
users.push({ accessToken })

View File

@@ -57,7 +57,12 @@ describe('Test users with multiple servers', function () {
username: 'user1',
password: 'password'
}
const res = await createUser(servers[ 0 ].url, servers[ 0 ].accessToken, user.username, user.password)
const res = await createUser({
url: servers[ 0 ].url,
accessToken: servers[ 0 ].accessToken,
username: user.username,
password: user.password
})
userId = res.body.user.id
userAccessToken = await userLogin(servers[ 0 ], user)
}

File diff suppressed because it is too large Load Diff