Made account management an optional feature on a realm, and added login and logout to account management pages

2013-10-19 16:24:58 +01:00
1 parent 8de6224501
commit d79d299073
@@ -21,11 +21,7 @@
 */
 package org.keycloak.testsuite.forms;

-import org.junit.After;
-import org.junit.Assert;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.*;
 import org.keycloak.representations.idm.CredentialRepresentation;
 import org.keycloak.services.managers.RealmManager;
 import org.keycloak.models.RealmModel;
@@ -97,13 +93,12 @@ public class AccountTest {

    @Test
    public void changePassword() {
-        loginPage.open();
+        changePasswordPage.open();
        loginPage.login("test-user@localhost", "password");

-        changePasswordPage.open();
        changePasswordPage.changePassword("password", "new-password", "new-password");

-        oauth.openLogout();
+        changePasswordPage.logout();

        loginPage.open();
        loginPage.login("test-user@localhost", "password");
@@ -118,10 +113,8 @@ public class AccountTest {

    @Test
    public void changeProfile() {
-        loginPage.open();
-        loginPage.login("test-user@localhost", "password");
-
        profilePage.open();
+        loginPage.login("test-user@localhost", "password");

        Assert.assertEquals("", profilePage.getFirstName());
        Assert.assertEquals("", profilePage.getLastName());
@@ -136,10 +129,8 @@ public class AccountTest {

    @Test
    public void setupTotp() {
-        loginPage.open();
-        loginPage.login("test-user@localhost", "password");
-
        totpPage.open();
+        loginPage.login("test-user@localhost", "password");

        Assert.assertTrue(totpPage.isCurrent());

@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.keycloak.testsuite.pages;
+
+import org.junit.Assert;
+import org.keycloak.testsuite.rule.WebResource;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+
+/**
+ * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
+ */
+public abstract class AbstractAccountPage extends  AbstractPage {
+
+    @FindBy(linkText = "Logout")
+    private WebElement logoutLink;
+
+    public void logout() {
+        logoutLink.click();
+    }
+
+}
@@ -28,7 +28,7 @@ import org.openqa.selenium.WebDriver;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public abstract class Page {
+public abstract class AbstractPage {

    @WebResource
    protected WebDriver driver;
@@ -28,7 +28,7 @@ import org.openqa.selenium.support.FindBy;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class AccountPasswordPage extends Page {
+public class AccountPasswordPage extends AbstractAccountPage {

    private static String PATH = Constants.AUTH_SERVER_ROOT + "/rest/realms/test/account/password";

@@ -28,7 +28,7 @@ import org.openqa.selenium.support.FindBy;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class AccountTotpPage extends Page {
+public class AccountTotpPage extends AbstractAccountPage {

    private static String PATH = Constants.AUTH_SERVER_ROOT + "/rest/realms/test/account/totp";

@@ -28,7 +28,7 @@ import org.openqa.selenium.support.FindBy;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class AccountUpdateProfilePage extends Page {
+public class AccountUpdateProfilePage extends AbstractAccountPage {

    private static String PATH = Constants.AUTH_SERVER_ROOT + "/rest/realms/test/account";

@@ -25,7 +25,7 @@ package org.keycloak.testsuite.pages;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class AppPage extends Page {
+public class AppPage extends AbstractPage {

    private String baseUrl = "http://localhost:8081/app";

@@ -23,14 +23,13 @@ package org.keycloak.testsuite.pages;

 import org.keycloak.testsuite.OAuthClient;
 import org.keycloak.testsuite.rule.WebResource;
-import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;

 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class ErrorPage extends Page {
+public class ErrorPage extends AbstractPage {

    @WebResource
    protected OAuthClient oauth;
@@ -27,7 +27,7 @@ import org.openqa.selenium.support.FindBy;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class LoginConfigTotpPage extends Page {
+public class LoginConfigTotpPage extends AbstractPage {

    @FindBy(id = "totpSecret")
    private WebElement totpSecret;
@@ -30,7 +30,7 @@ import org.openqa.selenium.support.FindBy;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class LoginPage extends Page {
+public class LoginPage extends AbstractPage {

    @WebResource
    protected OAuthClient oauth;
@@ -27,7 +27,7 @@ import org.openqa.selenium.support.FindBy;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class LoginPasswordResetPage extends Page {
+public class LoginPasswordResetPage extends AbstractPage {

    @FindBy(id = "username")
    private WebElement usernameInput;
@@ -27,7 +27,7 @@ import org.openqa.selenium.support.FindBy;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class LoginPasswordUpdatePage extends Page {
+public class LoginPasswordUpdatePage extends AbstractPage {

    @FindBy(id = "password-new")
    private WebElement newPasswordInput;
@@ -28,7 +28,7 @@ import org.openqa.selenium.support.FindBy;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class LoginTotpPage extends Page {
+public class LoginTotpPage extends AbstractPage {

    @FindBy(id = "totp")
    private WebElement totpInput;
@@ -27,7 +27,7 @@ import org.openqa.selenium.support.FindBy;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class LoginUpdateProfilePage extends Page {
+public class LoginUpdateProfilePage extends AbstractPage {

    @FindBy(id = "firstName")
    private WebElement firstNameInput;
@@ -27,7 +27,7 @@ import org.openqa.selenium.support.FindBy;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class OAuthGrantPage extends Page {
+public class OAuthGrantPage extends AbstractPage {

    @FindBy(css = "input[name=\"accept\"]")
    private WebElement acceptButton;
@@ -27,7 +27,7 @@ import org.openqa.selenium.support.FindBy;
 /**
 * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
 */
-public class RegisterPage extends Page {
+public class RegisterPage extends AbstractPage {

    @FindBy(id = "firstName")
    private WebElement firstNameInput;
@@ -29,7 +29,7 @@ import org.openqa.selenium.support.FindBy;
 /**
 * @author <a href="mailto:vrockai@redhat.com">Viliam Rockai</a>
 */
-public class VerifyEmailPage extends Page {
+public class VerifyEmailPage extends AbstractPage {

    @WebResource
    protected OAuthClient oauth;
@@ -25,7 +25,7 @@ import java.lang.reflect.Field;

 import org.junit.rules.ExternalResource;
 import org.keycloak.testsuite.OAuthClient;
-import org.keycloak.testsuite.pages.Page;
+import org.keycloak.testsuite.pages.AbstractPage;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.firefox.FirefoxDriver;
@@ -78,7 +78,7 @@ public class WebRule extends ExternalResource {
                    Class<?> type = f.getType();
                    if (type.equals(WebDriver.class)) {
                        set(f, o, driver);
-                    } else if (Page.class.isAssignableFrom(type)) {
+                    } else if (AbstractPage.class.isAssignableFrom(type)) {
                        set(f, o, getPage(f.getType()));
                    } else if (type.equals(OAuthClient.class)) {
                        set(f, o, oauth);
@@ -8,6 +8,7 @@
    "sslNotRequired": true,
    "cookieLoginAllowed": true,
    "registrationAllowed": true,
+    "accountManagement": true,
    "resetPasswordAllowed": true,
    "privateKey": "MIICXAIBAAKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQABAoGAfmO8gVhyBxdqlxmIuglbz8bcjQbhXJLR2EoS8ngTXmN1bo2L90M0mUKSdc7qF10LgETBzqL8jYlQIbt+e6TH8fcEpKCjUlyq0Mf/vVbfZSNaVycY13nTzo27iPyWQHK5NLuJzn1xvxxrUeXI6A2WFpGEBLbHjwpx5WQG9A+2scECQQDvdn9NE75HPTVPxBqsEd2z10TKkl9CZxu10Qby3iQQmWLEJ9LNmy3acvKrE3gMiYNWb6xHPKiIqOR1as7L24aTAkEAtyvQOlCvr5kAjVqrEKXalj0Tzewjweuxc0pskvArTI2Oo070h65GpoIKLc9jf+UA69cRtquwP93aZKtW06U8dQJAF2Y44ks/mK5+eyDqik3koCI08qaC8HYq2wVl7G2QkJ6sbAaILtcvD92ToOvyGyeE0flvmDZxMYlvaZnaQ0lcSQJBAKZU6umJi3/xeEbkJqMfeLclD27XGEFoPeNrmdx0q10Azp4NfJAY+Z8KRyQCR2BEG+oNitBOZ+YXF9KCpH3cdmECQHEigJhYg+ykOvr1aiZUMFT72HU0jnmQe2FVekuG+LJUt2Tm7GtMjTFoGpf0JwrVuZN39fOYAlo+nTixgeW7X8Y=",
    "publicKey": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrVrCuTtArbgaZzL1hvh0xtL5mc7o0NqPVnYXkLvgcwiC3BjLGw1tGEGoJaXDuSaRllobm53JBhjx33UNv+5z/UMG4kytBWxheNVKnL6GgqlNabMaFfPLPCF8kAgKnsi79NMo+n6KnSY8YeUmec/p2vjO2NjsSAVcWEQMVhJ31LwIDAQAB",