From 72e45fffdea16673f257cb80b40269e73ccffaba Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Tue, 9 May 2017 17:53:29 +0200 Subject: MMF-661 rework search (#2030) --- .../java/it/user/BaseIdentityProviderTest.java | 3 +- .../test/java/it/user/LocalAuthenticationTest.java | 9 +- .../src/test/java/it/user/MyAccountPageTest.java | 11 ++- .../java/it/user/OAuth2IdentityProviderTest.java | 3 +- .../src/test/java/pageobjects/LoginPage.java | 5 + .../authenticate_user.html | 29 ------ .../force-authentication.html | 5 - .../LocalAuthenticationTest/login_successful.html | 7 +- ...edirect_to_original_url_after_direct_login.html | 5 - ...irect_to_original_url_after_indirect_login.html | 5 - ...nal_url_with_parameters_after_direct_login.html | 5 - ...d_not_be_unlogged_when_going_to_login_page.html | 4 +- .../MyAccountPageTest/should_change_password.html | 110 --------------------- .../authenticate_user.html | 29 ------ 14 files changed, 24 insertions(+), 206 deletions(-) delete mode 100644 it/it-tests/src/test/resources/user/BaseIdentityProviderTest/authenticate_user.html delete mode 100644 it/it-tests/src/test/resources/user/MyAccountPageTest/should_change_password.html delete mode 100644 it/it-tests/src/test/resources/user/OAuth2IdentityProviderTest/authenticate_user.html (limited to 'it/it-tests') diff --git a/it/it-tests/src/test/java/it/user/BaseIdentityProviderTest.java b/it/it-tests/src/test/java/it/user/BaseIdentityProviderTest.java index b173f0b023c..36dc82ec7a9 100644 --- a/it/it-tests/src/test/java/it/user/BaseIdentityProviderTest.java +++ b/it/it-tests/src/test/java/it/user/BaseIdentityProviderTest.java @@ -32,6 +32,7 @@ import org.junit.Test; import org.sonarqube.ws.client.GetRequest; import org.sonarqube.ws.client.WsClient; import org.sonarqube.ws.client.user.CreateRequest; +import pageobjects.Navigation; import util.user.UserRule; import util.user.Users; @@ -103,7 +104,7 @@ public class BaseIdentityProviderTest { enablePlugin(); setUserCreatedByAuthPlugin(USER_LOGIN, USER_PROVIDER_ID, USER_NAME, USER_EMAIL); - runSelenese(ORCHESTRATOR, "/user/BaseIdentityProviderTest/authenticate_user.html"); + Navigation.get(ORCHESTRATOR).openLogin().useOAuth2().shouldBeLoggedIn(); userRule.verifyUserExists(USER_LOGIN, USER_NAME, USER_EMAIL); } diff --git a/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java b/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java index feb2c6c4550..b0825c67179 100644 --- a/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java +++ b/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java @@ -98,13 +98,8 @@ public class LocalAuthenticationTest { @Test public void log_in_with_correct_credentials_then_log_out() { nav.shouldNotBeLoggedIn(); - - Navigation page = nav.logIn().submitCredentials(LOGIN, "123456"); - page.getRightBar().shouldHave(Condition.text(LOGIN)); - nav.shouldBeLoggedIn(); - - nav.logOut(); - nav.shouldNotBeLoggedIn(); + nav.logIn().submitCredentials(LOGIN, "123456").shouldBeLoggedIn(); + nav.logOut().shouldNotBeLoggedIn(); } @Test diff --git a/it/it-tests/src/test/java/it/user/MyAccountPageTest.java b/it/it-tests/src/test/java/it/user/MyAccountPageTest.java index 5faccd0e466..2539c9f0551 100644 --- a/it/it-tests/src/test/java/it/user/MyAccountPageTest.java +++ b/it/it-tests/src/test/java/it/user/MyAccountPageTest.java @@ -32,6 +32,8 @@ import org.sonarqube.ws.client.PostRequest; import org.sonarqube.ws.client.WsClient; import pageobjects.Navigation; +import static com.codeborne.selenide.Condition.visible; +import static com.codeborne.selenide.Selenide.$; import static util.ItUtils.newAdminWsClient; import static util.ItUtils.projectDir; import static util.selenium.Selenese.runSelenese; @@ -67,7 +69,14 @@ public class MyAccountPageTest { @Test public void should_change_password() throws Exception { - runSelenese(orchestrator, "/user/MyAccountPageTest/should_change_password.html"); + nav.openLogin().submitCredentials("account-user", "password").shouldBeLoggedIn(); + nav.open("/account/security"); + $("#old_password").val("password"); + $("#password").val("new_password"); + $("#password_confirmation").val("new_password"); + $("#change-password").click(); + $(".alert-success").shouldBe(visible); + nav.logOut().logIn().submitCredentials("account-user", "new_password").shouldBeLoggedIn(); } @Test diff --git a/it/it-tests/src/test/java/it/user/OAuth2IdentityProviderTest.java b/it/it-tests/src/test/java/it/user/OAuth2IdentityProviderTest.java index 303e78b4474..fa91d6cfefb 100644 --- a/it/it-tests/src/test/java/it/user/OAuth2IdentityProviderTest.java +++ b/it/it-tests/src/test/java/it/user/OAuth2IdentityProviderTest.java @@ -36,6 +36,7 @@ import org.sonarqube.ws.client.GetRequest; import org.sonarqube.ws.client.WsClient; import org.sonarqube.ws.client.WsResponse; import org.sonarqube.ws.client.user.CreateRequest; +import pageobjects.Navigation; import util.user.UserRule; import util.user.Users; @@ -112,7 +113,7 @@ public class OAuth2IdentityProviderTest { simulateRedirectionToCallback(); enablePlugin(); - runSelenese(ORCHESTRATOR,"/user/OAuth2IdentityProviderTest/authenticate_user.html"); + Navigation.get(ORCHESTRATOR).openLogin().useOAuth2().shouldBeLoggedIn(); userRule.verifyUserExists(USER_LOGIN, USER_NAME, USER_EMAIL); } diff --git a/it/it-tests/src/test/java/pageobjects/LoginPage.java b/it/it-tests/src/test/java/pageobjects/LoginPage.java index 0168350a7c0..f9afa6a289b 100644 --- a/it/it-tests/src/test/java/pageobjects/LoginPage.java +++ b/it/it-tests/src/test/java/pageobjects/LoginPage.java @@ -40,6 +40,11 @@ public class LoginPage { return submitCredentials("admin", "admin"); } + public Navigation useOAuth2() { + $(".oauth-providers a").click(); + return page(Navigation.class); + } + public LoginPage submitWrongCredentials(String login, String password) { $("#login").val(login); $("#password").val(password); diff --git a/it/it-tests/src/test/resources/user/BaseIdentityProviderTest/authenticate_user.html b/it/it-tests/src/test/resources/user/BaseIdentityProviderTest/authenticate_user.html deleted file mode 100644 index adb819dd425..00000000000 --- a/it/it-tests/src/test/resources/user/BaseIdentityProviderTest/authenticate_user.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -
open/sessions/new
waitForTextcontent*Log in with Fake base identity provider*
clickcss=.oauth-providers a
waitForTextid=global-navigation*John*
- - diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html index 1b542e5360c..47468b46c6b 100644 --- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html +++ b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html @@ -48,11 +48,6 @@ css=.js-user-authenticated - - waitForText - css=.navbar - *Administrator* - open /sessions/logout diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/login_successful.html b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/login_successful.html index 68257d74485..3e146e2d49f 100644 --- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/login_successful.html +++ b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/login_successful.html @@ -43,14 +43,9 @@ css=.js-user-authenticated - - waitForText - css=.navbar - *Administrator* - click - Link=Administrator + css=.js-user-authenticated diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_direct_login.html b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_direct_login.html index a54eb0b3fd6..a28731b9516 100644 --- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_direct_login.html +++ b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_direct_login.html @@ -48,11 +48,6 @@ css=.js-user-authenticated - - waitForText - css=.navbar - *Administrator* - assertLocation glob:*/settings?category=general* diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_indirect_login.html b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_indirect_login.html index ca6fdd194fe..3862aa147b9 100644 --- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_indirect_login.html +++ b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_indirect_login.html @@ -47,11 +47,6 @@ css=.js-user-authenticated - - waitForText - css=.navbar - *Administrator* - assertLocation */settings diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_with_parameters_after_direct_login.html b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_with_parameters_after_direct_login.html index c1c94de3ac6..c8f55d12641 100644 --- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_with_parameters_after_direct_login.html +++ b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_with_parameters_after_direct_login.html @@ -57,11 +57,6 @@ css=.js-user-authenticated - - waitForText - css=.navbar - *Administrator* - assertLocation */projects?gate=OK&reliability=1&security=1 diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/should_not_be_unlogged_when_going_to_login_page.html b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/should_not_be_unlogged_when_going_to_login_page.html index 66a0ab89a51..a0f759e19cc 100644 --- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/should_not_be_unlogged_when_going_to_login_page.html +++ b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/should_not_be_unlogged_when_going_to_login_page.html @@ -54,9 +54,9 @@ - waitForText + waitForElementPresent css=.js-user-authenticated - *simple-user* + diff --git a/it/it-tests/src/test/resources/user/MyAccountPageTest/should_change_password.html b/it/it-tests/src/test/resources/user/MyAccountPageTest/should_change_password.html deleted file mode 100644 index 58ad7b8b089..00000000000 --- a/it/it-tests/src/test/resources/user/MyAccountPageTest/should_change_password.html +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - should_change_password - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
should_change_password
open/sonar/sessions/login
typeid=loginaccount-user
typeid=passwordpassword
clickAndWaitcommit
waitForElementPresentcss=.js-user-authenticated
open/sonar/account/security
waitForElementPresentid=change-password
typeid=old_passwordpassword
typeid=passwordnew_password
typeid=password_confirmationnew_password
clickid=change-password
waitForElementPresentcss=.alert-success
open/sonar/sessions/logout
open/sonar/sessions/login
typeid=loginaccount-user
typeid=passwordnew_password
clickAndWaitcommit
waitForTextid=global-navigation*User With Account*
- - diff --git a/it/it-tests/src/test/resources/user/OAuth2IdentityProviderTest/authenticate_user.html b/it/it-tests/src/test/resources/user/OAuth2IdentityProviderTest/authenticate_user.html deleted file mode 100644 index 22b34ba03c9..00000000000 --- a/it/it-tests/src/test/resources/user/OAuth2IdentityProviderTest/authenticate_user.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -
open/sessions/new
waitForTextcontent*Log in with Fake oauth2 identity provider*
clickcss=.oauth-providers a
waitForTextid=global-navigation*John*
- - -- cgit v1.2.3