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

KEYCLOAK-14115 Add a refresh to avoid failure

Browse source
This commit is contained in:
Alfredo Boullosa 2020-05-11 13:13:34 +02:00 committed by Stan Silvert
parent 357982adf6
commit 2ddfc94495
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java
View file

@ -96,6 +96,28 @@ public final class WaitUtils {
} }
} }
/**
* Waits for DOMContent to load
*/
public static void waitForDomContentToLoad() {
WebDriver driver = getCurrentDriver();
if (driver instanceof HtmlUnitDriver) {
return; // not needed
}
WebDriverWait wait = new WebDriverWait(driver, PAGELOAD_TIMEOUT_MILLIS / 1000);
try {
wait
.pollingEvery(Duration.ofMillis(500))
.until(javaScriptThrowsNoExceptions(
"if (document.readyState !== 'complete') { throw \"Not ready\";}"));
} catch (TimeoutException e) {
log.warn("waitForPageToLoad time exceeded!");
}
}
/** /**
* Waits for page to finish any pending redirects, REST API requests etc. * Waits for page to finish any pending redirects, REST API requests etc.
* Because Keycloak's Admin Console is a single-page application, we need to * Because Keycloak's Admin Console is a single-page application, we need to

4
testsuite/integration-arquillian/tests/other/console/src/test/java/org/keycloak/testsuite/console/clients/ClientSettingsTest.java
View file

@ -35,6 +35,7 @@ import static org.keycloak.testsuite.auth.page.login.Login.OIDC;
import static org.keycloak.testsuite.auth.page.login.Login.SAML; import static org.keycloak.testsuite.auth.page.login.Login.SAML;
import static org.keycloak.testsuite.console.page.clients.settings.ClientSettingsForm.OidcAccessType.BEARER_ONLY; import static org.keycloak.testsuite.console.page.clients.settings.ClientSettingsForm.OidcAccessType.BEARER_ONLY;
import static org.keycloak.testsuite.console.page.clients.settings.ClientSettingsForm.OidcAccessType.CONFIDENTIAL; import static org.keycloak.testsuite.console.page.clients.settings.ClientSettingsForm.OidcAccessType.CONFIDENTIAL;
import static org.keycloak.testsuite.util.UIUtils.refreshPageAndWaitForLoad;
import static org.keycloak.testsuite.util.WaitUtils.pause; import static org.keycloak.testsuite.util.WaitUtils.pause;
/** /**
@ -71,7 +72,6 @@ public class ClientSettingsTest extends AbstractClientTest {
newClient.setRedirectUris(redirectUris); newClient.setRedirectUris(redirectUris);
List<String> webOrigins = new ArrayList<>(); List<String> webOrigins = new ArrayList<>();
webOrigins.clear();
webOrigins.add("http://example2.test"); webOrigins.add("http://example2.test");
webOrigins.add("http://example3.test"); webOrigins.add("http://example3.test");
newClient.setWebOrigins(webOrigins); newClient.setWebOrigins(webOrigins);
@ -99,6 +99,8 @@ public class ClientSettingsTest extends AbstractClientTest {
@Test @Test
@EnableFeature(value = Profile.Feature.ACCOUNT2, skipRestart = true) @EnableFeature(value = Profile.Feature.ACCOUNT2, skipRestart = true)
public void alwaysDisplayInAccountConsole() { public void alwaysDisplayInAccountConsole() {
refreshPageAndWaitForLoad();
newClient = createClientRep("always-display-in-console", OIDC); newClient = createClientRep("always-display-in-console", OIDC);
createClient(newClient); createClient(newClient);