From 3e7ecb3992300d43b866f817f47a925ca5792fb9 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 22 Aug 2017 10:06:34 +0200 Subject: [PATCH] Fix compatibility of Selenese tests with Chrome --- .../sonarqube/tests/user/LocalAuthenticationTest.java | 11 +++++------ .../PermissionTemplatesPageTest/should_create.html | 5 ----- .../should_display_page.html | 5 ----- .../should_manage_project_creators.html | 6 +----- .../should-be-able-to-provision-project.html | 6 +----- .../should-not-be-able-to-provision-project.html | 5 ----- ...rch_and_filter_elements_on_project_level_page.html | 5 ----- .../multimodule-project-delete-version.html | 6 +----- .../multimodule-project-modify-version.html | 6 +----- .../project-deletion/project-deletion.html | 6 +----- .../bulk-delete-filter-projects.html | 5 ----- ...ct_permissions_page_shows_only_single_project.html | 6 +----- .../serverSystem/ServerSystemTest/system_info.html | 6 +----- .../resources/updateCenter/installed-plugins.html | 6 +----- .../LocalAuthenticationTest/force-authentication.html | 6 +----- .../admin_should_change_its_own_password.html | 6 +----- .../UsersPageTest/generate_and_revoke_user_token.html | 6 +----- 17 files changed, 16 insertions(+), 86 deletions(-) diff --git a/tests/src/test/java/org/sonarqube/tests/user/LocalAuthenticationTest.java b/tests/src/test/java/org/sonarqube/tests/user/LocalAuthenticationTest.java index 3f53ba7145b..dc3e31c9bb2 100644 --- a/tests/src/test/java/org/sonarqube/tests/user/LocalAuthenticationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/user/LocalAuthenticationTest.java @@ -21,7 +21,6 @@ package org.sonarqube.tests.user; import com.codeborne.selenide.Condition; import com.sonar.orchestrator.Orchestrator; -import org.sonarqube.tests.Category4Suite; import java.util.UUID; import org.junit.After; import org.junit.Before; @@ -29,6 +28,9 @@ import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; +import org.sonarqube.pageobjects.LoginPage; +import org.sonarqube.pageobjects.Navigation; +import org.sonarqube.tests.Category4Suite; import org.sonarqube.tests.Tester; import org.sonarqube.ws.WsUserTokens; import org.sonarqube.ws.client.GetRequest; @@ -42,14 +44,11 @@ import org.sonarqube.ws.client.usertoken.GenerateWsRequest; import org.sonarqube.ws.client.usertoken.RevokeWsRequest; import org.sonarqube.ws.client.usertoken.SearchWsRequest; import org.sonarqube.ws.client.usertoken.UserTokensService; -import org.sonarqube.pageobjects.LoginPage; -import org.sonarqube.pageobjects.Navigation; import static java.lang.String.format; import static org.assertj.core.api.Assertions.assertThat; import static util.ItUtils.resetSettings; import static util.ItUtils.setServerProperty; -import static util.selenium.Selenese.runSelenese; public class LocalAuthenticationTest { @@ -161,7 +160,7 @@ public class LocalAuthenticationTest { @Test public void authentication_through_ui() { - runSelenese(orchestrator, + tester.runHtmlTests( "/user/LocalAuthenticationTest/login_successful.html", "/user/LocalAuthenticationTest/login_wrong_password.html", "/user/LocalAuthenticationTest/should_not_be_unlogged_when_going_to_login_page.html", @@ -174,7 +173,7 @@ public class LocalAuthenticationTest { setServerProperty(orchestrator, "sonar.forceAuthentication", "true"); - runSelenese(orchestrator, + tester.runHtmlTests( // SONAR-3473 "/user/LocalAuthenticationTest/force-authentication.html"); } diff --git a/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_create.html b/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_create.html index 0e67e0f4fab..5265dab2239 100644 --- a/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_create.html +++ b/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_create.html @@ -8,11 +8,6 @@ - - - - - diff --git a/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_display_page.html b/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_display_page.html index 8d9640f25b6..2e05e15a692 100644 --- a/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_display_page.html +++ b/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_display_page.html @@ -9,11 +9,6 @@
open/sessions/logout
open /sessions/new
- - - - - diff --git a/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_manage_project_creators.html b/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_manage_project_creators.html index 3d1c172a783..d6226cb6fa7 100644 --- a/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_manage_project_creators.html +++ b/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_manage_project_creators.html @@ -8,11 +8,7 @@
open/sessions/logout
open /sessions/new
- - - - - + diff --git a/tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-be-able-to-provision-project.html b/tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-be-able-to-provision-project.html index c5db3b4898a..506a921dd4b 100644 --- a/tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-be-able-to-provision-project.html +++ b/tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-be-able-to-provision-project.html @@ -8,11 +8,7 @@
open/sessions/logout
open /sessions/new
- - - - - + diff --git a/tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-not-be-able-to-provision-project.html b/tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-not-be-able-to-provision-project.html index 270daf67cd9..634e71e1926 100644 --- a/tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-not-be-able-to-provision-project.html +++ b/tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-not-be-able-to-provision-project.html @@ -8,11 +8,6 @@
open/sessions/logout
open /sessions/new
- - - - - diff --git a/tests/src/test/resources/projectAdministration/BackgroundTasksTest/should_not_display_failing_and_search_and_filter_elements_on_project_level_page.html b/tests/src/test/resources/projectAdministration/BackgroundTasksTest/should_not_display_failing_and_search_and_filter_elements_on_project_level_page.html index e28cdbba827..340eda50f08 100644 --- a/tests/src/test/resources/projectAdministration/BackgroundTasksTest/should_not_display_failing_and_search_and_filter_elements_on_project_level_page.html +++ b/tests/src/test/resources/projectAdministration/BackgroundTasksTest/should_not_display_failing_and_search_and_filter_elements_on_project_level_page.html @@ -15,11 +15,6 @@ - - - - - diff --git a/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-delete-version.html b/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-delete-version.html index 496917b9e4c..3b19ed1c7f5 100644 --- a/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-delete-version.html +++ b/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-delete-version.html @@ -14,11 +14,7 @@ - - - - - + diff --git a/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-modify-version.html b/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-modify-version.html index f336f7e93b9..07721e0ac8e 100644 --- a/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-modify-version.html +++ b/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-modify-version.html @@ -13,11 +13,7 @@ - - - - - + diff --git a/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html b/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html index 9345f6e3f75..6848f31c3cd 100644 --- a/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html +++ b/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html @@ -13,11 +13,7 @@ - - - - - + diff --git a/tests/src/test/resources/projectAdministration/ProjectBulkDeletionPageTest/bulk-delete-filter-projects.html b/tests/src/test/resources/projectAdministration/ProjectBulkDeletionPageTest/bulk-delete-filter-projects.html index b6256e49b35..1b1ee440479 100644 --- a/tests/src/test/resources/projectAdministration/ProjectBulkDeletionPageTest/bulk-delete-filter-projects.html +++ b/tests/src/test/resources/projectAdministration/ProjectBulkDeletionPageTest/bulk-delete-filter-projects.html @@ -8,11 +8,6 @@
open/sessions/logout
open /sessions/new
open/sessions/logout
open /sessions/login
open/sessions/logout
open /sessions/login
open/sessions/logout
open /sessions/login
open/sessions/logout
open /sessions/login
- - - - - diff --git a/tests/src/test/resources/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html b/tests/src/test/resources/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html index cbb6595ff20..f0ba9552e9b 100644 --- a/tests/src/test/resources/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html +++ b/tests/src/test/resources/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html @@ -14,11 +14,7 @@ - - - - - + diff --git a/tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html b/tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html index e304586c59c..feee8889ce5 100644 --- a/tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html +++ b/tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html @@ -13,11 +13,7 @@ - - - - - + diff --git a/tests/src/test/resources/updateCenter/installed-plugins.html b/tests/src/test/resources/updateCenter/installed-plugins.html index d1986f6f897..8b3576a0b78 100644 --- a/tests/src/test/resources/updateCenter/installed-plugins.html +++ b/tests/src/test/resources/updateCenter/installed-plugins.html @@ -8,11 +8,7 @@
open/sessions/logout
open /sessions/login
open/sessions/logout
open /sessions/login
open/sessions/logout
open /sessions/new
- - - - - + diff --git a/tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html b/tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html index 4c5a751665d..44778593de0 100644 --- a/tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html +++ b/tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html @@ -13,11 +13,7 @@ - - - - - + diff --git a/tests/src/test/resources/user/UsersPageTest/admin_should_change_its_own_password.html b/tests/src/test/resources/user/UsersPageTest/admin_should_change_its_own_password.html index 06e806cf259..bc17a7e90c9 100644 --- a/tests/src/test/resources/user/UsersPageTest/admin_should_change_its_own_password.html +++ b/tests/src/test/resources/user/UsersPageTest/admin_should_change_its_own_password.html @@ -14,11 +14,7 @@ - - - - - + diff --git a/tests/src/test/resources/user/UsersPageTest/generate_and_revoke_user_token.html b/tests/src/test/resources/user/UsersPageTest/generate_and_revoke_user_token.html index c81949c4d10..1c816cbd3d7 100644 --- a/tests/src/test/resources/user/UsersPageTest/generate_and_revoke_user_token.html +++ b/tests/src/test/resources/user/UsersPageTest/generate_and_revoke_user_token.html @@ -14,11 +14,7 @@ - - - - - + -- 2.39.5
open/sessions/logout
open /sessions/login
open/sessions/logout
open /
open/sessions/logout
open /sessions/login
open/sessions/logout
open /sessions/new