chore: fixes to tests

This commit is contained in:
Stefan Benz
2024-11-15 13:34:06 +01:00
parent 7e4285b0bd
commit 96f1db9a84
4 changed files with 8 additions and 17 deletions

View File

@@ -19,6 +19,7 @@ export async function loginWithPasskey(page: Page, authenticatorId: string, user
} }
export async function loginScreenExpect(page: Page, fullName: string) { export async function loginScreenExpect(page: Page, fullName: string) {
await expect(page).toHaveURL(/signedin.*/)
await expect(page.getByRole('heading')).toContainText(fullName); await expect(page.getByRole('heading')).toContainText(fullName);
} }

View File

@@ -107,4 +107,3 @@ async function simulateSuccessfulPasskeyInput(client: CDPSession, authenticatorI
// wait to receive the event that the passkey was successfully registered or verified // wait to receive the event that the passkey was successfully registered or verified
await operationCompleted; await operationCompleted;
} }
s

View File

@@ -1,8 +1,6 @@
import fetch from "node-fetch"; import fetch from "node-fetch";
import {Page} from "@playwright/test"; import {Page} from "@playwright/test";
import {registerWithPasskey} from "./register"; import {registerWithPasskey} from "./register";
import {loginWithPassword} from "./login";
import {changePassword} from "./password";
import {getUserByUsername, removeUser} from './zitadel'; import {getUserByUsername, removeUser} from './zitadel';
export interface userProps { export interface userProps {
@@ -59,7 +57,11 @@ class User {
} }
async remove() { async remove() {
await removeUser(this.getUserId()) const resp = await getUserByUsername(this.getUsername())
if (!resp || !resp.result || !resp.result[0]) {
return
}
await removeUser(resp.result[0].userId)
return return
} }
@@ -90,12 +92,6 @@ class User {
public getFullName() { public getFullName() {
return this.props.firstName + " " + this.props.lastName return this.props.firstName + " " + this.props.lastName
} }
public async doPasswordChange(page: Page, password: string) {
await loginWithPassword(page, this.getUsername(), this.getPassword())
await changePassword(page, this.getUsername(), password)
this.props.password = password
}
} }
export class PasswordUser extends User { export class PasswordUser extends User {
@@ -191,11 +187,6 @@ export class PasskeyUser extends User {
} }
public async remove() { public async remove() {
const resp = await getUserByUsername(this.getUsername())
if (!resp || !resp.result || !resp.result[0]) {
return
}
this.setUserId(resp.result[0].userId)
await super.remove() await super.remove()
} }

View File

@@ -25,12 +25,12 @@ const test = base.extend<{ user: PasswordUserWithOTP }>({
}); });
test("username, password and otp login", async ({user, page}) => { test("username, password and otp login", async ({user, page}) => {
const server = startSink() //const server = startSink()
await loginWithPassword(page, user.getUsername(), user.getPassword()) await loginWithPassword(page, user.getUsername(), user.getPassword())
await loginScreenExpect(page, user.getFullName()); await loginScreenExpect(page, user.getFullName());
server.close() //server.close()
}); });