KEYCLOAK-2414 Fix ClientSettingsTest

keycloak · Jan 29, 2016 · b930ef4 · b930ef4
1 parent 41551e0
commit b930ef4
Show file tree

Hide file tree

Showing 4 changed files with 176 additions and 167 deletions.
diff --git a/...r/console/src/main/java/org/keycloak/testsuite/console/page/clients/CreateClientForm.java b/...r/console/src/main/java/org/keycloak/testsuite/console/page/clients/CreateClientForm.java
@@ -25,24 +25,6 @@ public class CreateClientForm extends Form {
     @FindBy(id = "clientId")
     private WebElement clientIdInput;
 
-    @FindBy(id = "name")
-    private WebElement nameInput;
-
-    @FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='enabled']]")
-    private OnOffSwitch enabledSwitch;
-
-    @FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='consentRequired']]")
-    private OnOffSwitch consentRequiredSwitch;
-
-    @FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='standardFlowEnabled']]")
-    private OnOffSwitch standardFlowEnabledSwitch;
-
-    @FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='implicitFlowEnabled']]")
-    private OnOffSwitch implicitFlowEnabledSwitch;
-
-    @FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='directAccessGrantsEnabled']]")
-    private OnOffSwitch directAccessGrantsEnabledSwitch;
-
     @FindBy(id = "protocol")
     private Select protocolSelect;
 
@@ -53,43 +35,11 @@ public SAMLClientSettingsForm samlForm() {
         return samlForm;
     }
 
-    @FindBy(id = "accessType")
-    private Select accessTypeSelect;
-    @FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='serviceAccountsEnabled']]")
-    private OnOffSwitch serviceAccountsEnabledSwitch;
-
-    @FindBy(id = "newRedirectUri")
-    private WebElement newRedirectUriInput;
-    @FindBy(xpath = ".//i[contains(@data-ng-click, 'newRedirectUri')]")
-    private WebElement newRedirectUriSubmit;
-    @FindBy(xpath = ".//input[@ng-model='client.redirectUris[i]']")
-    private List<WebElement> redirectUriInputs;
-    @FindBy(xpath = ".//i[contains(@data-ng-click, 'deleteRedirectUri')]")
-    private List<WebElement> deleteRedirectUriIcons;
-
     public void setValues(ClientRepresentation client) {
         waitUntilElement(clientIdInput).is().present();
 
         setClientId(client.getClientId());
-        setName(client.getName());
-        setEnabled(client.isEnabled());
-        setConsentRequired(client.isConsentRequired());
         setProtocol(client.getProtocol());
-        if (OIDC.equals(client.getProtocol())) {
-            setAccessType(client);
-            if (!client.isBearerOnly()) {
-                setStandardFlowEnabled(client.isStandardFlowEnabled());
-                setDirectAccessGrantsEnabled(client.isDirectAccessGrantsEnabled());
-                if (client.isPublicClient()) {
-                    setImplicitFlowEnabled(client.isImplicitFlowEnabled());
-                } else {//confidential
-                    setServiceAccountsEnabled(client.isServiceAccountsEnabled());
-                }
-                if (client.isStandardFlowEnabled() || client.isImplicitFlowEnabled()) {
-                    setRedirectUris(client.getRedirectUris());
-                }
-            }
-        }
     }
 
     public String getClientId() {
@@ -100,22 +50,6 @@ public void setClientId(String clientId) {
         setInputValue(clientIdInput, clientId);
     }
 
-    public String getName() {
-        return getInputValue(nameInput);
-    }
-
-    public void setName(String name) {
-        setInputValue(nameInput, name);
-    }
-
-    public boolean isEnabled() {
-        return enabledSwitch.isOn();
-    }
-
-    public void setEnabled(boolean enabled) {
-        enabledSwitch.setOn(enabled);
-    }
-
     public enum OidcAccessType {
         BEARER_ONLY("bearer-only"),
         PUBLIC("public"),
@@ -131,77 +65,6 @@ public String getName() {
             return name;
         }
     }
-
-    public void setAccessType(ClientRepresentation client) {
-        if (client.isBearerOnly()) {
-            accessTypeSelect.selectByVisibleText(BEARER_ONLY.getName());
-        } else if (client.isPublicClient()) {
-            accessTypeSelect.selectByVisibleText(PUBLIC.getName());
-        } else {
-            accessTypeSelect.selectByVisibleText(CONFIDENTIAL.getName());
-        }
-    }
-
-    public void addRedirectUri(String redirectUri) {
-        newRedirectUriInput.sendKeys(redirectUri);
-        newRedirectUriSubmit.click();
-    }
-
-    public List<String> getRedirectUris() {
-        List<String> values = new ArrayList<>();
-        for (WebElement input : redirectUriInputs) {
-            values.add(getInputValue(input));
-        }
-        return values;
-    }
-
-    public void setRedirectUris(List<String> redirectUris) {
-        Timer.time();
-        while (!deleteRedirectUriIcons.isEmpty()) {
-            deleteRedirectUriIcons.get(0).click();
-            pause(100);
-        }
-        Timer.time("deleteRedirectUris");
-        if (redirectUris != null) {
-            for (String redirectUri : redirectUris) {
-                addRedirectUri(redirectUri);
-                pause(100);
-            }
-        }
-        Timer.time("addRedirectUris");
-    }
-
-    public boolean isConsentRequired() {
-        return consentRequiredSwitch.isOn();
-    }
-
-    public void setConsentRequired(boolean consentRequired) {
-        consentRequiredSwitch.setOn(consentRequired);
-    }
-
-    public boolean isStandardFlowEnabled() {
-        return standardFlowEnabledSwitch.isOn();
-    }
-
-    public void setStandardFlowEnabled(boolean standardFlowEnabled) {
-        standardFlowEnabledSwitch.setOn(standardFlowEnabled);
-    }
-
-    public boolean isImplicitFlowEnabled() {
-        return implicitFlowEnabledSwitch.isOn();
-    }
-
-    public void setImplicitFlowEnabled(boolean implicitFlowEnabled) {
-        implicitFlowEnabledSwitch.setOn(implicitFlowEnabled);
-    }
-
-    public boolean isDirectAccessGrantsEnabled() {
-        return directAccessGrantsEnabledSwitch.isOn();
-    }
-
-    public void setDirectAccessGrantsEnabled(boolean directAccessGrantsEnabled) {
-        directAccessGrantsEnabledSwitch.setOn(directAccessGrantsEnabled);
-    }
 
     public String getProtocol() {
         waitUntilElement(protocolSelect.getFirstSelectedOption()).is().present();
@@ -214,14 +77,6 @@ public void setProtocol(String protocol) {
         Timer.time("clientSettings.setProtocol()");
     }
 
-    public boolean isServiceAccountsEnabled() {
-        return serviceAccountsEnabledSwitch.isOn();
-    }
-
-    public void setServiceAccountsEnabled(boolean serviceAccountsEnabled) {
-        serviceAccountsEnabledSwitch.setOn(serviceAccountsEnabled);
-    }
-
     public class SAMLClientSettingsForm extends Form {
 
         public static final String SAML_ASSERTION_SIGNATURE = "saml.assertion.signature";

diff --git a/...rc/main/java/org/keycloak/testsuite/console/page/clients/settings/ClientSettingsForm.java b/...rc/main/java/org/keycloak/testsuite/console/page/clients/settings/ClientSettingsForm.java
@@ -2,26 +2,63 @@
 
 import org.keycloak.representations.idm.ClientRepresentation;
 import org.keycloak.testsuite.console.page.fragment.OnOffSwitch;
+import org.keycloak.testsuite.util.Timer;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 
 import java.util.ArrayList;
 import java.util.List;
 import org.keycloak.testsuite.console.page.clients.CreateClientForm;
+import org.openqa.selenium.support.ui.Select;
 
 import static org.keycloak.testsuite.auth.page.login.Login.OIDC;
+import static org.keycloak.testsuite.console.page.clients.CreateClientForm.OidcAccessType.BEARER_ONLY;
+import static org.keycloak.testsuite.console.page.clients.CreateClientForm.OidcAccessType.CONFIDENTIAL;
+import static org.keycloak.testsuite.console.page.clients.CreateClientForm.OidcAccessType.PUBLIC;
 import static org.keycloak.testsuite.util.WaitUtils.pause;
 
 /**
  * @author tkyjovsk
  */
 public class ClientSettingsForm extends CreateClientForm {
 
+    @FindBy(id = "name")
+    private WebElement nameInput;
+
     @FindBy(id = "baseUrl")
     private WebElement baseUrlInput;
     @FindBy(id = "adminUrl")
     private WebElement adminUrlInput;
 
+    @FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='enabled']]")
+    private OnOffSwitch enabledSwitch;
+
+    @FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='consentRequired']]")
+    private OnOffSwitch consentRequiredSwitch;
+
+    @FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='standardFlowEnabled']]")
+    private OnOffSwitch standardFlowEnabledSwitch;
+
+    @FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='implicitFlowEnabled']]")
+    private OnOffSwitch implicitFlowEnabledSwitch;
+
+    @FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='directAccessGrantsEnabled']]")
+    private OnOffSwitch directAccessGrantsEnabledSwitch;
+
+    @FindBy(id = "accessType")
+    private Select accessTypeSelect;
+    @FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='serviceAccountsEnabled']]")
+    private OnOffSwitch serviceAccountsEnabledSwitch;
+
+    @FindBy(id = "newRedirectUri")
+    private WebElement newRedirectUriInput;
+    @FindBy(xpath = ".//i[contains(@data-ng-click, 'newRedirectUri')]")
+    private WebElement newRedirectUriSubmit;
+    @FindBy(xpath = ".//input[@ng-model='client.redirectUris[i]']")
+    private List<WebElement> redirectUriInputs;
+    @FindBy(xpath = ".//i[contains(@data-ng-click, 'deleteRedirectUri')]")
+    private List<WebElement> deleteRedirectUriIcons;
+
     @FindBy(id = "newWebOrigin")
     private WebElement newWebOriginInput;
     @FindBy(xpath = ".//i[contains(@data-ng-click, 'newWebOrigin')]")
@@ -79,16 +116,122 @@ public void setWebOrigins(List<String> webOrigins) {
     @Override
     public void setValues(ClientRepresentation client) {
         super.setValues(client);
+        setName(client.getName());
+        setEnabled(client.isEnabled());
+        setConsentRequired(client.isConsentRequired());
         setBaseUrl(client.getBaseUrl());
         if (OIDC.equals(client.getProtocol())) {
+            setAccessType(client);
+            if (!client.isBearerOnly()) {
+                setStandardFlowEnabled(client.isStandardFlowEnabled());
+                setDirectAccessGrantsEnabled(client.isDirectAccessGrantsEnabled());
+                if (client.isPublicClient()) {
+                    setImplicitFlowEnabled(client.isImplicitFlowEnabled());
+                } else {//confidential
+                    setServiceAccountsEnabled(client.isServiceAccountsEnabled());
+                }
+                if (client.isStandardFlowEnabled() || client.isImplicitFlowEnabled()) {
+                    setRedirectUris(client.getRedirectUris());
+                }
+            }
             setAdminUrl(client.getAdminUrl());
             setWebOrigins(client.getWebOrigins());
         }
     }
 
-    @Override
-    public void setConsentRequired(boolean value) {
-        consentRequired.setOn(value);
+    public String getName() {
+        return getInputValue(nameInput);
+    }
+
+    public void setName(String name) {
+        setInputValue(nameInput, name);
+    }
+
+    public boolean isEnabled() {
+        return enabledSwitch.isOn();
+    }
+
+    public void setEnabled(boolean enabled) {
+        enabledSwitch.setOn(enabled);
+    }
+
+    public boolean isConsentRequired() {
+        return consentRequiredSwitch.isOn();
+    }
+
+    public void setConsentRequired(boolean consentRequired) {
+        consentRequiredSwitch.setOn(consentRequired);
+    }
+
+    public void setAccessType(ClientRepresentation client) {
+        if (client.isBearerOnly()) {
+            accessTypeSelect.selectByVisibleText(BEARER_ONLY.getName());
+        } else if (client.isPublicClient()) {
+            accessTypeSelect.selectByVisibleText(PUBLIC.getName());
+        } else {
+            accessTypeSelect.selectByVisibleText(CONFIDENTIAL.getName());
+        }
+    }
+
+    public void addRedirectUri(String redirectUri) {
+        newRedirectUriInput.sendKeys(redirectUri);
+        newRedirectUriSubmit.click();
+    }
+
+    public List<String> getRedirectUris() {
+        List<String> values = new ArrayList<>();
+        for (WebElement input : redirectUriInputs) {
+            values.add(getInputValue(input));
+        }
+        return values;
+    }
+
+    public void setRedirectUris(List<String> redirectUris) {
+        Timer.time();
+        while (!deleteRedirectUriIcons.isEmpty()) {
+            deleteRedirectUriIcons.get(0).click();
+            pause(100);
+        }
+        Timer.time("deleteRedirectUris");
+        if (redirectUris != null) {
+            for (String redirectUri : redirectUris) {
+                addRedirectUri(redirectUri);
+                pause(100);
+            }
+        }
+        Timer.time("addRedirectUris");
+    }
+
+    public boolean isStandardFlowEnabled() {
+        return standardFlowEnabledSwitch.isOn();
+    }
+
+    public void setStandardFlowEnabled(boolean standardFlowEnabled) {
+        standardFlowEnabledSwitch.setOn(standardFlowEnabled);
+    }
+
+    public boolean isImplicitFlowEnabled() {
+        return implicitFlowEnabledSwitch.isOn();
+    }
+
+    public void setImplicitFlowEnabled(boolean implicitFlowEnabled) {
+        implicitFlowEnabledSwitch.setOn(implicitFlowEnabled);
+    }
+
+    public boolean isDirectAccessGrantsEnabled() {
+        return directAccessGrantsEnabledSwitch.isOn();
+    }
+
+    public void setDirectAccessGrantsEnabled(boolean directAccessGrantsEnabled) {
+        directAccessGrantsEnabledSwitch.setOn(directAccessGrantsEnabled);
+    }
+
+    public boolean isServiceAccountsEnabled() {
+        return serviceAccountsEnabledSwitch.isOn();
+    }
+
+    public void setServiceAccountsEnabled(boolean serviceAccountsEnabled) {
+        serviceAccountsEnabledSwitch.setOn(serviceAccountsEnabled);
     }
 
 }