Skip to content

Migrate Organization Authentication tests into new testsuite #50723

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
ahus1 merged 1 commit into from
Jul 16, 2026
Merged

Migrate Organization Authentication tests into new testsuite #50723

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
24 changes: 24 additions & 0 deletions test-framework/ui/src/main/java/org/keycloak/testframework/ui/page/LoginPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ public boolean isSocialButtonPresent(String alias) {
return !driver.driver().findElements(By.id(id)).isEmpty();
}

public boolean isUsernameInputPresent() {
return !driver.driver().findElements(By.id("username")).isEmpty();
}

public boolean isPasswordInputPresent() {
return !driver.driver().findElements(By.id("password")).isEmpty();
}
Expand Down Expand Up @@ -140,4 +144,24 @@ public boolean isRememberMeCheckboxPresent() {
return false;
}
}

public boolean isSwitchOrganizationPresent() {
return !driver.driver().findElements(By.id("switch-organization")).isEmpty();
}

public void clickSwitchOrganization() {
driver.findElement(By.id("switch-organization")).click();
}

public void clickResetLogin() {
driver.findElement(By.id("reset-login")).click();
}

public boolean isTryAnotherWayPresent() {
return !driver.driver().findElements(By.id("try-another-way")).isEmpty();
}

public void clickTryAnotherWay() {
driver.findElement(By.id("try-another-way")).click();
}
}
20 changes: 12 additions & 8 deletions tests/base/src/test/java/org/keycloak/tests/organization/admin/AbstractOrganizationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,22 +105,22 @@ protected OrganizationRepresentation createOrganization(ManagedRealm managedReal
}
managedRealm.admin().identityProviders().create(broker).close();

String brokerAlias = broker.getAlias();
managedRealm.cleanup().add(r -> {
try {
r.identityProviders().get(brokerAlias).remove();
} catch (NotFoundException ignored) {}
});

managedRealm.admin().organizations().get(id).identityProviders().addIdentityProvider(broker.getAlias()).close();
org = managedRealm.admin().organizations().get(id).toRepresentation();

String orgId = id;
// org deletion must run before IdP removal — removing an IdP linked to an org may fail
managedRealm.cleanup().add(r -> {
try {
r.organizations().get(orgId).delete().close();
} catch (NotFoundException ignored) {}
});
String brokerAlias = broker.getAlias();
managedRealm.cleanup().add(r -> {
try {
r.identityProviders().get(brokerAlias).remove();
} catch (NotFoundException ignored) {}
});

return org;
}
Expand Down Expand Up @@ -175,7 +175,11 @@ protected MemberRepresentation addMember(OrganizationResource organization, Stri
}

String userId = expected.getId();
realm.cleanup().add(r -> r.users().get(userId).remove());
realm.cleanup().add(r -> {
try {
r.users().get(userId).remove();
} catch (NotFoundException ignored) {}
});

try (Response response = organization.members().addMember(userId)) {
assertEquals(Status.CREATED.getStatusCode(), response.getStatus());
Expand Down
Loading
Loading