Merge pull request #1358 from tkyjovsk/master

fixed some UI tests broken by KEYCLOAK-1431

testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/fragment/Navigation.java

@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.keycloak.testsuite.ui.fragment;
 
 import org.jboss.arquillian.drone.api.annotation.Drone;
@@ -133,8 +132,10 @@ public class Navigation {
         openPage(themesLink, "Settings");
     }
 
-    public void roleMappings() {
+    public void roleMappings(String username) {
-		openPage(usersRoleMappings, "User");
+        String usernameCapitalized = Character.toUpperCase(username.charAt(0))
+                + username.substring(1);
+        openPage(usersRoleMappings, usernameCapitalized);
     }
 
     public void addRealm() {

testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/user/RoleMappingsPage.java

@@ -0,0 +1,71 @@
+package org.keycloak.testsuite.ui.page.settings.user;
+
+import org.keycloak.testsuite.ui.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;
+
+/**
+ * Created by fkiss.
+ */
+public class RoleMappingsPage extends AbstractPage {
+
+    @FindBy(id = "available")
+    private Select availableRolesSelect;
+
+    @FindBy(id = "assigned")
+    private Select assignedRolesSelect;
+
+    @FindBy(id = "realm-composite")
+    private Select effectiveRolesSelect;
+
+    @FindBy(id = "available-client")
+    private Select availableClientRolesSelect;
+
+    @FindBy(id = "assigned-client")
+    private Select assignedClientRolesSelect;
+
+    @FindBy(css = "button[ng-click*='addRealm']")
+    private WebElement addSelected;
+
+    @FindBy(css = "button[ng-click*='addRealm']")
+    private WebElement addSelectedButton;
+
+    @FindBy(css = "button[ng-click*='deleteRealm']")
+    private WebElement removeSelectedButton;
+
+    @FindBy(id = "clients")
+    private Select clientRolesSelect;
+
+    public void addAvailableRole(String role){
+        waitGuiForElement(By.id("available"));
+        availableRolesSelect.selectByVisibleText(role);
+        addSelected.click();
+    }
+
+    public void removeAssignedRole(String client){
+        waitGuiForElement(By.id("assigned"));
+        assignedRolesSelect.selectByVisibleText(client);
+        removeSelectedButton.click();
+    }
+
+    public void selectClientRole(String client){
+        waitGuiForElement(By.id("clients"));
+        clientRolesSelect.selectByVisibleText(client);
+    }
+
+    public void addAvailableClientRole(String role){
+        waitGuiForElement(By.id("available-client"));
+        availableRolesSelect.selectByVisibleText(role);
+        addSelected.click();
+    }
+
+    public void removeAssignedClientRole(String client){
+        waitGuiForElement(By.id("assigned-client"));
+        assignedClientRolesSelect.selectByVisibleText(client);
+        removeSelectedButton.click();
+    }
+}

testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/page/settings/user/UserPage.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.keycloak.testsuite.ui.page.settings;
+package org.keycloak.testsuite.ui.page.settings.user;
 
 import org.jboss.arquillian.graphene.findby.FindByJQuery;
 import org.keycloak.testsuite.ui.model.User;

testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/role/AddNewRoleTest.java

@@ -3,7 +3,6 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-
 package org.keycloak.testsuite.ui.test.role;
 
 import org.jboss.arquillian.graphene.findby.FindByJQuery;
@@ -17,11 +16,10 @@ 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.UserPage;
+import org.keycloak.testsuite.ui.page.settings.user.UserPage;
 import static org.openqa.selenium.By.id;
 import org.openqa.selenium.support.ui.Select;
 
-
 /**
  *
  * @author Petr Mensik
@@ -83,7 +81,7 @@ public class AddNewRoleTest extends AbstractKeyCloakTest<RolesPage> {
         navigation.users();
         userPage.showAllUsers();
         userPage.goToUser("admin");
-		navigation.roleMappings();
+        navigation.roleMappings("Admin");
         Select rolesSelect = new Select(driver.findElement(id("available")));
         assertEquals("User role should be present in admin role mapping",
                 role.getName(), rolesSelect.getOptions().get(0).getText());

testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/user/AddNewUserTest.java

@@ -22,7 +22,7 @@ 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.UserPage;
+import org.keycloak.testsuite.ui.page.settings.user.UserPage;
 
 
 import static org.junit.Assert.*;
@@ -100,13 +100,16 @@ public class AddNewUserTest extends AbstractKeyCloakTest<UserPage> {
 
     @Test
     public void addDisabledUser() {
-        page.addUser(TEST_USER1);
+        User disabledUser = new User(TEST_USER1);
+		disabledUser.setUserEnabled(false);
+		disabledUser.setUserName("disabled_user");
+        page.addUser(disabledUser);
         assertTrue(flashMessage.getText(), flashMessage.isSuccess());
 		navigation.users();
-        page.deleteUser(TEST_USER1.getUserName());
+        page.deleteUser(disabledUser.getUserName());
         flashMessage.waitUntilPresent();
         assertTrue(flashMessage.getText(), flashMessage.isSuccess());
-        assertNull(page.findUser(TEST_USER1.getUserName()));
+        assertNull(page.findUser(disabledUser.getUserName()));
     }
 
     

testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/user/RegisterNewUserTest.java

@@ -25,7 +25,7 @@ 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.UserPage;
+import org.keycloak.testsuite.ui.page.settings.user.UserPage;
 
 import static org.junit.Assert.*;
 import org.junit.Before;

testsuite/integration-arquillian/src/test/java/org/keycloak/testsuite/ui/test/user/RoleMappingsTest.java

@@ -0,0 +1,72 @@
+package org.keycloak.testsuite.ui.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 static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.openqa.selenium.By.linkText;
+
+/**
+ * Created by fkiss.
+ */
+public class RoleMappingsTest extends AbstractKeyCloakTest<RoleMappingsPage> {
+
+    @Page
+    private UserPage userPage;
+
+    @FindByJQuery(".alert")
+    private FlashMessage flashMessage;
+
+    @Before
+    public void beforeAddNewUserTest() {
+        navigation.users();
+    }
+
+    @Test
+    public void addUserAndAssignRole() {
+        String testUsername = "tester1";
+        User testUser = new User(testUsername, "pass");
+        userPage.addUser(testUser);
+        flashMessage.waitUntilPresent();
+        assertTrue(flashMessage.getText(), flashMessage.isSuccess());
+        navigation.users();
+        userPage.findUser(testUsername);
+        driver.findElement(linkText(testUsername)).click();
+        navigation.roleMappings(testUsername);
+
+        page.addAvailableRole("create-realm");
+        assertTrue(flashMessage.getText(), flashMessage.isSuccess());
+        navigation.users();
+        userPage.deleteUser(testUsername);
+    }
+
+    @Ignore
+    @Test
+    public void addAndRemoveUserAndAssignRole() {
+        String testUsername = "tester2";
+        User testUser = new User(testUsername, "pass");
+        userPage.addUser(testUser);
+        flashMessage.waitUntilPresent();
+        assertTrue(flashMessage.getText(), flashMessage.isSuccess());
+        navigation.users();
+        userPage.findUser(testUsername);
+        driver.findElement(linkText(testUsername)).click();
+        navigation.roleMappings(testUsername);
+
+        page.addAvailableRole("create-realm");
+        assertTrue(flashMessage.getText(), flashMessage.isSuccess());
+        page.removeAssignedRole("create-realm");
+        assertTrue(flashMessage.getText(), flashMessage.isSuccess());
+        navigation.users();
+        userPage.deleteUser(testUsername);
+    }
+}