Skip to content

fix identity test #21312

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
agagancarczyk merged 2 commits into from
Jun 29, 2023
Merged

fix identity test #21312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2d4963
fix identity test
edewit Jun 29, 2023
56a66f0
crazy that this fixes it
edewit Jun 29, 2023
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
3 changes: 2 additions & 1 deletion js/apps/admin-ui/cypress/support/pages/admin-ui/manage/AttributesTab.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default class AttributesTab {
}

public addAttribute(key: string, value: string) {
cy.findByTestId(this.addAttributeBtn).click();
this.addAnAttributeButton();

cy.findAllByTestId(this.keyInput)
.its("length")
Expand Down Expand Up @@ -42,6 +42,7 @@ export default class AttributesTab {
}

public addAnAttributeButton() {
cy.wait(1000);
cy.findByTestId(this.addAttributeBtn).click();
return this;
}
Expand Down
4 changes: 2 additions & 2 deletions ...press/support/pages/admin-ui/manage/identity_providers/ProviderBaseGeneralSettingsPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ export default class ProviderBaseGeneralSettingsPage extends PageObject {
return this;
}

protected assertCommonRequiredFields(requiredFiels: string[]) {
requiredFiels.forEach((elementLocator) => {
protected assertCommonRequiredFields(requiredFields: string[]) {
requiredFields.forEach((elementLocator) => {
if (elementLocator.includes("#")) {
cy.get(elementLocator)
.parent()
Expand Down
10 changes: 7 additions & 3 deletions ...upport/pages/admin-ui/manage/identity_providers/social/ProviderFacebookGeneralSettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@ const additionalUsersProfile_input_test_value =
"additionalUsersProfile_input_test_value";

export default class ProviderFacebookGeneralSettings extends ProviderBaseGeneralSettingsPage {
private additionalUsersProfileFieldsInput = "#facebookFetchedFields";
private additionalUsersProfileFieldsInput = "fetchedFields";

public typeAdditionalUsersProfileFieldsInput(value: string) {
cy.get(this.additionalUsersProfileFieldsInput).type(value).blur();
cy.findByTestId(this.additionalUsersProfileFieldsInput).type(value);
cy.findByTestId(this.additionalUsersProfileFieldsInput).blur();
return this;
}

public assertAdditionalUsersProfileFieldsInputEqual(value: string) {
cy.get(this.additionalUsersProfileFieldsInput).should("have.value", value);
cy.findByTestId(this.additionalUsersProfileFieldsInput).should(
"have.value",
value
);
return this;
}

Expand Down
14 changes: 8 additions & 6 deletions .../support/pages/admin-ui/manage/identity_providers/social/ProviderGithubGeneralSettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,28 @@ const base_url_input_test_value = "base_url_input_test_value";
const api_url_input_test_value = "api_url_input_test_value";

export default class ProviderGithubGeneralSettings extends ProviderBaseGeneralSettingsPage {
private baseUrlInput = "#baseUrl";
private apiUrlInput = "#apiUrl";
private baseUrlInput = "baseUrl";
private apiUrlInput = "apiUrl";

public typeBaseUrlInput(value: string) {
cy.get(this.baseUrlInput).type(value).blur();
cy.findByTestId(this.baseUrlInput).type(value);
cy.findByTestId(this.baseUrlInput).blur();
return this;
}

public typeApiUrlInput(value: string) {
cy.get(this.apiUrlInput).type(value).blur();
cy.findByTestId(this.apiUrlInput).type(value);
cy.findByTestId(this.apiUrlInput).blur();
return this;
}

public assertBaseUrlInputInputEqual(value: string) {
cy.get(this.baseUrlInput).should("have.value", value);
cy.findByTestId(this.baseUrlInput).should("have.value", value);
return this;
}

public assertApiUrlInputEqual(value: string) {
cy.get(this.apiUrlInput).should("have.value", value);
cy.findByTestId(this.apiUrlInput).should("have.value", value);
return this;
}

Expand Down
26 changes: 15 additions & 11 deletions .../support/pages/admin-ui/manage/identity_providers/social/ProviderGoogleGeneralSettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,41 @@ import ProviderBaseGeneralSettingsPage from "../ProviderBaseGeneralSettingsPage"
const hosted_domain_input_test_value = "hosted_domain_input_test_value";

export default class ProviderGoogleGeneralSettings extends ProviderBaseGeneralSettingsPage {
private hostedDomainInput = "#googleHostedDomain";
private useUserIpParamSwitch = "#googleUserIp";
private requestRefreshTokenSwitch = "#googleOfflineAccess";
private hostedDomainInput = "hostedDomain";
private useUserIpParamSwitch = "userIp";
private requestRefreshTokenSwitch = "offlineAccess";

public typeHostedDomainInput(value: string) {
cy.get(this.hostedDomainInput).type(value).blur();
cy.findByTestId(this.hostedDomainInput).type(value);
cy.findByTestId(this.hostedDomainInput).blur();
return this;
}

public clickUseUserIpParamSwitch() {
cy.get(this.useUserIpParamSwitch).parent().click();
cy.findByTestId(this.useUserIpParamSwitch).parent().click();
return this;
}

public clickRequestRefreshTokenSwitch() {
cy.get(this.requestRefreshTokenSwitch).parent().click();
cy.findByTestId(this.requestRefreshTokenSwitch).parent().click();
return this;
}

public assertHostedDomainInputEqual(value: string) {
cy.get(this.hostedDomainInput).should("have.value", value);
cy.findByTestId(this.hostedDomainInput).should("have.value", value);
return this;
}

public assertUseUserIpParamSwitchTurnedOn(isOn: boolean) {
super.assertSwitchStateOn(cy.get(this.useUserIpParamSwitch), isOn);
super.assertSwitchStateOn(cy.findByTestId(this.useUserIpParamSwitch), isOn);
return this;
}

public assertRequestRefreshTokenSwitchTurnedOn(isOn: boolean) {
super.assertSwitchStateOn(cy.get(this.requestRefreshTokenSwitch), isOn);
super.assertSwitchStateOn(
cy.findByTestId(this.requestRefreshTokenSwitch),
isOn
);
return this;
}

Expand All @@ -48,8 +52,8 @@ export default class ProviderGoogleGeneralSettings extends ProviderBaseGeneralSe
public assertFilledDataEqual(idpName: string) {
this.assertCommonFilledDataEqual(idpName);
this.assertHostedDomainInputEqual(hosted_domain_input_test_value);
this.assertSwitchStateOn(cy.get(this.useUserIpParamSwitch));
this.assertSwitchStateOn(cy.get(this.requestRefreshTokenSwitch));
this.assertSwitchStateOn(cy.findByTestId(this.useUserIpParamSwitch));
this.assertSwitchStateOn(cy.findByTestId(this.requestRefreshTokenSwitch));
return this;
}
}
12 changes: 7 additions & 5 deletions ...pport/pages/admin-ui/manage/identity_providers/social/ProviderOpenshiftGeneralSettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ import ProviderBaseGeneralSettingsPage from "../ProviderBaseGeneralSettingsPage"
const base_url_input_test_value = "base_url_input_test_value";

export default class ProviderOpenshiftGeneralSettings extends ProviderBaseGeneralSettingsPage {
private baseUrlInput = "#baseUrl";
private baseUrlInput = "baseUrl";

constructor() {
super();
this.requiredFields.push(this.baseUrlInput);
}

public typeBaseUrlInput(value: string) {
cy.get(this.baseUrlInput).type(value).blur();
cy.findByTestId(this.baseUrlInput).type(value);
cy.findByTestId(this.baseUrlInput).blur();
return this;
}

public assertbaseUrlInputEqual(value: string) {
cy.get(this.baseUrlInput).should("have.value", value);
cy.findByTestId(this.baseUrlInput).should("have.value", value);
return this;
}

Expand All @@ -26,7 +26,9 @@ export default class ProviderOpenshiftGeneralSettings extends ProviderBaseGenera

public fillData(idpName: string) {
this.fillCommonFields(idpName);
cy.get(this.baseUrlInput).type(idpName + base_url_input_test_value);
cy.findByTestId(this.baseUrlInput).type(
idpName + base_url_input_test_value
);
return this;
}

Expand Down
8 changes: 4 additions & 4 deletions .../support/pages/admin-ui/manage/identity_providers/social/ProviderPaypalGeneralSettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import ProviderBaseGeneralSettingsPage from "../ProviderBaseGeneralSettingsPage";

export default class ProviderPaypalGeneralSettings extends ProviderBaseGeneralSettingsPage {
private targetSandboxSwitch = "#paypalSandbox";
private targetSandboxSwitch = "sandbox";

public clickTargetSandboxSwitch() {
cy.get(this.targetSandboxSwitch).parent().click();
cy.findByTestId(this.targetSandboxSwitch).parent().click();
return this;
}

public assertTargetSandboxSwitchTurnedOn(isOn: boolean) {
super.assertSwitchStateOn(cy.get(this.targetSandboxSwitch), isOn);
super.assertSwitchStateOn(cy.findByTestId(this.targetSandboxSwitch), isOn);
return this;
}

Expand All @@ -21,7 +21,7 @@ export default class ProviderPaypalGeneralSettings extends ProviderBaseGeneralSe

public assertFilledDataEqual(idpName: string) {
this.assertCommonFilledDataEqual(idpName);
this.assertSwitchStateOn(cy.get(this.targetSandboxSwitch));
this.assertSwitchStateOn(cy.findByTestId(this.targetSandboxSwitch));
return this;
}
}
8 changes: 4 additions & 4 deletions ...t/pages/admin-ui/manage/identity_providers/social/ProviderStackoverflowGeneralSettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ import ProviderBaseGeneralSettingsPage from "../ProviderBaseGeneralSettingsPage"
const key_input_test_value = "key_input_test_value";

export default class ProviderStackoverflowGeneralSettings extends ProviderBaseGeneralSettingsPage {
private keyInput = "#stackoverflowKey";
private keyInput = "key";

constructor() {
super();
this.requiredFields.push(this.keyInput);
}

public typeKeyInput(value: string) {
cy.get(this.keyInput).type(value).blur();
cy.findByTestId(this.keyInput).type(value);
cy.findByTestId(this.keyInput).blur();
return this;
}

public assertKeyInputEqual(value: string) {
cy.get(this.keyInput).should("have.value", value);
cy.findByTestId(this.keyInput).should("have.value", value);
return this;
}

Expand Down