Skip to content

Commit

Permalink
KEYCLOAK-2676 - Review clients tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@vramik
vramik committed Mar 22, 2016
1 parent 705a598 commit 1cfe58b
Show file tree
Hide file tree
Showing 18 changed files with 271 additions and 360 deletions.
3 changes: 1 addition & 2 deletions ...lian/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/DataTable.java
View file
Expand Up @@ -17,7 +17,6 @@

package org.keycloak.testsuite.console.page.fragment;

import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;

Expand Down Expand Up @@ -90,7 +89,7 @@ public void clickRowByLinkText(String text) {
}

public void clickRowActionButton(WebElement row, String buttonText) {
row.findElement(xpath(".//button[text()='" + buttonText + "']")).click();
row.findElement(xpath(".//td[contains(@class, 'kc-action-cell') and text()='" + buttonText + "']")).click();
}

}
12 changes: 11 additions & 1 deletion ...an/tests/base/src/main/java/org/keycloak/testsuite/console/page/fragment/ModalDialog.java
View file
Expand Up @@ -18,6 +18,9 @@
package org.keycloak.testsuite.console.page.fragment;

import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement;

import org.jboss.arquillian.graphene.fragment.Root;
import static org.keycloak.testsuite.util.WaitUtils.pause;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;

Expand All @@ -27,6 +30,9 @@
*/
public class ModalDialog {

@Root
private WebElement root;

@FindBy(xpath = ".//button[text()='Cancel']")
private WebElement cancelButton;
@FindBy(xpath = ".//button[text()='Delete']")
Expand All @@ -40,21 +46,25 @@ public class ModalDialog {
public void ok() {
waitUntilElement(okButton).is().present();
okButton.click();
waitUntilElement(root).is().not().present();
}

public void confirmDeletion() {
waitUntilElement(deleteButton).is().present();
deleteButton.click();
waitUntilElement(root).is().not().present();
pause(100);
}

public void cancel() {
waitUntilElement(cancelButton).is().present();
cancelButton.click();
waitUntilElement(root).is().not().present();
}

public void setName(String name) {
waitUntilElement(nameInput).is().present();
nameInput.clear();
nameInput.sendKeys(name);
}
}
}
114 changes: 1 addition & 113 deletions ...r/console/src/main/java/org/keycloak/testsuite/console/page/clients/CreateClientForm.java
View file
@@ -1,13 +1,6 @@
package org.keycloak.testsuite.console.page.clients;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.jboss.arquillian.graphene.page.Page;
import org.keycloak.representations.idm.ClientRepresentation;
import static org.keycloak.testsuite.auth.page.login.OIDCLogin.OIDC;
import static org.keycloak.testsuite.console.page.clients.CreateClientForm.OidcAccessType.*;
import org.keycloak.testsuite.console.page.fragment.OnOffSwitch;
import org.keycloak.testsuite.page.Form;
import static org.keycloak.testsuite.page.Form.getInputValue;
import static org.keycloak.testsuite.util.WaitUtils.*;
Expand All @@ -28,13 +21,6 @@ public class CreateClientForm extends Form {
@FindBy(id = "protocol")
private Select protocolSelect;

@Page
private SAMLClientSettingsForm samlForm;

public SAMLClientSettingsForm samlForm() {
return samlForm;
}

public void setValues(ClientRepresentation client) {
waitUntilElement(clientIdInput).is().present();

Expand All @@ -50,22 +36,6 @@ public void setClientId(String clientId) {
setInputValue(clientIdInput, clientId);
}

public enum OidcAccessType {
BEARER_ONLY("bearer-only"),
PUBLIC("public"),
CONFIDENTIAL("confidential");

private final String name;

private OidcAccessType(String name) {
this.name = name;
}

public String getName() {
return name;
}
}

public String getProtocol() {
waitUntilElement(protocolSelect.getFirstSelectedOption()).is().present();
return protocolSelect.getFirstSelectedOption().getText();
Expand All @@ -76,86 +46,4 @@ public void setProtocol(String protocol) {
protocolSelect.selectByVisibleText(protocol);
Timer.DEFAULT.reset("clientSettings.setProtocol()");
}

public class SAMLClientSettingsForm extends Form {

public static final String SAML_ASSERTION_SIGNATURE = "saml.assertion.signature";
public static final String SAML_AUTHNSTATEMENT = "saml.authnstatement";
public static final String SAML_CLIENT_SIGNATURE = "saml.client.signature";
public static final String SAML_ENCRYPT = "saml.encrypt";
public static final String SAML_FORCE_POST_BINDING = "saml.force.post.binding";
public static final String SAML_MULTIVALUED_ROLES = "saml.multivalued.roles";
public static final String SAML_SERVER_SIGNATURE = "saml.server.signature";
public static final String SAML_SIGNATURE_ALGORITHM = "saml.signature.algorithm";
public static final String SAML_ASSERTION_CONSUMER_URL_POST = "saml_assertion_consumer_url_post";
public static final String SAML_ASSERTION_CONSUMER_URL_REDIRECT = "saml_assertion_consumer_url_redirect";
public static final String SAML_FORCE_NAME_ID_FORMAT = "saml_force_name_id_format";
public static final String SAML_NAME_ID_FORMAT = "saml_name_id_format";
public static final String SAML_SIGNATURE_CANONICALIZATION_METHOD = "saml_signature_canonicalization_method";
public static final String SAML_SINGLE_LOGOUT_SERVICE_URL_POST = "saml_single_logout_service_url_post";
public static final String SAML_SINGLE_LOGOUT_SERVICE_URL_REDIRECT = "saml_single_logout_service_url_redirect";

@FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='samlAuthnStatement']]")
private OnOffSwitch samlAuthnStatement;
@FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='samlServerSignature']]")
private OnOffSwitch samlServerSignature;
@FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='samlAssertionSignature']]")
private OnOffSwitch samlAssertionSignature;
@FindBy(id = "signatureAlgorithm")
private Select signatureAlgorithm;
@FindBy(id = "canonicalization")
private Select canonicalization;
@FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='samlEncrypt']]")
private OnOffSwitch samlEncrypt;
@FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='samlClientSignature']]")
private OnOffSwitch samlClientSignature;
@FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='samlForcePostBinding']]")
private OnOffSwitch samlForcePostBinding;
@FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='frontchannelLogout']]")
private OnOffSwitch frontchannelLogout;
@FindBy(xpath = ".//div[@class='onoffswitch' and ./input[@id='samlForceNameIdFormat']]")
private OnOffSwitch samlForceNameIdFormat;
@FindBy(id = "samlNameIdFormat")
private Select samlNameIdFormat;

@FindBy(xpath = "//fieldset[contains(@data-ng-show, 'saml')]//i")
private WebElement fineGrainCollapsor;

@FindBy(id = "consumerServicePost")
private WebElement consumerServicePostInput;
@FindBy(id = "consumerServiceRedirect")
private WebElement consumerServiceRedirectInput;
@FindBy(id = "logoutPostBinding")
private WebElement logoutPostBindingInput;
@FindBy(id = "logoutRedirectBinding")
private WebElement logoutRedirectBindingInput;

public void setValues(ClientRepresentation client) {
waitUntilElement(fineGrainCollapsor).is().visible();

Map<String, String> attributes = client.getAttributes();
samlAuthnStatement.setOn("true".equals(attributes.get(SAML_AUTHNSTATEMENT)));
samlServerSignature.setOn("true".equals(attributes.get(SAML_SERVER_SIGNATURE)));
samlAssertionSignature.setOn("true".equals(attributes.get(SAML_ASSERTION_SIGNATURE)));
if (samlServerSignature.isOn() || samlAssertionSignature.isOn()) {
signatureAlgorithm.selectByVisibleText(attributes.get(SAML_SIGNATURE_ALGORITHM));
canonicalization.selectByValue("string:" + attributes.get(SAML_SIGNATURE_CANONICALIZATION_METHOD));
}
samlEncrypt.setOn("true".equals(attributes.get(SAML_ENCRYPT)));
samlClientSignature.setOn("true".equals(attributes.get(SAML_CLIENT_SIGNATURE)));
samlForcePostBinding.setOn("true".equals(attributes.get(SAML_FORCE_POST_BINDING)));
frontchannelLogout.setOn(client.isFrontchannelLogout());
samlForceNameIdFormat.setOn("true".equals(attributes.get(SAML_FORCE_NAME_ID_FORMAT)));
samlNameIdFormat.selectByVisibleText(attributes.get(SAML_NAME_ID_FORMAT));

fineGrainCollapsor.click();
waitUntilElement(consumerServicePostInput).is().present();

setInputValue(consumerServicePostInput, attributes.get(SAML_ASSERTION_CONSUMER_URL_POST));
setInputValue(consumerServiceRedirectInput, attributes.get(SAML_ASSERTION_CONSUMER_URL_REDIRECT));
setInputValue(logoutPostBindingInput, attributes.get(SAML_SINGLE_LOGOUT_SERVICE_URL_POST));
setInputValue(logoutRedirectBindingInput, attributes.get(SAML_SINGLE_LOGOUT_SERVICE_URL_REDIRECT));
}
}

}
}
2 changes: 2 additions & 0 deletions .../testsuite/console/page/clients/credentials/ClientCredentialsGeneratePrivateKeysForm.java
View file
Expand Up @@ -22,6 +22,7 @@
package org.keycloak.testsuite.console.page.clients.credentials;

import org.keycloak.testsuite.page.Form;
import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;
import org.openqa.selenium.support.ui.Select;
Expand Down Expand Up @@ -68,6 +69,7 @@ public void setStorePassword(String value) {
}

public void clickGenerateAndDownload() {
waitUntilElement(generateAndDownloadButton).is().present();
generateAndDownloadButton.click();
}
}
3 changes: 3 additions & 0 deletions ...ain/java/org/keycloak/testsuite/console/page/clients/mappers/CreateClientMappersForm.java
View file
Expand Up @@ -2,6 +2,7 @@

import org.keycloak.testsuite.console.page.fragment.OnOffSwitch;
import org.keycloak.testsuite.page.Form;
import static org.keycloak.testsuite.util.WaitUtils.pause;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;
import org.openqa.selenium.support.ui.Select;
Expand Down Expand Up @@ -109,6 +110,7 @@ public void selectRealmRole(String roleName) {
realmAvailable.selectByVisibleText(roleName);
}
selectRealmRoleButton.click();
pause(500); // wait for the modal dialog to fade out
}

public void selectClientRole(String clientName, String roleName) {
Expand All @@ -117,6 +119,7 @@ public void selectClientRole(String clientName, String roleName) {
clientAvailable.selectByVisibleText(roleName);
}
selectClientRoleButton.click();
pause(500); // wait for the modal dialog to fade out
}
}

Expand Down

0 comments on commit 1cfe58b

Please sign in to comment.