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

KEYCLOAK-13069 Fix failing RH-SSO base tests

Browse source
This commit is contained in:
vmuzikar 2020-02-21 15:47:14 +01:00 committed by Pavel Drozd
parent a840d6ff9a
commit 8cfd4d60e6
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerFrontendUrlTest.java
View file

@ -76,7 +76,7 @@ public final class KcOidcBrokerFrontendUrlTest extends AbstractBrokerTest {
} }
loginPage.login(bc.getUserLogin(), bc.getUserPassword()); loginPage.login(bc.getUserLogin(), bc.getUserPassword());
waitForPage(driver, "keycloak account management", true); waitForPage(driver, "account management", true);
accountUpdateProfilePage.assertCurrent(); accountUpdateProfilePage.assertCurrent();
} }

5
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserFlowTest.java
View file

@ -47,7 +47,6 @@ import org.keycloak.testsuite.util.OAuthClient;
import org.keycloak.testsuite.authentication.ConditionalUserAttributeValueFactory; import org.keycloak.testsuite.authentication.ConditionalUserAttributeValueFactory;
import org.keycloak.testsuite.authentication.SetUserAttributeAuthenticatorFactory; import org.keycloak.testsuite.authentication.SetUserAttributeAuthenticatorFactory;
import org.keycloak.testsuite.util.URLUtils; import org.keycloak.testsuite.util.URLUtils;
import org.keycloak.testsuite.util.WaitUtils;
import org.openqa.selenium.By; import org.openqa.selenium.By;
import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement; import org.openqa.selenium.WebElement;
@ -57,6 +56,8 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.function.Consumer; import java.util.function.Consumer;
import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.assertThat;
import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson; import static org.keycloak.testsuite.admin.AbstractAdminTest.loadJson;
import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE; import static org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer.REMOTE;
import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.GITHUB; import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.GITHUB;
@ -467,7 +468,7 @@ public class BrowserFlowTest extends AbstractTestRealmKeycloakTest {
// Check that Keycloak is redirecting us to the Keycloak account management page // Check that Keycloak is redirecting us to the Keycloak account management page
WebElement aHref = driver.findElement(By.tagName("a")); WebElement aHref = driver.findElement(By.tagName("a"));
driver.get(aHref.getAttribute("href")); driver.get(aHref.getAttribute("href"));
Assert.assertEquals("Keycloak Account Management", driver.getTitle()); assertThat(driver.getTitle(), containsString("Account Management"));
} finally { } finally {
revertFlows("browser - alternative non-interactive executor"); revertFlows("browser - alternative non-interactive executor");
} }

2
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/MigrationModelTest.java
View file

@ -27,7 +27,7 @@ public class MigrationModelTest extends AbstractKeycloakTest {
@Test @Test
public void test() { public void test() {
testingClient.server().run(session -> { testingClient.server().run(session -> {
String currentVersion = Version.VERSION_KEYCLOAK.split("-")[0]; String currentVersion = Version.VERSION_KEYCLOAK.replaceAll("^(\\d(?:\\.\\d){0,2}).*$", "$1");
JpaConnectionProvider p = session.getProvider(JpaConnectionProvider.class); JpaConnectionProvider p = session.getProvider(JpaConnectionProvider.class);
EntityManager em = p.getEntityManager(); EntityManager em = p.getEntityManager();