diff options
Diffstat (limited to 'server/tests/plugins/id-and-pass-auth.ts')
-rw-r--r-- | server/tests/plugins/id-and-pass-auth.ts | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/server/tests/plugins/id-and-pass-auth.ts b/server/tests/plugins/id-and-pass-auth.ts index 99de28d3f..a0b31bc1f 100644 --- a/server/tests/plugins/id-and-pass-auth.ts +++ b/server/tests/plugins/id-and-pass-auth.ts | |||
@@ -15,8 +15,7 @@ import { | |||
15 | setAccessTokensToServers, | 15 | setAccessTokensToServers, |
16 | updateMyUser, | 16 | updateMyUser, |
17 | userLogin, | 17 | userLogin, |
18 | wait, | 18 | wait |
19 | waitUntilLog | ||
20 | } from '@shared/extra-utils' | 19 | } from '@shared/extra-utils' |
21 | import { User, UserRole } from '@shared/models' | 20 | import { User, UserRole } from '@shared/models' |
22 | 21 | ||
@@ -137,7 +136,7 @@ describe('Test id and pass auth plugins', function () { | |||
137 | }) | 136 | }) |
138 | 137 | ||
139 | it('Should have logged out Crash', async function () { | 138 | it('Should have logged out Crash', async function () { |
140 | await waitUntilLog(server, 'On logout for auth 1 - 2') | 139 | await server.serversCommand.waitUntilLog('On logout for auth 1 - 2') |
141 | 140 | ||
142 | await getMyUserInformation(server.url, crashAccessToken, 401) | 141 | await getMyUserInformation(server.url, crashAccessToken, 401) |
143 | }) | 142 | }) |
@@ -164,16 +163,16 @@ describe('Test id and pass auth plugins', function () { | |||
164 | 163 | ||
165 | it('Should reject an invalid username, email, role or display name', async function () { | 164 | it('Should reject an invalid username, email, role or display name', async function () { |
166 | await userLogin(server, { username: 'ward', password: 'ward password' }, 400) | 165 | await userLogin(server, { username: 'ward', password: 'ward password' }, 400) |
167 | await waitUntilLog(server, 'valid username') | 166 | await server.serversCommand.waitUntilLog('valid username') |
168 | 167 | ||
169 | await userLogin(server, { username: 'kiros', password: 'kiros password' }, 400) | 168 | await userLogin(server, { username: 'kiros', password: 'kiros password' }, 400) |
170 | await waitUntilLog(server, 'valid display name') | 169 | await server.serversCommand.waitUntilLog('valid display name') |
171 | 170 | ||
172 | await userLogin(server, { username: 'raine', password: 'raine password' }, 400) | 171 | await userLogin(server, { username: 'raine', password: 'raine password' }, 400) |
173 | await waitUntilLog(server, 'valid role') | 172 | await server.serversCommand.waitUntilLog('valid role') |
174 | 173 | ||
175 | await userLogin(server, { username: 'ellone', password: 'elonne password' }, 400) | 174 | await userLogin(server, { username: 'ellone', password: 'elonne password' }, 400) |
176 | await waitUntilLog(server, 'valid email') | 175 | await server.serversCommand.waitUntilLog('valid email') |
177 | }) | 176 | }) |
178 | 177 | ||
179 | it('Should unregister spyro-auth and do not login existing Spyro', async function () { | 178 | it('Should unregister spyro-auth and do not login existing Spyro', async function () { |