keycloak-aplcache
Changes
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/fragment/AccountManagementAlert.java 32(+32 -0)
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/AdminConsoleAlert.java 42(+13 -29)
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractAlert.java 51(+51 -0)
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java 28(+8 -20)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java 25(+2 -23)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java 2(+0 -2)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AbstractAccountManagementTest.java 18(+17 -1)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountTest.java 2(+1 -1)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ChangePasswordTest.java 10(+5 -5)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/AbstractConsoleTest.java 20(+19 -1)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/authentication/PasswordPolicyTest.java 40(+20 -20)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/authentication/RequiredActionsTest.java 4(+2 -2)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientRolesTest.java 7(+3 -4)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientSettingsTest.java 10(+5 -5)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/events/ConfigTest.java 4(+2 -2)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/federation/KerberosUserFederationTest.java 10(+5 -5)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/federation/LdapUserFederationTest.java 24(+12 -12)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/idp/IdentityProviderTest.java 3(+1 -2)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/realm/SecurityDefensesTest.java 8(+4 -4)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/roles/DefaultRolesTest.java 2(+1 -1)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/roles/RealmRolesTest.java 9(+4 -5)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/users/RequiredUserActionsTest.java 6(+3 -3)
Details
diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index f1872e9..cac9ca9 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -41,5 +41,4 @@
</pluginManagement>
</build>
-
</project>
diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/fragment/AccountManagementAlert.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/fragment/AccountManagementAlert.java
new file mode 100644
index 0000000..e4beb64
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/account/fragment/AccountManagementAlert.java
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2013 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.keycloak.testsuite.auth.page.account.fragment;
+
+import org.keycloak.testsuite.page.AbstractAlert;
+
+/**
+ *
+ * @author tkyjovsk
+ */
+public class AccountManagementAlert extends AbstractAlert {
+
+ public boolean isError() {
+ return getAttributeClass().contains("alert-error");
+ }
+
+}
diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractAlert.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractAlert.java
new file mode 100644
index 0000000..f236384
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractAlert.java
@@ -0,0 +1,51 @@
+package org.keycloak.testsuite.page;
+
+import com.google.common.base.Predicate;
+import static org.jboss.arquillian.graphene.Graphene.waitModel;
+import org.jboss.arquillian.graphene.fragment.Root;
+import org.jboss.logging.Logger;
+import static org.keycloak.testsuite.util.WaitUtils.waitGuiForElementPresent;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+
+/**
+ *
+ * @author tkyjovsk
+ */
+public abstract class AbstractAlert {
+
+ protected final Logger log = Logger.getLogger(this.getClass());
+
+ @Root
+ protected WebElement root;
+
+ public void waitUntilPresent() {
+ waitGuiForElementPresent(root, "Flash message should be visible.");
+ }
+
+ public void waitUntilPresentAndClassSet() {
+ waitUntilPresent();
+ waitModel().until(new Predicate<WebDriver>() {
+ @Override
+ public boolean apply(WebDriver input) {
+ return !getAttributeClass().endsWith("alert-");
+ }
+ });
+ }
+
+ public String getText() {
+ return root.getText();
+ }
+
+ public String getAttributeClass() {
+ String attrClass = root.getAttribute("class");
+ log.debug("Alert @class = '" + attrClass + "'");
+ return attrClass;
+ }
+
+ public boolean isSuccess() {
+ log.debug("Alert.isSuccess()");
+ return getAttributeClass().contains("alert-success");
+ }
+
+}
diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java
index 00aaed3..14826c3 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java
@@ -17,7 +17,6 @@
*/
package org.keycloak.testsuite.util;
-import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
import static org.jboss.arquillian.graphene.Graphene.waitAjax;
@@ -33,38 +32,27 @@ import org.openqa.selenium.WebElement;
public final class WaitUtils {
public static final String PAGELOAD_TIMEOUT_PROP = "pageload.timeout";
- public static final String IMPLICIT_TIMEOUT_PROP = "implicit.timeout";
- public static final String SCRIPT_TIMEOUT_PROP = "script.timeout";
- public static final String POLLING_INTERVAL_PROP = "polling.interval";
- public static final Integer PAGELOAD_TIMEOUT = Integer.parseInt(System.getProperty(PAGELOAD_TIMEOUT_PROP, "5000"));
- public static final Integer IMPLICIT_TIMEOUT = Integer.parseInt(System.getProperty(IMPLICIT_TIMEOUT_PROP, "3000"));
- public static final Integer SCRIPT_TIMEOUT = Integer.parseInt(System.getProperty(SCRIPT_TIMEOUT_PROP, "3000"));
-
- public static final Integer POLLING_INTERVAL = Integer.parseInt(System.getProperty(POLLING_INTERVAL_PROP, "1000"));
+ public static final Integer PAGELOAD_TIMEOUT = Integer.parseInt(System.getProperty(PAGELOAD_TIMEOUT_PROP, "60000"));
public static void waitAjaxForElement(WebElement element) {
- waitAjax().withTimeout(SCRIPT_TIMEOUT, TimeUnit.MILLISECONDS).pollingEvery(POLLING_INTERVAL, TimeUnit.MILLISECONDS)
+ waitAjax()
.until().element(element).is().present();
}
public static void waitAjaxForElementNotPresent(WebElement element) {
- waitAjax().withTimeout(SCRIPT_TIMEOUT, TimeUnit.MILLISECONDS).pollingEvery(POLLING_INTERVAL, TimeUnit.MILLISECONDS)
+ waitAjax()
.until().element(element).is().not().present();
}
public static void waitAjaxForElementNotVisible(WebElement element) {
- waitAjax().withTimeout(SCRIPT_TIMEOUT, TimeUnit.MILLISECONDS).pollingEvery(POLLING_INTERVAL, TimeUnit.MILLISECONDS)
+ waitAjax()
.until().element(element).is().not().visible();
}
- public static void waitGuiForElement(By element, String message) {
- waitGui().withTimeout(IMPLICIT_TIMEOUT, TimeUnit.MILLISECONDS).pollingEvery(POLLING_INTERVAL, TimeUnit.MILLISECONDS)
- .until(message).element(element).is().present();
- }
-
public static void waitGuiForElement(By element) {
- waitGuiForElement(element, null);
+ waitGui()
+ .until().element(element).is().present();
}
public static void waitGuiForElement(WebElement element) {
@@ -72,12 +60,12 @@ public final class WaitUtils {
}
public static void waitGuiForElementPresent(WebElement element, String message) {
- waitGui().withTimeout(IMPLICIT_TIMEOUT, TimeUnit.MILLISECONDS).pollingEvery(POLLING_INTERVAL, TimeUnit.MILLISECONDS)
+ waitGui()
.until(message).element(element).is().present();
}
public static void waitGuiForElementNotPresent(WebElement element) {
- waitGui().withTimeout(IMPLICIT_TIMEOUT, TimeUnit.MILLISECONDS).pollingEvery(POLLING_INTERVAL, TimeUnit.MILLISECONDS)
+ waitGui()
.until().element(element).is().not().present();
}
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java
index 31c9b77..0fb0efe 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java
@@ -19,9 +19,7 @@ package org.keycloak.testsuite;
import java.text.MessageFormat;
import java.util.List;
-import org.jboss.arquillian.graphene.findby.FindByJQuery;
import org.jboss.arquillian.graphene.page.Page;
-import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.keycloak.admin.client.resource.RealmResource;
import static org.keycloak.representations.idm.CredentialRepresentation.PASSWORD;
@@ -32,7 +30,6 @@ import static org.keycloak.testsuite.admin.Users.setPasswordFor;
import org.keycloak.testsuite.auth.page.AuthRealm;
import static org.keycloak.testsuite.auth.page.AuthRealm.TEST;
import org.keycloak.testsuite.auth.page.login.OIDCLogin;
-import org.keycloak.testsuite.console.page.fragment.FlashMessage;
import org.openqa.selenium.Cookie;
/**
@@ -48,9 +45,6 @@ public abstract class AbstractAuthTest extends AbstractKeycloakTest {
protected UserRepresentation testUser;
- @FindByJQuery(".alert")
- protected FlashMessage flashMessage;
-
@Override
public void addTestRealms(List<RealmRepresentation> testRealms) {
RealmRepresentation testRealmRep = new RealmRepresentation();
@@ -68,12 +62,12 @@ public abstract class AbstractAuthTest extends AbstractKeycloakTest {
deleteAllCookiesForTestRealm();
}
-
+
public void createTestUserWithAdminClient() {
log.debug("creating test user");
String id = createUserAndResetPasswordWithAdminClient(testRealmResource(), testUser, PASSWORD);
testUser.setId(id);
-
+
assignClientRoles(testRealmResource(), id, "realm-management", "view-realm");
}
@@ -101,21 +95,6 @@ public abstract class AbstractAuthTest extends AbstractKeycloakTest {
}
}
- public void assertFlashMessageSuccess() {
- flashMessage.waitUntilPresent();
- assertTrue(flashMessage.getText(), flashMessage.isSuccess());
- }
-
- public void assertFlashMessageDanger() {
- flashMessage.waitUntilPresent();
- assertTrue(flashMessage.getText(), flashMessage.isDanger());
- }
-
- public void assertFlashMessageError() {
- flashMessage.waitUntilPresent();
- assertTrue(flashMessage.getText(), flashMessage.isError());
- }
-
public RealmResource testRealmResource() {
return adminClient.realm(testRealmPage.getAuthRealm());
}
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java
index e553b3d..063347a 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java
@@ -118,8 +118,6 @@ public abstract class AbstractKeycloakTest {
protected void driverSettings() {
driver.manage().timeouts().pageLoadTimeout(WaitUtils.PAGELOAD_TIMEOUT, TimeUnit.MILLISECONDS);
- driver.manage().timeouts().implicitlyWait(WaitUtils.IMPLICIT_TIMEOUT, TimeUnit.MILLISECONDS);
- driver.manage().timeouts().setScriptTimeout(WaitUtils.SCRIPT_TIMEOUT, TimeUnit.MILLISECONDS);
driver.manage().window().maximize();
}
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AbstractAccountManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AbstractAccountManagementTest.java
index 6a7a4c1..97be6e6 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AbstractAccountManagementTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AbstractAccountManagementTest.java
@@ -1,10 +1,13 @@
package org.keycloak.testsuite.account;
import org.jboss.arquillian.graphene.page.Page;
+import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.keycloak.testsuite.AbstractAuthTest;
import static org.keycloak.testsuite.auth.page.AuthRealm.TEST;
import org.keycloak.testsuite.auth.page.account.AccountManagement;
+import org.keycloak.testsuite.auth.page.account.fragment.AccountManagementAlert;
+import org.openqa.selenium.support.FindBy;
/**
*
@@ -15,6 +18,9 @@ public abstract class AbstractAccountManagementTest extends AbstractAuthTest {
@Page
protected AccountManagement testRealmAccountManagementPage;
+ @FindBy(className = "alert")
+ protected AccountManagementAlert alert;
+
@Override
public void setDefaultPageUriParameters() {
super.setDefaultPageUriParameters();
@@ -27,5 +33,15 @@ public abstract class AbstractAccountManagementTest extends AbstractAuthTest {
// make user test user exists in test realm
createTestUserWithAdminClient();
}
-
+
+ public void assertAlertSuccess() {
+ alert.waitUntilPresentAndClassSet();
+ assertTrue(alert.isSuccess());
+ }
+
+ public void assertAlertError() {
+ alert.waitUntilPresentAndClassSet();
+ assertTrue(alert.isError());
+ }
+
}
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountTest.java
index e509276..b9f60ee 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountTest.java
@@ -66,7 +66,7 @@ public class AccountTest extends AbstractAccountManagementTest {
testRealmAccountPage.setFirstName(NEW_FIRST_NAME);
testRealmAccountPage.setLastName(NEW_LAST_NAME);
testRealmAccountPage.save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
testRealmAccountManagementPage.signOut();
testRealmLoginPage.form().login(testUser);
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ChangePasswordTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ChangePasswordTest.java
index 5787903..f3619ee 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ChangePasswordTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ChangePasswordTest.java
@@ -38,20 +38,20 @@ public class ChangePasswordTest extends AbstractAccountManagementTest {
@Test
public void invalidChangeAttempts() {
testRealmChangePasswordPage.save();
- assertFlashMessageError();
+ assertAlertError();
testRealmChangePasswordPage.changePasswords(WRONG_PASSWORD, NEW_PASSWORD, NEW_PASSWORD);
- assertFlashMessageError();
+ assertAlertError();
testRealmChangePasswordPage.changePasswords(correctPassword, NEW_PASSWORD, NEW_PASSWORD + "-mismatch");
- assertFlashMessageError();
+ assertAlertError();
}
@Test
public void successfulChangeAttempts() {
// change password successfully
testRealmChangePasswordPage.changePasswords(correctPassword, NEW_PASSWORD, NEW_PASSWORD);
- assertFlashMessageSuccess();
+ assertAlertSuccess();
// login using new password
testRealmAccountManagementPage.signOut();
@@ -61,7 +61,7 @@ public class ChangePasswordTest extends AbstractAccountManagementTest {
// change password back
testRealmAccountManagementPage.password();
testRealmChangePasswordPage.changePasswords(NEW_PASSWORD, correctPassword, correctPassword);
- assertFlashMessageSuccess();
+ assertAlertSuccess();
}
}
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/AbstractConsoleTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/AbstractConsoleTest.java
index 573363a..eb2fb5b 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/AbstractConsoleTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/AbstractConsoleTest.java
@@ -17,7 +17,9 @@
*/
package org.keycloak.testsuite.console;
+import org.jboss.arquillian.graphene.findby.FindByJQuery;
import org.jboss.arquillian.graphene.page.Page;
+import static org.junit.Assert.assertTrue;
import org.junit.Before;
import org.keycloak.representations.idm.UserRepresentation;
import org.keycloak.testsuite.AbstractAuthTest;
@@ -27,6 +29,7 @@ import org.keycloak.testsuite.console.page.AdminConsoleRealm.ConfigureMenu;
import org.keycloak.testsuite.console.page.AdminConsoleRealm.ManageMenu;
import static org.keycloak.testsuite.auth.page.AuthRealm.TEST;
import org.keycloak.testsuite.auth.page.login.Login;
+import org.keycloak.testsuite.console.page.fragment.AdminConsoleAlert;
import org.keycloak.testsuite.console.page.fragment.ModalDialog;
import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWithLoginUrlOf;
import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith;
@@ -46,10 +49,13 @@ public abstract class AbstractConsoleTest extends AbstractAuthTest {
@Page
protected AdminConsole testRealmAdminConsolePage;
-
+
@FindBy(xpath = "//div[@class='modal-dialog']")
protected ModalDialog modalDialog;
+ @FindBy(className = "alert")
+ protected AdminConsoleAlert alert;
+
protected boolean adminLoggedIn = false;
@Override
@@ -100,6 +106,18 @@ public abstract class AbstractConsoleTest extends AbstractAuthTest {
assertCurrentUrlStartsWithLoginUrlOf(adminConsole);
}
+ public void assertAlertSuccess() {
+ alert.waitUntilPresentAndClassSet();
+ assertTrue(alert.isSuccess());
+ alert.close();
+ }
+
+ public void assertAlertDanger() {
+ alert.waitUntilPresentAndClassSet();
+ assertTrue(alert.isDanger());
+ alert.close();
+ }
+
public ConfigureMenu configure() {
return adminConsoleRealmPage.configure();
}
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/authentication/PasswordPolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/authentication/PasswordPolicyTest.java
index b48cf84..f904613 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/authentication/PasswordPolicyTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/authentication/PasswordPolicyTest.java
@@ -50,18 +50,18 @@ public class PasswordPolicyTest extends AbstractConsoleTest {
passwordPolicyPage.navigateTo();
passwordPolicyPage.addPolicy(HASH_ITERATIONS, 5);
passwordPolicyPage.removePolicy(HASH_ITERATIONS);
- assertFlashMessageSuccess();
+ assertAlertSuccess();
}
@Test
public void testInvalidPolicyValues() {
passwordPolicyPage.navigateTo();
passwordPolicyPage.addPolicy(HASH_ITERATIONS, "asd");
- assertFlashMessageDanger();
+ assertAlertDanger();
passwordPolicyPage.removePolicy(HASH_ITERATIONS);
passwordPolicyPage.addPolicy(REGEX_PATTERN, "([");
- assertFlashMessageDanger();
+ assertAlertDanger();
}
@Test
@@ -72,10 +72,10 @@ public class PasswordPolicyTest extends AbstractConsoleTest {
testUserCredentialsPage.navigateTo();
testUserCredentialsPage.resetPassword("1234567");
- assertFlashMessageDanger();
+ assertAlertDanger();
testUserCredentialsPage.resetPassword("12345678");
- assertFlashMessageSuccess();
+ assertAlertSuccess();
}
@Test
@@ -86,10 +86,10 @@ public class PasswordPolicyTest extends AbstractConsoleTest {
testUserCredentialsPage.navigateTo();
testUserCredentialsPage.resetPassword("invalidPassword1");
- assertFlashMessageDanger();
+ assertAlertDanger();
testUserCredentialsPage.resetPassword("validPassword12");
- assertFlashMessageSuccess();
+ assertAlertSuccess();
}
@Test
@@ -100,10 +100,10 @@ public class PasswordPolicyTest extends AbstractConsoleTest {
testUserCredentialsPage.navigateTo();
testUserCredentialsPage.resetPassword("iNVALIDPASSWORD");
- assertFlashMessageDanger();
+ assertAlertDanger();
testUserCredentialsPage.resetPassword("vaLIDPASSWORD");
- assertFlashMessageSuccess();
+ assertAlertSuccess();
}
@Test
@@ -114,10 +114,10 @@ public class PasswordPolicyTest extends AbstractConsoleTest {
testUserCredentialsPage.navigateTo();
testUserCredentialsPage.resetPassword("Invalidpassword");
- assertFlashMessageDanger();
+ assertAlertDanger();
testUserCredentialsPage.resetPassword("VAlidpassword");
- assertFlashMessageSuccess();
+ assertAlertSuccess();
}
@Test
@@ -128,10 +128,10 @@ public class PasswordPolicyTest extends AbstractConsoleTest {
testUserCredentialsPage.navigateTo();
testUserCredentialsPage.resetPassword("invalidPassword*");
- assertFlashMessageDanger();
+ assertAlertDanger();
testUserCredentialsPage.resetPassword("validPassword*#");
- assertFlashMessageSuccess();
+ assertAlertSuccess();
}
@Test
@@ -142,10 +142,10 @@ public class PasswordPolicyTest extends AbstractConsoleTest {
testUserCredentialsPage.navigateTo();
testUserCredentialsPage.resetPassword(testUser.getUsername());
- assertFlashMessageDanger();
+ assertAlertDanger();
testUserCredentialsPage.resetPassword("validpassword");
- assertFlashMessageSuccess();
+ assertAlertSuccess();
}
@Test
@@ -156,10 +156,10 @@ public class PasswordPolicyTest extends AbstractConsoleTest {
testUserCredentialsPage.navigateTo();
testUserCredentialsPage.resetPassword("invalidPassword");
- assertFlashMessageDanger();
+ assertAlertDanger();
testUserCredentialsPage.resetPassword("VALID#password");
- assertFlashMessageSuccess();
+ assertAlertSuccess();
}
@Test
@@ -170,13 +170,13 @@ public class PasswordPolicyTest extends AbstractConsoleTest {
testUserCredentialsPage.navigateTo();
testUserCredentialsPage.resetPassword("firstPassword");
- assertFlashMessageSuccess();
+ assertAlertSuccess();
testUserCredentialsPage.resetPassword("secondPassword");
- assertFlashMessageSuccess();
+ assertAlertSuccess();
testUserCredentialsPage.resetPassword("firstPassword");
- assertFlashMessageDanger();
+ assertAlertDanger();
}
}
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/authentication/RequiredActionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/authentication/RequiredActionsTest.java
index c45b792..b8217f8 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/authentication/RequiredActionsTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/authentication/RequiredActionsTest.java
@@ -60,7 +60,7 @@ public class RequiredActionsTest extends AbstractConsoleTest {
public void termsAndConditionsDefaultActionTest() {
requiredActionsPage.setTermsAndConditionEnabled(true);
requiredActionsPage.setTermsAndConditionDefaultAction(true);
- assertFlashMessageSuccess();
+ assertAlertSuccess();
allowTestRealmUserRegistration();
@@ -74,7 +74,7 @@ public class RequiredActionsTest extends AbstractConsoleTest {
@Test
public void configureTotpDefaultActionTest() {
requiredActionsPage.setConfigureTotpDefaultAction(true);
- assertFlashMessageSuccess();
+ assertAlertSuccess();
allowTestRealmUserRegistration();
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientRolesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientRolesTest.java
index a8a4c35..0142911 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientRolesTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientRolesTest.java
@@ -36,7 +36,7 @@ public class ClientRolesTest extends AbstractClientTest {
// assertCurrentUrl(createClientRole); // can't do this, need client id to build uri
createClientRolePage.form().setBasicAttributes(roleRep);
createClientRolePage.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
createClientRolePage.form().setCompositeRoles(roleRep);
// TODO add verification of notification message when KEYCLOAK-1497 gets resolved
}
@@ -47,11 +47,10 @@ public class ClientRolesTest extends AbstractClientTest {
RoleRepresentation newRole = new RoleRepresentation("client-role", "", false);
createClient(newClient);
- assertFlashMessageSuccess();
+ assertAlertSuccess();
clientPage.tabs().roles();
addClientRole(newRole);
- assertFlashMessageSuccess();
clientRolePage.backToClientRolesViaBreadcrumb();
assertFalse(clientRolesPage.roles().getRolesFromTableRows().isEmpty());
@@ -60,7 +59,7 @@ public class ClientRolesTest extends AbstractClientTest {
clientsPage.table().search(newClient.getClientId());
clientsPage.table().deleteClient(newClient.getClientId());
modalDialog.confirmDeletion();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
assertNull(clientsPage.table().findClient(newClient.getClientId()));
}
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientSettingsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientSettingsTest.java
index 5229527..ce68cce 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientSettingsTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/clients/ClientSettingsTest.java
@@ -48,7 +48,7 @@ public class ClientSettingsTest extends AbstractClientTest {
public void crudOIDCConfidential() {
newClient = createClientRepresentation("oidc-confidential", "http://example.test/app/*");
createClient(newClient);
- assertFlashMessageSuccess();
+ assertAlertSuccess();
clientPage.backToClientsViaBreadcrumb();
assertCurrentUrlEquals(clientsPage);
@@ -70,7 +70,7 @@ public class ClientSettingsTest extends AbstractClientTest {
newClient = createClientRepresentation("oidc-public", "http://example.test/app/*");
newClient.setPublicClient(true);
createClient(newClient);
- assertFlashMessageSuccess();
+ assertAlertSuccess();
clientPage.backToClientsViaBreadcrumb();
assertCurrentUrlEquals(clientsPage);
@@ -81,7 +81,7 @@ public class ClientSettingsTest extends AbstractClientTest {
newClient = createClientRepresentation("oidc-bearer-only", "http://example.test/app/*");
newClient.setBearerOnly(true);
createClient(newClient);
- assertFlashMessageSuccess();
+ assertAlertSuccess();
clientPage.backToClientsViaBreadcrumb();
assertCurrentUrlEquals(clientsPage);
@@ -99,11 +99,11 @@ public class ClientSettingsTest extends AbstractClientTest {
public void invalidSettings() {
clientsPage.table().createClient();
createClientPage.form().save();
- assertFlashMessageDanger();
+ assertAlertDanger();
createClientPage.form().setClientId("test-client");
createClientPage.form().save();
- assertFlashMessageDanger();
+ assertAlertDanger();
}
public void assertClientSettingsEqual(ClientRepresentation c1, ClientRepresentation c2) {
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/events/ConfigTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/events/ConfigTest.java
index eebb8a2..2c44e5a 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/events/ConfigTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/events/ConfigTest.java
@@ -30,7 +30,7 @@ public class ConfigTest extends AbstractConsoleTest {
configPage.form().removeSaveType("LOGIN");
configPage.form().setExpiration("50", "Days");
configPage.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
RealmRepresentation realm = testRealmResource().toRepresentation();
assertTrue(realm.isEventsEnabled());
@@ -44,7 +44,7 @@ public class ConfigTest extends AbstractConsoleTest {
configPage.form().setSaveAdminEvents(true);
configPage.form().setIncludeRepresentation(true);
configPage.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
RealmRepresentation realm = testRealmResource().toRepresentation();
assertTrue(realm.isAdminEventsEnabled());
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/federation/KerberosUserFederationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/federation/KerberosUserFederationTest.java
index 47521e5..7eff162 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/federation/KerberosUserFederationTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/federation/KerberosUserFederationTest.java
@@ -33,7 +33,7 @@ public class KerberosUserFederationTest extends AbstractConsoleTest {
createKerberosUserProvider.form().selectEditMode(READ_ONLY);
createKerberosUserProvider.form().setUpdateProfileFirstLogin(true);
createKerberosUserProvider.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
RealmRepresentation realm = testRealmResource().toRepresentation();
UserFederationProviderRepresentation ufpr = realm.getUserFederationProviders().get(0);
assertKerberosSetings(ufpr, "KEYCLOAK.ORG", "HTTP/localhost@KEYCLOAK.ORG", "http.keytab", "true", "true", "true");
@@ -50,18 +50,18 @@ public class KerberosUserFederationTest extends AbstractConsoleTest {
createKerberosUserProvider.form().selectEditMode(UNSYNCED);
createKerberosUserProvider.form().setUpdateProfileFirstLogin(true);
createKerberosUserProvider.form().save();
- assertFlashMessageDanger();
+ assertAlertDanger();
createKerberosUserProvider.form().setServerPrincipalInput("");
createKerberosUserProvider.form().setKerberosRealmInput("KEYCLOAK.ORG");;
createKerberosUserProvider.form().save();
- assertFlashMessageDanger();
+ assertAlertDanger();
createKerberosUserProvider.form().setServerPrincipalInput("HTTP/localhost@KEYCLOAK.ORG");;
createKerberosUserProvider.form().setKeyTabInput("");
createKerberosUserProvider.form().save();
- assertFlashMessageDanger();
+ assertAlertDanger();
createKerberosUserProvider.form().setKeyTabInput("http.keytab");;
createKerberosUserProvider.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
}
private void assertKerberosSetings(UserFederationProviderRepresentation ufpr, String kerberosRealm, String serverPrincipal, String keyTab, String debug, String useKerberosForPasswordAuthentication, String updateProfileFirstLogin) {
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/federation/LdapUserFederationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/federation/LdapUserFederationTest.java
index 8d40845..7dc7ab2 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/federation/LdapUserFederationTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/federation/LdapUserFederationTest.java
@@ -49,7 +49,7 @@ public class LdapUserFederationTest extends AbstractConsoleTest {
createLdapUserProvider.form().setKeyTabInput("http.keytab");
createLdapUserProvider.form().setDebugEnabled(true);
createLdapUserProvider.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
RealmRepresentation realm = testRealmResource().toRepresentation();
UserFederationProviderRepresentation ufpr = realm.getUserFederationProviders().get(0);
@@ -71,7 +71,7 @@ public class LdapUserFederationTest extends AbstractConsoleTest {
createLdapUserProvider.form().setLdapUserDnInput("ou=People,dc=keycloak,dc=org");
createLdapUserProvider.form().setLdapBindCredentialInput("secret");
createLdapUserProvider.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
RealmRepresentation realm = testRealmResource().toRepresentation();
UserFederationProviderRepresentation ufpr = realm.getUserFederationProviders().get(0);
@@ -92,22 +92,22 @@ public class LdapUserFederationTest extends AbstractConsoleTest {
createLdapUserProvider.form().setLdapUserDnInput("ou=People,dc=keycloak,dc=org");
createLdapUserProvider.form().setLdapBindCredentialInput("secret");
createLdapUserProvider.form().save();
- assertFlashMessageDanger();
+ assertAlertDanger();
createLdapUserProvider.form().setLdapUserDnInput("");
createLdapUserProvider.form().setLdapConnectionUrlInput("ldap://localhost:389");
createLdapUserProvider.form().save();
- assertFlashMessageDanger();
+ assertAlertDanger();
createLdapUserProvider.form().setLdapUserDnInput("ou=People,dc=keycloak,dc=org");
createLdapUserProvider.form().setLdapBindDnInput("");
createLdapUserProvider.form().save();
- assertFlashMessageDanger();
+ assertAlertDanger();
createLdapUserProvider.form().setLdapBindDnInput("uid=admin,ou=system");
createLdapUserProvider.form().setLdapBindCredentialInput("");
createLdapUserProvider.form().save();
- assertFlashMessageDanger();
+ assertAlertDanger();
createLdapUserProvider.form().setLdapBindCredentialInput("secret");
createLdapUserProvider.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
}
@Test
@@ -122,19 +122,19 @@ public class LdapUserFederationTest extends AbstractConsoleTest {
createLdapUserProvider.form().setLdapBindCredentialInput("secret");
createLdapUserProvider.form().setAccountAfterPasswordUpdateEnabled(true);
createLdapUserProvider.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
LDAPEmbeddedServer ldapServer = null;
try {
ldapServer = startEmbeddedLdapServer();
createLdapUserProvider.form().testConnection();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
createLdapUserProvider.form().testAuthentication();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
createLdapUserProvider.form().synchronizeAllUsers();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
createLdapUserProvider.form().setLdapBindCredentialInput("secret1");
createLdapUserProvider.form().testAuthentication();
- assertFlashMessageDanger();
+ assertAlertDanger();
} finally {
if (ldapServer != null) {
ldapServer.stop();
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/idp/IdentityProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/idp/IdentityProviderTest.java
index d31ec07..e4f7f84 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/idp/IdentityProviderTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/idp/IdentityProviderTest.java
@@ -38,8 +38,7 @@ public class IdentityProviderTest extends AbstractConsoleTest {
// @Test
public void testAddNewProvider() {
idpSettingsPage.addNewProvider(new Provider(SocialProvider.FACEBOOK, "klic", "secret"));
- flashMessage.waitUntilPresent();
- assertTrue("Success message should be displayed", flashMessage.isSuccess());
+ assertAlertSuccess();
}
// @Test(expected = NoSuchElementException.class)
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/realm/SecurityDefensesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/realm/SecurityDefensesTest.java
index 96d8c9c..e5b8e74 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/realm/SecurityDefensesTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/realm/SecurityDefensesTest.java
@@ -74,7 +74,7 @@ public class SecurityDefensesTest extends AbstractRealmTest {
bruteForceDetectionPage.form().setWaitIncrementSelect(BruteForceDetection.TimeSelectValues.SECONDS);
bruteForceDetectionPage.form().setWaitIncrementInput(String.valueOf(secondsToWait));
bruteForceDetectionPage.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
testRealmAccountPage.navigateTo();
@@ -115,7 +115,7 @@ public class SecurityDefensesTest extends AbstractRealmTest {
bruteForceDetectionPage.form().setMinQuickLoginWaitSelect(BruteForceDetection.TimeSelectValues.SECONDS);
bruteForceDetectionPage.form().setMinQuickLoginWaitInput(String.valueOf(secondsToWait));
bruteForceDetectionPage.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
testRealmAccountPage.navigateTo();
@@ -195,7 +195,7 @@ public class SecurityDefensesTest extends AbstractRealmTest {
bruteForceDetectionPage.form().setFailureResetTimeSelect(BruteForceDetection.TimeSelectValues.SECONDS);
bruteForceDetectionPage.form().setFailureResetTimeInput(String.valueOf(secondsToWait));
bruteForceDetectionPage.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
testRealmAccountPage.navigateTo();
@@ -228,7 +228,7 @@ public class SecurityDefensesTest extends AbstractRealmTest {
bruteForceDetectionPage.form().setWaitIncrementSelect(BruteForceDetection.TimeSelectValues.MINUTES);
bruteForceDetectionPage.form().setWaitIncrementInput("10");
bruteForceDetectionPage.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
testRealmAccountPage.navigateTo();
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/roles/DefaultRolesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/roles/DefaultRolesTest.java
index e156c39..67baad2 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/roles/DefaultRolesTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/roles/DefaultRolesTest.java
@@ -44,7 +44,7 @@ public class DefaultRolesTest extends AbstractRolesTest {
String defaultRoleName = defaultRoleRep.getName();
defaultRolesPage.form().addAvailableRole(defaultRoleName);
- assertFlashMessageSuccess();
+ assertAlertSuccess();
UserRepresentation newUser = new UserRepresentation();
newUser.setUsername("new_user");
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/roles/RealmRolesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/roles/RealmRolesTest.java
index 0df9c15..0538d05 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/roles/RealmRolesTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/roles/RealmRolesTest.java
@@ -42,7 +42,7 @@ public class RealmRolesTest extends AbstractRolesTest {
assertCurrentUrlEquals(createRolePage);
createRolePage.form().setBasicAttributes(roleRep);
createRolePage.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
createRolePage.form().setCompositeRoles(roleRep);
// TODO add verification of notification message when KEYCLOAK-1497 gets resolved
}
@@ -53,7 +53,7 @@ public class RealmRolesTest extends AbstractRolesTest {
// assertCurrentUrl(role); // can't do this, role id needed as uri param
rolePage.form().setBasicAttributes(roleRep);
rolePage.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
rolePage.form().setCompositeRoles(roleRep);
}
@@ -77,7 +77,7 @@ public class RealmRolesTest extends AbstractRolesTest {
testRole.setDescription("updated role description");
rolePage.form().setDescription(testRole.getDescription());
rolePage.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
configure().roles();
foundRole = realmRolesPage.table().findRole(testRole.getName()); // search & get role from table
@@ -111,13 +111,12 @@ public class RealmRolesTest extends AbstractRolesTest {
@Test
public void testAddExistingRole() {
addRole(testRole);
- assertFlashMessageSuccess();
configure().roles();
realmRolesPage.table().addRole();
createRolePage.form().setBasicAttributes(testRole);
createRolePage.form().save();
- assertFlashMessageDanger();
+ assertAlertDanger();
}
public void createTestRoles(String namePrefix, int count) {
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/users/RequiredUserActionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/users/RequiredUserActionsTest.java
index d532ae6..787303f 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/users/RequiredUserActionsTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/users/RequiredUserActionsTest.java
@@ -67,7 +67,7 @@ public class RequiredUserActionsTest extends AbstractUserTest {
public void updatePassword() {
userAttributesPage.form().addRequiredAction(UPDATE_PASSWORD.getActionName());
userAttributesPage.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
testRealmAccountPage.navigateTo();
@@ -91,7 +91,7 @@ public class RequiredUserActionsTest extends AbstractUserTest {
public void updateProfile() {
userAttributesPage.form().addRequiredAction(UPDATE_PROFILE.getActionName());
userAttributesPage.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
testRealmAccountPage.navigateTo();
@@ -128,7 +128,7 @@ public class RequiredUserActionsTest extends AbstractUserTest {
userAttributesPage.form().addRequiredAction(TERMS_AND_CONDITIONS.getActionName());
userAttributesPage.form().save();
- assertFlashMessageSuccess();
+ assertAlertSuccess();
testRealmAccountPage.navigateTo();
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/users/UserAttributesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/users/UserAttributesTest.java
index 9d99c85..a2857b2 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/users/UserAttributesTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/console/users/UserAttributesTest.java
@@ -49,7 +49,7 @@ public class UserAttributesTest extends AbstractUserTest {
setPasswordFor(newTestRealmUser, "pass");
newTestRealmUser.setEmail(invalidEmail);
createUser(newTestRealmUser);
- assertFlashMessageDanger();
+ assertAlertDanger();
userAttributesPage.backToUsersViaBreadcrumb();
assertNull(usersPage.table().findUser(testUsername));
@@ -58,7 +58,7 @@ public class UserAttributesTest extends AbstractUserTest {
@Test
public void noUsername() {
createUser(newTestRealmUser);
- assertFlashMessageDanger();
+ assertAlertDanger();
}
@Test
@@ -66,7 +66,7 @@ public class UserAttributesTest extends AbstractUserTest {
String testUsername = "test_duplicated_user";
newTestRealmUser.setUsername(testUsername);
createUser(newTestRealmUser);
- assertFlashMessageSuccess();
+ assertAlertSuccess();
userAttributesPage.backToUsersViaBreadcrumb();
assertNotNull(usersPage.table().findUser(testUsername));
@@ -74,7 +74,7 @@ public class UserAttributesTest extends AbstractUserTest {
UserRepresentation testUser2 = new UserRepresentation();
testUser2.setUsername(testUsername);
createUser(testUser2);
- assertFlashMessageDanger();
+ assertAlertDanger();
}
@Test
@@ -83,7 +83,7 @@ public class UserAttributesTest extends AbstractUserTest {
disabledUser.setEnabled(false);
disabledUser.setUsername("disabled_user");
createUser(disabledUser);
- assertFlashMessageSuccess();
+ assertAlertSuccess();
// TODO try to log in
}
diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
index ad3f626..f93c3bd 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
+++ b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
@@ -11,6 +11,10 @@
<extension qualifier="graphene-secondbrowser">
<property name="browser">${browser}</property>
+ <property name="waitGuiInterval">1</property>
+ <property name="waitAjaxInterval">2</property>
+ <property name="waitModelInterval">5</property>
+ <property name="waitGuardInterval">2</property>
</extension>
<engine>
diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index 13a2059..99b7d9b 100644
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -609,6 +609,26 @@
</pluginManagement>
</build>
</profile>
+
+ <profile>
+ <id>travis</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <arq.extension.graphene.waitGuiInterval>3</arq.extension.graphene.waitGuiInterval>
+ <arq.extension.graphene.waitAjaxInterval>9</arq.extension.graphene.waitAjaxInterval>
+ <arq.extension.graphene.waitModelInterval>15</arq.extension.graphene.waitModelInterval>
+ <arq.extension.graphene.waitGuardInterval>15</arq.extension.graphene.waitGuardInterval>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
</project>