Skip to content

Relax checking of messages #28912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hmlnarik merged 1 commit into from
Apr 19, 2024
Merged

Relax checking of messages #28912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions js/apps/admin-ui/cypress/support/pages/admin-ui/Masthead.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,27 @@ export default class Masthead extends CommonElements {
cy.get("#manage-account").click();
}

checkNotificationMessage(message: string, closeNotification = true) {
this.#getAlertsContainer()
.find(this.#alertMessage)
.should("contain.text", message);

if (closeNotification) {
checkNotificationMessage(message: string | RegExp, closeNotification = true) {
if (typeof message === "string") {
this.#getAlertsContainer()
.find(this.#alertMessage)
.should("contain.text", message);

if (closeNotification) {
this.#getAlertsContainer()
.find(`button[title="` + message.replaceAll('"', '\\"') + `"]`)
.last()
.click({ force: true });
}
} else {
this.#getAlertsContainer()
.find(`button[title="` + message.replaceAll('"', '\\"') + `"]`)
.last()
.click({ force: true });
.find(this.#alertMessage)
.invoke("text")
.should("match", message);

if (closeNotification) {
this.#getAlertsContainer().find("button").last().click({ force: true });

@jonkoops jonkoops Apr 19, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like it might close an unrelated alert, but probably fine,

}
}
return this;
}
Expand Down
2 changes: 1 addition & 1 deletion ...admin-ui/cypress/support/pages/admin-ui/manage/clients/client_details/tabs/SettingsTab.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ export default class SettingsTab extends PageObject {

public assertAccessSettings() {
const redirectUriError =
"Client could not be updated: A redirect URI is not a valid URI";
/Client could not be updated:.*(Master SAML Processing URL is not a valid URL|A redirect URI is not a valid URI).*/i;

cy.findByTestId(this.#idpInitiatedSsoUrlName).click().type("a");
cy.findByTestId(this.#idpInitiatedSsoRelayState).click().type("b");
Expand Down