libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Merge pull request #2027 from stianst/master

Browse source 
Reintrodce creating admin from welcome page as removing it breaks tests
This commit is contained in:
Stian Thorgersen 2016-01-14 15:02:49 +01:00
commit 04d3f1a632
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/SuiteContext.java
View file

@ -10,14 +10,24 @@ import static org.keycloak.testsuite.util.MailServerConfiguration.*;
*/ */
public final class SuiteContext { public final class SuiteContext {
private boolean adminPasswordUpdated;
private final Map<String, String> smtpServer = new HashMap<>(); private final Map<String, String> smtpServer = new HashMap<>();
public SuiteContext() { public SuiteContext() {
this.adminPasswordUpdated = false;
smtpServer.put("from", FROM); smtpServer.put("from", FROM);
smtpServer.put("host", HOST); smtpServer.put("host", HOST);
smtpServer.put("port", PORT); smtpServer.put("port", PORT);
} }
public boolean isAdminPasswordUpdated() {
return adminPasswordUpdated;
}
public void setAdminPasswordUpdated(boolean adminPasswordUpdated) {
this.adminPasswordUpdated = adminPasswordUpdated;
}
public Map<String, String> getSmtpServer() { public Map<String, String> getSmtpServer() {
return smtpServer; return smtpServer;
} }

13
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java
View file

@ -89,6 +89,12 @@ public abstract class AbstractKeycloakTest {
driverSettings(); driverSettings();
if (!suiteContext.isAdminPasswordUpdated()) {
log.debug("updating admin password");
updateMasterAdminPassword();
suiteContext.setAdminPasswordUpdated(true);
}
importTestRealms(); importTestRealms();
} }
@ -99,6 +105,13 @@ public abstract class AbstractKeycloakTest {
Timer.printStats(); Timer.printStats();
} }
private void updateMasterAdminPassword() {
welcomePage.navigateTo();
if (!welcomePage.isPasswordSet()) {
welcomePage.setPassword("admin", "admin");
}
}
public void deleteAllCookiesForMasterRealm() { public void deleteAllCookiesForMasterRealm() {
masterRealmPage.navigateTo(); masterRealmPage.navigateTo();
log.debug("deleting cookies in master realm"); log.debug("deleting cookies in master realm");