Try to improve IT checks

diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-duplicate-keys.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-duplicate-keys.html
index d6c7ebb966241893029e366fb9b0c8be5c45a99b..3a80a92df24db8ce9f40696ee35bcfe16617cdde 100644 (file)
--- a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-duplicate-keys.html
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-duplicate-keys.html
@@ -65,12 +65,17 @@
 </tr>
 <tr>
        <td>waitForText</td>
-       <td>content</td>
-       <td>*Bulk update can not be performed*The replacement of &quot;com.sonarsource.it.samples:multi-modules-sample:module_a&quot; by &quot;com.sonarsource.it.samples:multi-modules-sample:module_b&quot; is impossible as it would result in duplicate keys (in red below):*</td>
+       <td>css=#content h1</td>
+       <td>*Bulk update can not be performed*</td>
 </tr>
 <tr>
-       <td>waitForText</td>
-       <td>content</td>
+       <td>assertText</td>
+       <td>css=#content p</td>
+       <td>*The replacement of &quot;com.sonarsource.it.samples:multi-modules-sample:module_a&quot; by &quot;com.sonarsource.it.samples:multi-modules-sample:module_b&quot; is impossible as it would result in duplicate keys (in red below):*</td>
+</tr>
+<tr>
+       <td>assertText</td>
+       <td>css=#content .data</td>
        <td>*Duplicate key*</td>
 </tr>
 <tr>

diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-input.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-input.html
index aec21d4e29d5eea7873cf65ec7b2575a4f5905d7..7f2fcc091ebf47757376895adf24d290b868e3df 100644 (file)
--- a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-input.html
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-input.html
@@ -9,61 +9,61 @@
 <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>
-    <td></td>
-  </tr>
-  <tr>
-    <td>type</td>
-    <td>login</td>
-    <td>admin</td>
-  </tr>
-  <tr>
-    <td>type</td>
-    <td>password</td>
-    <td>admin</td>
-  </tr>
-  <tr>
-    <td>clickAndWait</td>
-    <td>commit</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>open</td>
-    <td>/dashboard/index/com.sonarsource.it.samples:multi-modules-sample</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>click</td>
-    <td>css=#context-navigation .navbar-admin-link</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>waitForElementPresent</td>
-    <td>link=Update Key</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>clickAndWait</td>
-    <td>link=Update Key</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>clickAndWait</td>
-    <td>id=bulk_update_button</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>waitForText</td>
-    <td>content</td>
-    <td>*The two fields can not be blank for the bulk update.*</td>
-  </tr>
-  </tbody>
+       <td>open</td>
+       <td>/sessions/logout</td>
+       <td></td>
+</tr>
+<tr>
+       <td>open</td>
+       <td>/sessions/login</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>login</td>
+       <td>admin</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>password</td>
+       <td>admin</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>commit</td>
+       <td></td>
+</tr>
+<tr>
+       <td>open</td>
+       <td>/dashboard/index/com.sonarsource.it.samples:multi-modules-sample</td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>css=#context-navigation .navbar-admin-link</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForElementPresent</td>
+       <td>link=Update Key</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>link=Update Key</td>
+       <td></td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>id=bulk_update_button</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForText</td>
+       <td>css=#content #error</td>
+       <td>*The two fields can not be blank for the bulk update.*</td>
+</tr>
+</tbody>
 </table>
 </body>
 </html>

diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-match.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-match.html
index b5575100d6b0fdf9f6e2051af11df10204e462ac..2e667543a1500cf36b3ede3ffad1b37404168a4d 100644 (file)
--- a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-match.html
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-match.html
@@ -70,7 +70,12 @@
     </tr>
     <tr>
         <td>waitForText</td>
-        <td>content</td>
+        <td>css=#content h1</td>
+        <td>*Bulk update can not be performed*</td>
+    </tr>
+    <tr>
+        <td>assertText</td>
+        <td>css=#content</td>
         <td>*Bulk update can not be performed*No key contains the string to replace (&quot;foo&quot;).*</td>
     </tr>
     <tr>