]> source.dussan.org Git - sonarqube.git/commitdiff
projects / sonarqube.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: de5d7a0)
Fix compatibility of Selenese tests with Chrome
authorSimon Brandhof <simon.brandhof@sonarsource.com>
Tue, 22 Aug 2017 08:06:34 +0000 (10:06 +0200)
committerSimon Brandhof <simon.brandhof@sonarsource.com>
Tue, 22 Aug 2017 10:20:15 +0000 (12:20 +0200)
17 files changed:
tests/src/test/java/org/sonarqube/tests/user/LocalAuthenticationTest.java patch | blob | history
tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_create.html patch | blob | history
tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_display_page.html patch | blob | history
tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_manage_project_creators.html patch | blob | history
tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-be-able-to-provision-project.html patch | blob | history
tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-not-be-able-to-provision-project.html patch | blob | history
tests/src/test/resources/projectAdministration/BackgroundTasksTest/should_not_display_failing_and_search_and_filter_elements_on_project_level_page.html patch | blob | history
tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-delete-version.html patch | blob | history
tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-modify-version.html patch | blob | history
tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html patch | blob | history
tests/src/test/resources/projectAdministration/ProjectBulkDeletionPageTest/bulk-delete-filter-projects.html patch | blob | history
tests/src/test/resources/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html patch | blob | history
tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html patch | blob | history
tests/src/test/resources/updateCenter/installed-plugins.html patch | blob | history
tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html patch | blob | history
tests/src/test/resources/user/UsersPageTest/admin_should_change_its_own_password.html patch | blob | history
tests/src/test/resources/user/UsersPageTest/generate_and_revoke_user_token.html patch | blob | history

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 3f53ba7145b0bfc13e7ff3d803d068932eba64f4..dc3e31c9bb2004f21c23b512e7591e8f647d3c6c 100644 (file)
--- 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 0e67e0f4fab2ffa6e972105ce514e6af17f0f972..5265dab2239f10e74a9c2bed29bf760602838411 100644 (file)
--- a/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_create.html
+++ b/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_create.html
@@ -8,11 +8,6 @@
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
   <tbody>
-  <tr>
-    <td>open</td>
-    <td>/sessions/logout</td>
-    <td></td>
-  </tr>
   <tr>
     <td>open</td>
     <td>/sessions/new</td>
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 8d9640f25b60982cbe9eb3a0565eb281c8559e42..2e05e15a692e1fc2d7244e9f7a6c74cb4dd7d420 100644 (file)
--- 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 @@
 <table cellpadding="1" cellspacing="1" border="1">
   <tbody>
   <tr>
-       <td>open</td>
-       <td>/sessions/logout</td>
-       <td></td>
-</tr>
-<tr>
        <td>open</td>
        <td>/sessions/new</td>
        <td></td>
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 3d1c172a783112ff24de35050424732fa6c19eb8..d6226cb6fa713f7e79c2eac1758ae0e38c1e7b60 100644 (file)
--- 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 @@
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
   <tbody>
-  <tr>
-    <td>open</td>
-    <td>/sessions/logout</td>
-    <td></td>
-  </tr>
+
   <tr>
     <td>open</td>
     <td>/sessions/new</td>
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 c5db3b4898a905ca16dae2d57858c5c183125131..506a921dd4b4189230811dd72d7caec781d11a87 100644 (file)
--- 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 @@
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
   <tbody>
-  <tr>
-    <td>open</td>
-    <td>/sessions/logout</td>
-    <td></td>
-  </tr>
+
   <tr>
     <td>open</td>
     <td>/sessions/new</td>
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 270daf67cd956cd5556df39839b9846f669d5da7..634e71e1926630d49382bb4794c4d475b096e75b 100644 (file)
--- 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 @@
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
   <tbody>
-  <tr>
-    <td>open</td>
-    <td>/sessions/logout</td>
-    <td></td>
-  </tr>
   <tr>
     <td>open</td>
     <td>/sessions/new</td>
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 9345f6e3f75a4c970e040084d8bafe72ddd03acc..6848f31c3cdbefaf426087381a2c9e44e64d1eb7 100644 (file)
--- 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 @@
     </tr>
     </thead>
     <tbody>
-    <tr>
-       <td>open</td>
-       <td>/sessions/logout</td>
-       <td></td>
-</tr>
+
 <tr>
        <td>open</td>
        <td>/sessions/login</td>
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 b6256e49b35bfbc369a4235c9f2477d3f62393ae..1b1ee440479dcd44df5300514ac09d6ef019209b 100644 (file)
--- 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 @@
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
     <tbody>
-    <tr>
-       <td>open</td>
-       <td>/sessions/logout</td>
-       <td></td>
-</tr>
 <tr>
        <td>open</td>
        <td>/sessions/login</td>
diff --git a/tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html b/tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html
index e304586c59c20f2d313dfe7b1b288342105c8554..feee8889ce58729ddb138f9bc6a8a2e5d73cabe6 100644 (file)
--- a/tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html
+++ b/tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html
@@ -13,11 +13,7 @@
   </tr>
   </thead>
   <tbody>
-  <tr>
-    <td>open</td>
-    <td>/sessions/logout</td>
-    <td></td>
-  </tr>
+
   <tr>
     <td>open</td>
     <td>/sessions/new</td>
diff --git a/tests/src/test/resources/updateCenter/installed-plugins.html b/tests/src/test/resources/updateCenter/installed-plugins.html
index d1986f6f89737888dd53218d6ee0cf3f03021904..8b3576a0b78cf62c7e3d74f30e4a699b06539fc1 100644 (file)
--- a/tests/src/test/resources/updateCenter/installed-plugins.html
+++ b/tests/src/test/resources/updateCenter/installed-plugins.html
@@ -8,11 +8,7 @@
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
   <tbody>
-  <tr>
-    <td>open</td>
-    <td>/sessions/logout</td>
-    <td></td>
-  </tr>
+
   <tr>
     <td>open</td>
     <td>/sessions/login</td>
diff --git a/tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html b/tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html
index 4c5a751665dbfedf92c81ef419c0f8dfa152d0d7..44778593de0cc3559c70c3a429b1457a89ac860a 100644 (file)
--- a/tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html
+++ b/tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html
@@ -13,11 +13,7 @@
   </tr>
   </thead>
   <tbody>
-  <tr>
-    <td>open</td>
-    <td>/sessions/logout</td>
-    <td></td>
-  </tr>
+
   <tr>
     <td>open</td>
     <td>/</td>
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 06e806cf2597dd9026ec052585444d4231cc2cb2..bc17a7e90c98a48cb2a8cc693cd927347465342d 100644 (file)
--- 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 @@
 </tr>
 </thead>
 <tbody>
-<tr>
-       <td>open</td>
-       <td>/sessions/logout</td>
-       <td></td>
-</tr>
+
 <tr>
        <td>open</td>
        <td>/sessions/login</td>
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 c81949c4d10634b4bc89c1b16395ab00674c6866..1c816cbd3d7abe1b9a316e46391ff0b11219e07b 100644 (file)
--- 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 @@
   </tr>
   </thead>
   <tbody>
-  <tr>
-       <td>open</td>
-       <td>/sessions/logout</td>
-       <td></td>
-</tr>
+
 <tr>
        <td>open</td>
        <td>/sessions/new</td>
Continuous Inspection: https://github.com/SonarSource/sonarqube