From e75e4580ae5ec0e7584ca9375e1373bf47cb340e Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Wed, 15 Jul 2015 12:42:20 +0200 Subject: [PATCH] Some fixes to integration-arquillian Conflicts: testsuite/integration-arquillian/pom.xml --- .../resources/partials/client-detail.html | 6 ++- .../admin/resources/partials/client-list.html | 4 +- .../admin/resources/partials/role-detail.html | 6 ++- .../admin/resources/partials/role-list.html | 2 +- .../resources/partials/session-realm.html | 2 +- .../admin/resources/partials/user-detail.html | 6 ++- .../admin/resources/partials/user-list.html | 4 +- .../resources/partials/user-sessions.html | 4 +- testsuite/integration-arquillian/pom.xml | 15 ++++++-- .../account/AccountManagementTest.java | 16 ++++---- .../AbstractKeycloakTest.java} | 6 +-- .../testsuite/{ui => admin}/AbstractTest.java | 38 ++++++++++++++----- .../{ui => admin}/fragment/CreateRealm.java | 2 +- .../{ui => admin}/fragment/FlashMessage.java | 4 +- .../{ui => admin}/fragment/MenuPage.java | 4 +- .../{ui => admin}/fragment/Navigation.java | 16 +++++--- .../{ui => admin}/fragment/OnOffSwitch.java | 2 +- .../{ui => admin}/fragment/PickList.java | 2 +- .../{ui => admin}/model/Account.java | 2 +- .../testsuite/{ui => admin}/model/Client.java | 2 +- .../{ui => admin}/model/PasswordPolicy.java | 2 +- .../{ui => admin}/model/Provider.java | 2 +- .../testsuite/{ui => admin}/model/Role.java | 2 +- .../{ui => admin}/model/SocialProvider.java | 2 +- .../testsuite/{ui => admin}/model/Theme.java | 2 +- .../testsuite/{ui => admin}/model/User.java | 2 +- .../{ui => admin}/model/UserAction.java | 2 +- .../{ui => admin}/page/AbstractPage.java | 10 +---- .../{ui => admin}/page/LoginPage.java | 6 +-- .../{ui => admin}/page/RegisterPage.java | 6 +-- .../page/account/AccountPage.java | 6 +-- .../page/account/PasswordPage.java | 2 +- .../page/session/SessionsPage.java | 11 ++++-- .../page/settings/ClientPage.java | 21 ++++++---- .../page/settings/DefaultRolesPage.java | 8 ++-- .../page/settings/GeneralSettingsPage.java | 6 +-- .../page/settings/LoginSettingsPage.java | 6 +-- .../page/settings/PasswordPolicyPage.java} | 8 ++-- .../page/settings/RolesPage.java | 22 +++++++---- .../page/settings/SecurityPage.java | 8 ++-- .../page/settings/SocialSettingsPage.java | 8 ++-- .../page/settings/ThemesSettingsPage.java | 8 ++-- .../page/settings/TokensPage.java | 6 +-- .../page/settings/user/RoleMappingsPage.java | 6 +-- .../page/settings/user/UserPage.java | 27 ++++++++----- .../test/client/AddNewClientTest.java | 12 +++--- .../test/role/AddNewRoleTest.java | 14 +++---- .../test/session/SessionsTest.java | 10 ++--- .../test/session/TokensTest.java | 10 ++--- .../test/settings/PasswordPolicyTest.java} | 13 ++++--- .../test/settings/SecuritySettingsTest.java | 8 ++-- .../test/settings/SocialSettingsTest.java | 16 ++++---- .../test/settings/ThemesSettingsTest.java | 10 ++--- .../test/user/AddNewUserTest.java | 14 +++---- .../test/user/RoleMappingsTest.java | 14 +++---- .../{ui => admin}/util/Constants.java | 2 +- .../{ui => admin}/util/SeleniumUtils.java | 2 +- .../testsuite/{ui => admin}/util/URL.java | 13 +++---- .../testsuite/{ui => admin}/util/Users.java | 4 +- .../user => login}/RegisterNewUserTest.java | 22 ++++++----- 60 files changed, 278 insertions(+), 218 deletions(-) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui/test => }/account/AccountManagementTest.java (88%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui/AbstractKeyCloakTest.java => admin/AbstractKeycloakTest.java} (87%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/AbstractTest.java (61%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/fragment/CreateRealm.java (96%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/fragment/FlashMessage.java (93%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/fragment/MenuPage.java (94%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/fragment/Navigation.java (89%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/fragment/OnOffSwitch.java (96%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/fragment/PickList.java (97%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/model/Account.java (98%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/model/Client.java (98%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/model/PasswordPolicy.java (95%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/model/Provider.java (95%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/model/Role.java (97%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/model/SocialProvider.java (95%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/model/Theme.java (95%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/model/User.java (99%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/model/UserAction.java (95%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/page/AbstractPage.java (84%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/page/LoginPage.java (89%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/page/RegisterPage.java (94%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/page/account/AccountPage.java (94%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/page/account/PasswordPage.java (97%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/page/session/SessionsPage.java (73%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/page/settings/ClientPage.java (87%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/page/settings/DefaultRolesPage.java (87%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/page/settings/GeneralSettingsPage.java (93%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/page/settings/LoginSettingsPage.java (90%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui/page/settings/CredentialsPage.java => admin/page/settings/PasswordPolicyPage.java} (90%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/page/settings/RolesPage.java (87%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/page/settings/SecurityPage.java (93%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/page/settings/SocialSettingsPage.java (92%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/page/settings/ThemesSettingsPage.java (88%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/page/settings/TokensPage.java (91%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/page/settings/user/RoleMappingsPage.java (90%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/page/settings/user/UserPage.java (89%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/test/client/AddNewClientTest.java (90%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/test/role/AddNewRoleTest.java (86%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/test/session/SessionsTest.java (76%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/test/session/TokensTest.java (85%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui/test/settings/CredentialsTest.java => admin/test/settings/PasswordPolicyTest.java} (72%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/test/settings/SecuritySettingsTest.java (77%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/test/settings/SocialSettingsTest.java (77%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/test/settings/ThemesSettingsTest.java (81%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/test/user/AddNewUserTest.java (89%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/test/user/RoleMappingsTest.java (83%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/util/Constants.java (95%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/util/SeleniumUtils.java (98%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/util/URL.java (66%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui => admin}/util/Users.java (91%) rename testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/{ui/test/user => login}/RegisterNewUserTest.java (84%) diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html index 8038cc7b65..0d8e73897f 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-detail.html @@ -7,8 +7,10 @@

Add Client

-

{{client.clientId|capitalize}}

+

+ {{client.clientId|capitalize}} + +

diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-list.html index f6648bdada..b1333a4b3f 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-list.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/client-list.html @@ -19,8 +19,8 @@
- Create - Import + Create + Import
diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-detail.html index 0d3c3773f0..b5de76c17b 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-detail.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-detail.html @@ -6,8 +6,10 @@
  • Add Role
    • -

    {{role.name|capitalize}}

    +

    + {{role.name|capitalize}} + +

    Add Role

    diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html index 6689b5638d..7c6b0596e6 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/role-list.html @@ -21,7 +21,7 @@
    - Add Role + Add Role
    diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/session-realm.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/session-realm.html index 2d71f9c2f8..4426f4bea8 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/session-realm.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/session-realm.html @@ -11,7 +11,7 @@
    - Logout All + Logout All
    diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-detail.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-detail.html index 270865f12e..6eeacaa414 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-detail.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-detail.html @@ -5,8 +5,10 @@
  • Add User
    • -

    {{user.username|capitalize}}

    +

    + {{user.username|capitalize}} + +

    Add User

    diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html index cb90423592..fb47296cae 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-list.html @@ -15,10 +15,10 @@ - +
    - Add User + Add User
    diff --git a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html index 9d911c5ab9..dfca5498ce 100755 --- a/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html +++ b/forms/common-themes/src/main/resources/theme/base/admin/resources/partials/user-sessions.html @@ -11,9 +11,9 @@ - diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml index c297bdd7de..958c716867 100644 --- a/testsuite/integration-arquillian/pom.xml +++ b/testsuite/integration-arquillian/pom.xml @@ -9,8 +9,8 @@ 4.0.0 - arquillian-integration - KeyCloak Admin UI TestSuite + keycloak-testsuite-integration-arquillian + KeyCloak Arquillian TestSuite phantomjs @@ -87,6 +87,16 @@ ${arquillian-phantomjs.version} test + + org.keycloak + keycloak-server-dist + test + zip + + + org.slf4j + slf4j-log4j12 + @@ -151,7 +161,6 @@ org.keycloak keycloak-server-dist - ${project.version} zip false diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/account/AccountManagementTest.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/account/AccountManagementTest.java similarity index 88% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/account/AccountManagementTest.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/account/AccountManagementTest.java index 537fee30f6..016243b0e6 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/account/AccountManagementTest.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/account/AccountManagementTest.java @@ -16,28 +16,28 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.test.account; +package org.keycloak.testsuite.account; import org.jboss.arquillian.graphene.findby.FindByJQuery; import org.jboss.arquillian.graphene.page.Page; import org.junit.After; import org.junit.Test; -import static org.keycloak.testsuite.ui.util.Constants.ADMIN_PSSWD; +import static org.keycloak.testsuite.admin.util.Constants.ADMIN_PSSWD; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Before; -import org.keycloak.testsuite.ui.AbstractKeyCloakTest; -import org.keycloak.testsuite.ui.fragment.FlashMessage; -import org.keycloak.testsuite.ui.model.Account; -import org.keycloak.testsuite.ui.page.account.AccountPage; -import org.keycloak.testsuite.ui.page.account.PasswordPage; +import org.keycloak.testsuite.admin.AbstractKeycloakTest; +import org.keycloak.testsuite.admin.fragment.FlashMessage; +import org.keycloak.testsuite.admin.model.Account; +import org.keycloak.testsuite.admin.page.account.AccountPage; +import org.keycloak.testsuite.admin.page.account.PasswordPage; /** * * @author Petr Mensik */ -public class AccountManagementTest extends AbstractKeyCloakTest { +public class AccountManagementTest extends AbstractKeycloakTest { @FindByJQuery(".alert") private FlashMessage flashMessage; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/AbstractKeyCloakTest.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/AbstractKeycloakTest.java similarity index 87% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/AbstractKeyCloakTest.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/AbstractKeycloakTest.java index aa1be23386..4c756a10dd 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/AbstractKeyCloakTest.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/AbstractKeycloakTest.java @@ -16,20 +16,20 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui; +package org.keycloak.testsuite.admin; import java.util.concurrent.TimeUnit; import org.jboss.arquillian.graphene.page.Page; import org.junit.After; import org.junit.Before; -import org.keycloak.testsuite.ui.page.AbstractPage; +import org.keycloak.testsuite.admin.page.AbstractPage; /** * * @author Petr Mensik * @param

    */ -public abstract class AbstractKeyCloakTest

    extends AbstractTest { +public abstract class AbstractKeycloakTest

    extends AbstractTest { @Page protected P page; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/AbstractTest.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/AbstractTest.java similarity index 61% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/AbstractTest.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/AbstractTest.java index b05331e7d1..e71e4eadc1 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/AbstractTest.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/AbstractTest.java @@ -16,19 +16,21 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui; +package org.keycloak.testsuite.admin; import org.jboss.arquillian.drone.api.annotation.Drone; import org.jboss.arquillian.graphene.page.Page; import org.jboss.arquillian.junit.Arquillian; import org.junit.runner.RunWith; -import org.keycloak.testsuite.ui.fragment.Navigation; -import org.keycloak.testsuite.ui.fragment.MenuPage; -import org.keycloak.testsuite.ui.page.LoginPage; -import org.keycloak.testsuite.ui.page.account.PasswordPage; -import static org.keycloak.testsuite.ui.util.Constants.ADMIN_PSSWD; +import org.keycloak.testsuite.admin.fragment.Navigation; +import org.keycloak.testsuite.admin.fragment.MenuPage; +import org.keycloak.testsuite.admin.page.LoginPage; +import org.keycloak.testsuite.admin.page.account.PasswordPage; +import static org.keycloak.testsuite.admin.util.Constants.ADMIN_PSSWD; + +import static org.keycloak.testsuite.admin.util.URL.ACCOUNT_URL; +import static org.keycloak.testsuite.admin.util.URL.ADMIN_URL; -import static org.keycloak.testsuite.ui.util.URL.BASE_URL; import org.openqa.selenium.WebDriver; /** @@ -38,8 +40,11 @@ import org.openqa.selenium.WebDriver; @RunWith(Arquillian.class) public abstract class AbstractTest { - private static boolean firstAdminLogin = Boolean.parseBoolean( - System.getProperty("firstAdminLogin", "true")); + private static Boolean firstAdminLogin; + static { + String s = System.getProperty("firstAdminLogin"); + firstAdminLogin = s != null ? Boolean.parseBoolean(s) : null; + } @Page protected LoginPage loginPage; @@ -61,8 +66,13 @@ public abstract class AbstractTest { } public void loginAsAdmin() { - driver.get(BASE_URL); + openAdmin(); loginPage.loginAsAdmin(); + + if (firstAdminLogin == null) { + firstAdminLogin = driver.getTitle().contains("Update password"); + } + if (firstAdminLogin) { passwordPage.confirmNewPassword(ADMIN_PSSWD); passwordPage.submit(); @@ -70,4 +80,12 @@ public abstract class AbstractTest { } } + public void openAdmin() { + driver.get(ADMIN_URL); + } + + public void openAccount() { + driver.get(ACCOUNT_URL); + } + } diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/CreateRealm.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/CreateRealm.java similarity index 96% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/CreateRealm.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/CreateRealm.java index bae764fb4c..f8dda90a23 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/CreateRealm.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/CreateRealm.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.fragment; +package org.keycloak.testsuite.admin.fragment; import org.jboss.arquillian.drone.api.annotation.Drone; import static org.openqa.selenium.By.id; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/FlashMessage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/FlashMessage.java similarity index 93% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/FlashMessage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/FlashMessage.java index 33a84afa67..e6eadadd17 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/FlashMessage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/FlashMessage.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.fragment; +package org.keycloak.testsuite.admin.fragment; import static org.jboss.arquillian.graphene.Graphene.waitGui; import org.jboss.arquillian.graphene.fragment.Root; -import static org.keycloak.testsuite.ui.util.SeleniumUtils.waitGuiForElement; +import static org.keycloak.testsuite.admin.util.SeleniumUtils.waitGuiForElement; import org.openqa.selenium.WebElement; /** diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/MenuPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/MenuPage.java similarity index 94% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/MenuPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/MenuPage.java index 2f5365840d..fda78b745f 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/MenuPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/MenuPage.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.fragment; +package org.keycloak.testsuite.admin.fragment; import java.util.List; -import static org.keycloak.testsuite.ui.util.SeleniumUtils.waitGuiForElement; +import static org.keycloak.testsuite.admin.util.SeleniumUtils.waitGuiForElement; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/Navigation.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/Navigation.java similarity index 89% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/Navigation.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/Navigation.java index 2ef3a69365..f295c8d35a 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/Navigation.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/Navigation.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.testsuite.ui.fragment; +package org.keycloak.testsuite.admin.fragment; import org.jboss.arquillian.drone.api.annotation.Drone; import static org.jboss.arquillian.graphene.Graphene.waitModel; -import static org.keycloak.testsuite.ui.util.SeleniumUtils.waitGuiForElement; +import static org.keycloak.testsuite.admin.util.SeleniumUtils.waitGuiForElement; import org.jboss.arquillian.graphene.findby.FindByJQuery; import org.openqa.selenium.support.FindBy; @@ -75,8 +75,11 @@ public class Navigation { @FindByJQuery("a:contains('Add Realm')") private WebElement addRealm; - @FindByJQuery("a:contains('Credentials')") - private WebElement credentials; + @FindByJQuery("a:contains('Authentication')") + private WebElement authentication; + + @FindByJQuery("a:contains('Password Policy')") + private WebElement passwordPolicy; @FindByJQuery("a:contains('Attributes')") private WebElement attributes; @@ -142,8 +145,9 @@ public class Navigation { openPage(addRealm, "Add Realm"); } - public void credentials() { - openPage(credentials, "Settings"); + public void passwordPolicy() { + openPage(authentication, "Authentication"); + openPage(passwordPolicy, "Authentication"); } public void attributes() { diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/OnOffSwitch.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/OnOffSwitch.java similarity index 96% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/OnOffSwitch.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/OnOffSwitch.java index 3fc3a9070d..e07be81380 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/OnOffSwitch.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/OnOffSwitch.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.fragment; +package org.keycloak.testsuite.admin.fragment; import org.jboss.arquillian.graphene.fragment.Root; import org.jboss.arquillian.test.api.ArquillianResource; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/PickList.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/PickList.java similarity index 97% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/PickList.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/PickList.java index 7711585afe..d315293812 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/PickList.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/fragment/PickList.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.fragment; +package org.keycloak.testsuite.admin.fragment; import org.jboss.arquillian.graphene.fragment.Root; import org.openqa.selenium.By; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/Account.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/Account.java similarity index 98% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/Account.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/Account.java index f2a2ef019b..003a64015f 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/Account.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/Account.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.model; +package org.keycloak.testsuite.admin.model; /** * diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/Client.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/Client.java similarity index 98% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/Client.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/Client.java index 5172f8fdf0..e7f65af117 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/Client.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/Client.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.model; +package org.keycloak.testsuite.admin.model; /** * diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/PasswordPolicy.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/PasswordPolicy.java similarity index 95% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/PasswordPolicy.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/PasswordPolicy.java index 6d2c65191f..ef3d3de0a8 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/PasswordPolicy.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/PasswordPolicy.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.model; +package org.keycloak.testsuite.admin.model; /** * diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/Provider.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/Provider.java similarity index 95% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/Provider.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/Provider.java index 869eec2be2..6f7fc767c1 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/Provider.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/Provider.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.model; +package org.keycloak.testsuite.admin.model; /** * diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/Role.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/Role.java similarity index 97% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/Role.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/Role.java index efe617850f..2e3d074bea 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/Role.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/Role.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.model; +package org.keycloak.testsuite.admin.model; /** * diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/SocialProvider.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/SocialProvider.java similarity index 95% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/SocialProvider.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/SocialProvider.java index cb13d68406..3ba17ec8da 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/SocialProvider.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/SocialProvider.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.model; +package org.keycloak.testsuite.admin.model; /** * diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/Theme.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/Theme.java similarity index 95% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/Theme.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/Theme.java index 0578449e3c..6765ba2843 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/Theme.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/Theme.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.model; +package org.keycloak.testsuite.admin.model; /** * diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/User.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/User.java similarity index 99% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/User.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/User.java index e4be9f581b..f9bceca771 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/User.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/User.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.model; +package org.keycloak.testsuite.admin.model; /** * diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/UserAction.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/UserAction.java similarity index 95% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/UserAction.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/UserAction.java index bf6a396a08..8a0dc2c942 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/model/UserAction.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/model/UserAction.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.model; +package org.keycloak.testsuite.admin.model; /** * diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/AbstractPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/AbstractPage.java similarity index 84% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/AbstractPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/AbstractPage.java index 8251ab242f..8f3694db19 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/AbstractPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/AbstractPage.java @@ -15,11 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.keycloak.testsuite.ui.page; +package org.keycloak.testsuite.admin.page; -import java.util.List; import org.jboss.arquillian.drone.api.annotation.Drone; -import org.keycloak.testsuite.ui.util.Constants; +import org.keycloak.testsuite.admin.util.Constants; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; @@ -36,14 +35,9 @@ public class AbstractPage { @FindBy(css = ".btn-danger") protected WebElement dangerButton; - //@FindByJQuery(".btn-primary:visible") @FindBy(css = ".btn-primary") protected WebElement primaryButton; - - @FindBy(css = ".btn-primary") - protected List primaryButtons; - @FindBy(css = ".ng-binding.btn.btn-danger") protected WebElement deleteConfirmationButton; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/LoginPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/LoginPage.java similarity index 89% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/LoginPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/LoginPage.java index 06ef63eddf..1dc535d118 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/LoginPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/LoginPage.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.page; +package org.keycloak.testsuite.admin.page; -import static org.keycloak.testsuite.ui.util.Constants.ADMIN_PSSWD; -import static org.keycloak.testsuite.ui.util.SeleniumUtils.waitGuiForElement; +import static org.keycloak.testsuite.admin.util.Constants.ADMIN_PSSWD; +import static org.keycloak.testsuite.admin.util.SeleniumUtils.waitGuiForElement; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/RegisterPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/RegisterPage.java similarity index 94% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/RegisterPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/RegisterPage.java index 1c3ad33a65..91190fd785 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/RegisterPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/RegisterPage.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.page; +package org.keycloak.testsuite.admin.page; -import org.keycloak.testsuite.ui.model.User; +import org.keycloak.testsuite.admin.model.User; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import java.util.concurrent.TimeUnit; -import static org.keycloak.testsuite.ui.util.SeleniumUtils.waitGuiForElement; +import static org.keycloak.testsuite.admin.util.SeleniumUtils.waitGuiForElement; /** * diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/account/AccountPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/account/AccountPage.java similarity index 94% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/account/AccountPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/account/AccountPage.java index 0c8ab504d0..cf30c9c358 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/account/AccountPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/account/AccountPage.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.page.account; +package org.keycloak.testsuite.admin.page.account; import org.jboss.arquillian.graphene.findby.FindByJQuery; -import org.keycloak.testsuite.ui.model.Account; -import org.keycloak.testsuite.ui.page.AbstractPage; +import org.keycloak.testsuite.admin.model.Account; +import org.keycloak.testsuite.admin.page.AbstractPage; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/account/PasswordPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/account/PasswordPage.java similarity index 97% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/account/PasswordPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/account/PasswordPage.java index b0a3e9d82b..555e092de3 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/account/PasswordPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/account/PasswordPage.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.page.account; +package org.keycloak.testsuite.admin.page.account; import org.jboss.arquillian.graphene.findby.FindByJQuery; import org.openqa.selenium.WebElement; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/session/SessionsPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/session/SessionsPage.java similarity index 73% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/session/SessionsPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/session/SessionsPage.java index d714a6404a..342a76395e 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/session/SessionsPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/session/SessionsPage.java @@ -16,9 +16,11 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.page.session; +package org.keycloak.testsuite.admin.page.session; -import org.keycloak.testsuite.ui.page.AbstractPage; +import org.keycloak.testsuite.admin.page.AbstractPage; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; /** * @@ -26,7 +28,10 @@ import org.keycloak.testsuite.ui.page.AbstractPage; */ public class SessionsPage extends AbstractPage { + @FindBy(id = "logoutAllSessions") + private WebElement logoutAllSessions; + public void logoutAllSessions() { - primaryButton.click(); + logoutAllSessions.click(); } } diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/ClientPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/ClientPage.java similarity index 87% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/ClientPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/ClientPage.java index 890c7e5528..1a7fb3b4df 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/ClientPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/ClientPage.java @@ -16,19 +16,18 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.page.settings; +package org.keycloak.testsuite.admin.page.settings; -import org.keycloak.testsuite.ui.model.Client; -import org.keycloak.testsuite.ui.page.AbstractPage; +import org.keycloak.testsuite.admin.model.Client; +import org.keycloak.testsuite.admin.page.AbstractPage; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import java.util.ArrayList; import java.util.List; -import org.jboss.arquillian.graphene.findby.ByJQuery; import static org.junit.Assert.assertEquals; -import static org.keycloak.testsuite.ui.util.SeleniumUtils.waitAjaxForElement; +import static org.keycloak.testsuite.admin.util.SeleniumUtils.waitAjaxForElement; import static org.openqa.selenium.By.cssSelector; import static org.openqa.selenium.By.linkText; import static org.openqa.selenium.By.tagName; @@ -60,6 +59,12 @@ public class ClientPage extends AbstractPage { @FindBy(css = "input[class*='search']") private WebElement searchInput; + @FindBy(id = "createClient") + private WebElement createButton; + + @FindBy(id = "removeClient") + protected WebElement removeButton; + public void addClient(Client client) { primaryButton.click(); waitAjaxForElement(clientId); @@ -87,8 +92,8 @@ public class ClientPage extends AbstractPage { public void deleteClient(String clientName) { searchInput.sendKeys(clientName); driver.findElement(linkText(clientName)).click(); - waitAjaxForElement(dangerButton); - dangerButton.click(); + waitAjaxForElement(removeButton); + removeButton.click(); waitAjaxForElement(deleteConfirmationButton); deleteConfirmationButton.click(); } @@ -124,6 +129,6 @@ public class ClientPage extends AbstractPage { } public void goToCreateClient() { - driver.findElements(ByJQuery.selector(".btn.btn-primary")).get(0).click(); + createButton.click(); } } diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/DefaultRolesPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/DefaultRolesPage.java similarity index 87% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/DefaultRolesPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/DefaultRolesPage.java index d76ede60f4..d122e63f1d 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/DefaultRolesPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/DefaultRolesPage.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.page.settings; +package org.keycloak.testsuite.admin.page.settings; import java.util.ArrayList; import java.util.List; -import org.keycloak.testsuite.ui.fragment.PickList; -import org.keycloak.testsuite.ui.page.AbstractPage; -import org.keycloak.testsuite.ui.model.Role; +import org.keycloak.testsuite.admin.fragment.PickList; +import org.keycloak.testsuite.admin.page.AbstractPage; +import org.keycloak.testsuite.admin.model.Role; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.Select; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/GeneralSettingsPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/GeneralSettingsPage.java similarity index 93% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/GeneralSettingsPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/GeneralSettingsPage.java index 744b3641ab..5a4d9bb507 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/GeneralSettingsPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/GeneralSettingsPage.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.page.settings; +package org.keycloak.testsuite.admin.page.settings; -import org.keycloak.testsuite.ui.page.AbstractPage; -import org.keycloak.testsuite.ui.model.Theme; +import org.keycloak.testsuite.admin.page.AbstractPage; +import org.keycloak.testsuite.admin.model.Theme; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.Select; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/LoginSettingsPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/LoginSettingsPage.java similarity index 90% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/LoginSettingsPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/LoginSettingsPage.java index 84049dc188..fb9877996c 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/LoginSettingsPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/LoginSettingsPage.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.page.settings; +package org.keycloak.testsuite.admin.page.settings; import org.jboss.arquillian.graphene.findby.FindByJQuery; -import org.keycloak.testsuite.ui.fragment.OnOffSwitch; -import org.keycloak.testsuite.ui.page.AbstractPage; +import org.keycloak.testsuite.admin.fragment.OnOffSwitch; +import org.keycloak.testsuite.admin.page.AbstractPage; /** * diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/CredentialsPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/PasswordPolicyPage.java similarity index 90% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/CredentialsPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/PasswordPolicyPage.java index a0455f5f72..02e7953c32 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/CredentialsPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/PasswordPolicyPage.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.page.settings; +package org.keycloak.testsuite.admin.page.settings; import java.util.List; import org.jboss.arquillian.graphene.findby.ByJQuery; -import org.keycloak.testsuite.ui.model.PasswordPolicy; -import org.keycloak.testsuite.ui.page.AbstractPage; +import org.keycloak.testsuite.admin.model.PasswordPolicy; +import org.keycloak.testsuite.admin.page.AbstractPage; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; @@ -30,7 +30,7 @@ import org.openqa.selenium.support.ui.Select; * * @author Petr Mensik */ -public class CredentialsPage extends AbstractPage { +public class PasswordPolicyPage extends AbstractPage { @FindBy(tagName = "select") private Select addPolicySelect; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/RolesPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/RolesPage.java similarity index 87% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/RolesPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/RolesPage.java index 1ddaca5e5c..6095b4089e 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/RolesPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/RolesPage.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.page.settings; +package org.keycloak.testsuite.admin.page.settings; import java.util.ArrayList; import java.util.List; import static org.junit.Assert.assertEquals; -import org.keycloak.testsuite.ui.page.AbstractPage; -import org.keycloak.testsuite.ui.model.Role; +import org.keycloak.testsuite.admin.page.AbstractPage; +import org.keycloak.testsuite.admin.model.Role; import static org.openqa.selenium.By.cssSelector; import static org.openqa.selenium.By.linkText; import static org.openqa.selenium.By.tagName; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import static org.keycloak.testsuite.ui.util.SeleniumUtils.*; +import static org.keycloak.testsuite.admin.util.SeleniumUtils.*; /** * * @author Petr Mensik @@ -49,14 +49,20 @@ public class RolesPage extends AbstractPage { @FindBy(id = "compositeSwitch") private WebElement compositeSwitchToggle; - + + @FindBy(id = "createRole") + private WebElement createButton; + + @FindBy(id = "removeRole") + protected WebElement removeButton; + public boolean isRoleComposite(String roleName) { return findRole(roleName).isComposite(); } public void addRole(Role role) { - primaryButton.click(); + createButton.click(); waitAjaxForElement(nameInput); nameInput.sendKeys(role.getName()); if (role.isComposite()) { @@ -86,8 +92,8 @@ public class RolesPage extends AbstractPage { public void deleteRole(Role role) { driver.findElement(linkText(role.getName())).click(); - waitAjaxForElement(dangerButton); - dangerButton.click(); + waitAjaxForElement(removeButton); + removeButton.click(); deleteConfirmationButton.click(); } diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/SecurityPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/SecurityPage.java similarity index 93% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/SecurityPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/SecurityPage.java index 13d6a073a7..df9ac33343 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/SecurityPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/SecurityPage.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.page.settings; +package org.keycloak.testsuite.admin.page.settings; import org.jboss.arquillian.graphene.findby.FindByJQuery; -import org.keycloak.testsuite.ui.fragment.OnOffSwitch; -import org.keycloak.testsuite.ui.page.AbstractPage; -import org.keycloak.testsuite.ui.util.SeleniumUtils; +import org.keycloak.testsuite.admin.fragment.OnOffSwitch; +import org.keycloak.testsuite.admin.page.AbstractPage; +import org.keycloak.testsuite.admin.util.SeleniumUtils; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.Select; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/SocialSettingsPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/SocialSettingsPage.java similarity index 92% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/SocialSettingsPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/SocialSettingsPage.java index ef38396b08..5fb0e5a97a 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/SocialSettingsPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/SocialSettingsPage.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.page.settings; +package org.keycloak.testsuite.admin.page.settings; import java.util.ArrayList; import java.util.List; import org.jboss.arquillian.graphene.findby.FindByJQuery; import static org.junit.Assert.assertNotNull; -import org.keycloak.testsuite.ui.model.Provider; -import org.keycloak.testsuite.ui.model.SocialProvider; -import org.keycloak.testsuite.ui.page.AbstractPage; +import org.keycloak.testsuite.admin.model.Provider; +import org.keycloak.testsuite.admin.model.SocialProvider; +import org.keycloak.testsuite.admin.page.AbstractPage; import static org.openqa.selenium.By.tagName; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/ThemesSettingsPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/ThemesSettingsPage.java similarity index 88% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/ThemesSettingsPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/ThemesSettingsPage.java index d311d4daa6..eca517bc8f 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/ThemesSettingsPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/ThemesSettingsPage.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.page.settings; +package org.keycloak.testsuite.admin.page.settings; -import org.keycloak.testsuite.ui.page.AbstractPage; +import org.keycloak.testsuite.admin.page.AbstractPage; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.Select; -import static org.keycloak.testsuite.ui.util.SeleniumUtils.waitGuiForElement; -import static org.keycloak.testsuite.ui.util.SeleniumUtils.waitGuiForElementNotPresent; +import static org.keycloak.testsuite.admin.util.SeleniumUtils.waitGuiForElement; +import static org.keycloak.testsuite.admin.util.SeleniumUtils.waitGuiForElementNotPresent; import org.openqa.selenium.By; /** diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/TokensPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/TokensPage.java similarity index 91% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/TokensPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/TokensPage.java index fc8d433533..1dd6a244fb 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/TokensPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/TokensPage.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.page.settings; +package org.keycloak.testsuite.admin.page.settings; import java.util.concurrent.TimeUnit; -import org.keycloak.testsuite.ui.page.AbstractPage; +import org.keycloak.testsuite.admin.page.AbstractPage; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.Select; import static java.lang.String.valueOf; -import static org.keycloak.testsuite.ui.util.SeleniumUtils.waitGuiForElement; +import static org.keycloak.testsuite.admin.util.SeleniumUtils.waitGuiForElement; import static org.apache.commons.lang3.text.WordUtils.capitalize; /** diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/user/RoleMappingsPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/user/RoleMappingsPage.java similarity index 90% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/user/RoleMappingsPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/user/RoleMappingsPage.java index 3b92314e10..0056cea61d 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/user/RoleMappingsPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/user/RoleMappingsPage.java @@ -1,12 +1,12 @@ -package org.keycloak.testsuite.ui.page.settings.user; +package org.keycloak.testsuite.admin.page.settings.user; -import org.keycloak.testsuite.ui.page.AbstractPage; +import org.keycloak.testsuite.admin.page.AbstractPage; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.Select; -import static org.keycloak.testsuite.ui.util.SeleniumUtils.waitGuiForElement; +import static org.keycloak.testsuite.admin.util.SeleniumUtils.waitGuiForElement; /** * Created by fkiss. diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/user/UserPage.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/user/UserPage.java similarity index 89% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/user/UserPage.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/user/UserPage.java index 2068879992..ce897bccba 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/user/UserPage.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/page/settings/user/UserPage.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.page.settings.user; +package org.keycloak.testsuite.admin.page.settings.user; import org.jboss.arquillian.graphene.findby.FindByJQuery; -import org.keycloak.testsuite.ui.model.User; -import org.keycloak.testsuite.ui.page.AbstractPage; +import org.keycloak.testsuite.admin.model.User; +import org.keycloak.testsuite.admin.page.AbstractPage; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; @@ -28,8 +28,8 @@ import java.util.ArrayList; import java.util.List; import static org.junit.Assert.assertEquals; -import org.keycloak.testsuite.ui.model.UserAction; -import static org.keycloak.testsuite.ui.util.SeleniumUtils.waitAjaxForElement; +import org.keycloak.testsuite.admin.model.UserAction; +import static org.keycloak.testsuite.admin.util.SeleniumUtils.waitAjaxForElement; import static org.openqa.selenium.By.*; import org.openqa.selenium.support.ui.Select; @@ -69,6 +69,15 @@ public class UserPage extends AbstractPage { @FindBy(id = "confirmPassword") private WebElement confirmPassword; + @FindBy(id = "viewAllUsers") + private WebElement viewAllUsers; + + @FindBy(id = "createUser") + private WebElement createUser; + + @FindBy(id = "removeUser") + private WebElement removeUser; + @FindBy(css = "input[class*='search']") private WebElement searchInput; @@ -82,7 +91,7 @@ public class UserPage extends AbstractPage { private WebElement searchButton; public void addUser(User user) { - primaryButtons.get(1).click(); + createUser.click(); waitAjaxForElement(usernameInput); usernameInput.sendKeys(user.getUserName()); emailInput.sendKeys(user.getEmail()); @@ -139,8 +148,8 @@ public class UserPage extends AbstractPage { searchInput.sendKeys(username); searchButton.click(); driver.findElement(linkText(username)).click(); - waitAjaxForElement(dangerButton); - dangerButton.click(); + waitAjaxForElement(removeUser); + removeUser.click(); waitAjaxForElement(deleteConfirmationButton); deleteConfirmationButton.click(); } @@ -150,7 +159,7 @@ public class UserPage extends AbstractPage { } public void showAllUsers() { - primaryButtons.get(0).click(); + viewAllUsers.click(); } public void goToUser(User user) { diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/client/AddNewClientTest.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/client/AddNewClientTest.java similarity index 90% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/client/AddNewClientTest.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/client/AddNewClientTest.java index 8e0cb19a54..c79b501131 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/client/AddNewClientTest.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/client/AddNewClientTest.java @@ -16,25 +16,25 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.test.client; +package org.keycloak.testsuite.admin.test.client; import org.jboss.arquillian.graphene.findby.FindByJQuery; import org.junit.Test; -import org.keycloak.testsuite.ui.fragment.FlashMessage; -import org.keycloak.testsuite.ui.model.Client; -import org.keycloak.testsuite.ui.page.settings.ClientPage; +import org.keycloak.testsuite.admin.fragment.FlashMessage; +import org.keycloak.testsuite.admin.model.Client; +import org.keycloak.testsuite.admin.page.settings.ClientPage; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import org.junit.Before; -import org.keycloak.testsuite.ui.AbstractKeyCloakTest; +import org.keycloak.testsuite.admin.AbstractKeycloakTest; /** * * @author Filip Kiss */ -public class AddNewClientTest extends AbstractKeyCloakTest { +public class AddNewClientTest extends AbstractKeycloakTest { @FindByJQuery(".alert") private FlashMessage flashMessage; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/role/AddNewRoleTest.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/role/AddNewRoleTest.java similarity index 86% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/role/AddNewRoleTest.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/role/AddNewRoleTest.java index dcd003841b..ae97c65342 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/role/AddNewRoleTest.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/role/AddNewRoleTest.java @@ -3,20 +3,20 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -package org.keycloak.testsuite.ui.test.role; +package org.keycloak.testsuite.admin.test.role; import org.jboss.arquillian.graphene.findby.FindByJQuery; import org.jboss.arquillian.graphene.page.Page; import org.junit.Test; -import org.keycloak.testsuite.ui.page.settings.RolesPage; -import org.keycloak.testsuite.ui.model.Role; +import org.keycloak.testsuite.admin.page.settings.RolesPage; +import org.keycloak.testsuite.admin.model.Role; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Ignore; -import org.keycloak.testsuite.ui.AbstractKeyCloakTest; -import org.keycloak.testsuite.ui.fragment.FlashMessage; -import org.keycloak.testsuite.ui.page.settings.user.UserPage; +import org.keycloak.testsuite.admin.AbstractKeycloakTest; +import org.keycloak.testsuite.admin.fragment.FlashMessage; +import org.keycloak.testsuite.admin.page.settings.user.UserPage; import static org.openqa.selenium.By.id; import org.openqa.selenium.support.ui.Select; @@ -24,7 +24,7 @@ import org.openqa.selenium.support.ui.Select; * * @author Petr Mensik */ -public class AddNewRoleTest extends AbstractKeyCloakTest { +public class AddNewRoleTest extends AbstractKeycloakTest { @Page private UserPage userPage; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/session/SessionsTest.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/session/SessionsTest.java similarity index 76% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/session/SessionsTest.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/session/SessionsTest.java index 41c04c0733..0e03c49934 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/session/SessionsTest.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/session/SessionsTest.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.test.session; +package org.keycloak.testsuite.admin.test.session; import org.junit.Before; import org.junit.Test; -import org.keycloak.testsuite.ui.AbstractKeyCloakTest; -import org.keycloak.testsuite.ui.page.session.SessionsPage; -import static org.keycloak.testsuite.ui.util.SeleniumUtils.waitGuiForElement; +import org.keycloak.testsuite.admin.AbstractKeycloakTest; +import org.keycloak.testsuite.admin.page.session.SessionsPage; +import static org.keycloak.testsuite.admin.util.SeleniumUtils.waitGuiForElement; /** * * @author Petr Mensik */ -public class SessionsTest extends AbstractKeyCloakTest { +public class SessionsTest extends AbstractKeycloakTest { @Before public void beforeSessionTest() { diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/session/TokensTest.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/session/TokensTest.java similarity index 85% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/session/TokensTest.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/session/TokensTest.java index ba1c2e6c46..bfbef6be9d 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/session/TokensTest.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/session/TokensTest.java @@ -16,23 +16,23 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.test.session; +package org.keycloak.testsuite.admin.test.session; import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Test; -import org.keycloak.testsuite.ui.page.settings.TokensPage; +import org.keycloak.testsuite.admin.page.settings.TokensPage; import static org.jboss.arquillian.graphene.Graphene.waitModel; -import org.keycloak.testsuite.ui.AbstractKeyCloakTest; -import static org.keycloak.testsuite.ui.util.SeleniumUtils.waitGuiForElement; +import org.keycloak.testsuite.admin.AbstractKeycloakTest; +import static org.keycloak.testsuite.admin.util.SeleniumUtils.waitGuiForElement; /** * * @author Petr Mensik */ -public class TokensTest extends AbstractKeyCloakTest { +public class TokensTest extends AbstractKeycloakTest { private static final int TIMEOUT = 10; private static final TimeUnit TIME_UNIT = TimeUnit.SECONDS; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/settings/CredentialsTest.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/settings/PasswordPolicyTest.java similarity index 72% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/settings/CredentialsTest.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/settings/PasswordPolicyTest.java index f016db14d0..4a94be1cf9 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/settings/CredentialsTest.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/settings/PasswordPolicyTest.java @@ -16,23 +16,24 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.test.settings; +package org.keycloak.testsuite.admin.test.settings; import org.junit.Before; import org.junit.Test; -import org.keycloak.testsuite.ui.AbstractKeyCloakTest; -import org.keycloak.testsuite.ui.model.PasswordPolicy; -import org.keycloak.testsuite.ui.page.settings.CredentialsPage; +import org.keycloak.testsuite.admin.AbstractKeycloakTest; +import org.keycloak.testsuite.admin.model.PasswordPolicy; +import org.keycloak.testsuite.admin.page.settings.PasswordPolicyPage; /** * * @author Petr Mensik */ -public class CredentialsTest extends AbstractKeyCloakTest { +public class PasswordPolicyTest extends AbstractKeycloakTest { @Before public void beforeCredentialsTest() { - navigation.credentials(); + navigation.passwordPolicy(); + } @Test diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/settings/SecuritySettingsTest.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/settings/SecuritySettingsTest.java similarity index 77% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/settings/SecuritySettingsTest.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/settings/SecuritySettingsTest.java index b748bd6565..04f0475cde 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/settings/SecuritySettingsTest.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/settings/SecuritySettingsTest.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.test.settings; +package org.keycloak.testsuite.admin.test.settings; import org.junit.Test; -import org.keycloak.testsuite.ui.AbstractKeyCloakTest; -import org.keycloak.testsuite.ui.page.settings.SecurityPage; +import org.keycloak.testsuite.admin.AbstractKeycloakTest; +import org.keycloak.testsuite.admin.page.settings.SecurityPage; /** * * @author Filip Kiss */ -public class SecuritySettingsTest extends AbstractKeyCloakTest{ +public class SecuritySettingsTest extends AbstractKeycloakTest { @Test public void securitySettingsTest() { diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/settings/SocialSettingsTest.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/settings/SocialSettingsTest.java similarity index 77% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/settings/SocialSettingsTest.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/settings/SocialSettingsTest.java index 71ecc4eb4c..c3c63c2e3c 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/settings/SocialSettingsTest.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/settings/SocialSettingsTest.java @@ -16,23 +16,23 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.test.settings; +package org.keycloak.testsuite.admin.test.settings; import org.jboss.arquillian.graphene.findby.FindByJQuery; import static org.junit.Assert.*; import org.junit.Test; -import org.keycloak.testsuite.ui.page.settings.SocialSettingsPage; -import org.keycloak.testsuite.ui.AbstractKeyCloakTest; -import org.keycloak.testsuite.ui.fragment.FlashMessage; -import org.keycloak.testsuite.ui.model.Provider; -import org.keycloak.testsuite.ui.model.SocialProvider; -import org.keycloak.testsuite.ui.util.URL; +import org.keycloak.testsuite.admin.page.settings.SocialSettingsPage; +import org.keycloak.testsuite.admin.AbstractKeycloakTest; +import org.keycloak.testsuite.admin.fragment.FlashMessage; +import org.keycloak.testsuite.admin.model.Provider; +import org.keycloak.testsuite.admin.model.SocialProvider; +import org.keycloak.testsuite.admin.util.URL; /** * * @author Petr Mensik */ -public class SocialSettingsTest extends AbstractKeyCloakTest { +public class SocialSettingsTest extends AbstractKeycloakTest { @FindByJQuery(".alert") private FlashMessage flashMessage; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/settings/ThemesSettingsTest.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/settings/ThemesSettingsTest.java similarity index 81% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/settings/ThemesSettingsTest.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/settings/ThemesSettingsTest.java index c4686ff553..ba95acdab5 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/settings/ThemesSettingsTest.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/settings/ThemesSettingsTest.java @@ -16,20 +16,20 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.test.settings; +package org.keycloak.testsuite.admin.test.settings; import org.junit.Before; import org.junit.Test; -import org.keycloak.testsuite.ui.AbstractKeyCloakTest; -import org.keycloak.testsuite.ui.model.Theme; -import org.keycloak.testsuite.ui.page.settings.ThemesSettingsPage; +import org.keycloak.testsuite.admin.AbstractKeycloakTest; +import org.keycloak.testsuite.admin.model.Theme; +import org.keycloak.testsuite.admin.page.settings.ThemesSettingsPage; /** * * @author Filip Kiss */ -public class ThemesSettingsTest extends AbstractKeyCloakTest { +public class ThemesSettingsTest extends AbstractKeycloakTest { @Before public void beforeThemeTest() { diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/user/AddNewUserTest.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/user/AddNewUserTest.java similarity index 89% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/user/AddNewUserTest.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/user/AddNewUserTest.java index f65cc15846..2334cb9fc4 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/user/AddNewUserTest.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/user/AddNewUserTest.java @@ -16,26 +16,26 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.test.user; +package org.keycloak.testsuite.admin.test.user; import org.jboss.arquillian.graphene.findby.FindByJQuery; import org.junit.Test; -import org.keycloak.testsuite.ui.fragment.FlashMessage; -import org.keycloak.testsuite.ui.model.User; -import org.keycloak.testsuite.ui.page.settings.user.UserPage; +import org.keycloak.testsuite.admin.fragment.FlashMessage; +import org.keycloak.testsuite.admin.model.User; +import org.keycloak.testsuite.admin.page.settings.user.UserPage; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Ignore; -import org.keycloak.testsuite.ui.AbstractKeyCloakTest; -import static org.keycloak.testsuite.ui.util.Users.TEST_USER1; +import org.keycloak.testsuite.admin.AbstractKeycloakTest; +import static org.keycloak.testsuite.admin.util.Users.TEST_USER1; /** * * @author Filip Kiss */ -public class AddNewUserTest extends AbstractKeyCloakTest { +public class AddNewUserTest extends AbstractKeycloakTest { @FindByJQuery(".alert") private FlashMessage flashMessage; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/user/RoleMappingsTest.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/user/RoleMappingsTest.java similarity index 83% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/user/RoleMappingsTest.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/user/RoleMappingsTest.java index 157153f62b..ff17c36a28 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/user/RoleMappingsTest.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/test/user/RoleMappingsTest.java @@ -1,15 +1,15 @@ -package org.keycloak.testsuite.ui.test.user; +package org.keycloak.testsuite.admin.test.user; import org.jboss.arquillian.graphene.findby.FindByJQuery; import org.jboss.arquillian.graphene.page.Page; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.keycloak.testsuite.ui.AbstractKeyCloakTest; -import org.keycloak.testsuite.ui.fragment.FlashMessage; -import org.keycloak.testsuite.ui.model.User; -import org.keycloak.testsuite.ui.page.settings.user.RoleMappingsPage; -import org.keycloak.testsuite.ui.page.settings.user.UserPage; +import org.keycloak.testsuite.admin.AbstractKeycloakTest; +import org.keycloak.testsuite.admin.fragment.FlashMessage; +import org.keycloak.testsuite.admin.model.User; +import org.keycloak.testsuite.admin.page.settings.user.RoleMappingsPage; +import org.keycloak.testsuite.admin.page.settings.user.UserPage; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -18,7 +18,7 @@ import static org.openqa.selenium.By.linkText; /** * Created by fkiss. */ -public class RoleMappingsTest extends AbstractKeyCloakTest { +public class RoleMappingsTest extends AbstractKeycloakTest { @Page private UserPage userPage; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/util/Constants.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/util/Constants.java similarity index 95% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/util/Constants.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/util/Constants.java index 3bdde85c6f..2c50f935bd 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/util/Constants.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/util/Constants.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.util; +package org.keycloak.testsuite.admin.util; /** * diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/util/SeleniumUtils.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/util/SeleniumUtils.java similarity index 98% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/util/SeleniumUtils.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/util/SeleniumUtils.java index 15a4ee5c36..8cd5299101 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/util/SeleniumUtils.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/util/SeleniumUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.util; +package org.keycloak.testsuite.admin.util; import static org.jboss.arquillian.graphene.Graphene.waitAjax; import static org.jboss.arquillian.graphene.Graphene.waitGui; diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/util/URL.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/util/URL.java similarity index 66% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/util/URL.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/util/URL.java index ffde485f85..2824401fa5 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/util/URL.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/util/URL.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.util; +package org.keycloak.testsuite.admin.util; /** * @@ -24,11 +24,10 @@ package org.keycloak.testsuite.ui.util; */ public class URL { - public static final String BASE_URL = "http://localhost:8080/auth/admin/master/console/index.html"; - - public static String SETTINGS_GENERAL_SETTINGS = BASE_URL + "#/realms/%s"; - public static String SETTINGS_ROLES = BASE_URL + "#/realms/%s/roles"; - public static String SETTINGS_LOGIN = BASE_URL + "#/realms/%s/login-settings"; - public static String SETTINGS_SOCIAL = BASE_URL + "#/realms/%s/social-settings"; + public static final String BASE_URL = "http://localhost:8080/auth"; + public static final String ADMIN_URL = BASE_URL + "/admin"; + public static final String ACCOUNT_URL = BASE_URL + "/realms/master/account"; + + public static final String SETTINGS_SOCIAL = ADMIN_URL + "/#/realms/%s/social-settings"; } diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/util/Users.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/util/Users.java similarity index 91% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/util/Users.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/util/Users.java index 77a6b5fe9e..615f29f874 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/util/Users.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/admin/util/Users.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.util; +package org.keycloak.testsuite.admin.util; -import org.keycloak.testsuite.ui.model.User; +import org.keycloak.testsuite.admin.model.User; /** * diff --git a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/user/RegisterNewUserTest.java b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/login/RegisterNewUserTest.java similarity index 84% rename from testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/user/RegisterNewUserTest.java rename to testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/login/RegisterNewUserTest.java index 981c531cd1..75abff1e41 100644 --- a/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/user/RegisterNewUserTest.java +++ b/testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/login/RegisterNewUserTest.java @@ -16,28 +16,31 @@ * limitations under the License. */ -package org.keycloak.testsuite.ui.test.user; +package org.keycloak.testsuite.login; import org.jboss.arquillian.graphene.findby.FindByJQuery; import org.jboss.arquillian.graphene.page.Page; import org.junit.After; +import org.junit.Ignore; import org.junit.Test; -import org.keycloak.testsuite.ui.fragment.FlashMessage; -import org.keycloak.testsuite.ui.model.User; -import org.keycloak.testsuite.ui.page.RegisterPage; -import org.keycloak.testsuite.ui.page.settings.user.UserPage; +import org.keycloak.testsuite.admin.fragment.FlashMessage; +import org.keycloak.testsuite.admin.model.User; +import org.keycloak.testsuite.admin.page.RegisterPage; +import org.keycloak.testsuite.admin.page.settings.user.UserPage; import static org.junit.Assert.*; import org.junit.Before; -import org.keycloak.testsuite.ui.AbstractKeyCloakTest; -import org.keycloak.testsuite.ui.page.settings.LoginSettingsPage; -import static org.keycloak.testsuite.ui.util.Users.*; +import org.keycloak.testsuite.admin.AbstractKeycloakTest; +import org.keycloak.testsuite.admin.page.settings.LoginSettingsPage; +import static org.keycloak.testsuite.admin.util.Users.*; /** * * @author Petr Mensik */ -public class RegisterNewUserTest extends AbstractKeyCloakTest { +// Ignoring this test as it's not working and it's duplicating existing tests +@Ignore +public class RegisterNewUserTest extends AbstractKeycloakTest { @Page private UserPage userPage; @@ -54,6 +57,7 @@ public class RegisterNewUserTest extends AbstractKeyCloakTest { navigation.login(); loginSettingsPage.enableUserRegistration(); logOut(); + openAccount(); loginPage.goToUserRegistration(); }

    +
    - Logout All Sessions + Logout All Sessions