diff options
3 files changed, 70 insertions, 60 deletions
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 d6c7ebb9662..3a80a92df24 100644 --- 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 "com.sonarsource.it.samples:multi-modules-sample:module_a" by "com.sonarsource.it.samples:multi-modules-sample:module_b" 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 "com.sonarsource.it.samples:multi-modules-sample:module_a" by "com.sonarsource.it.samples:multi-modules-sample:module_b" 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 aec21d4e29d..7f2fcc091eb 100644 --- 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 b5575100d6b..2e667543a15 100644 --- 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 ("foo").*</td> </tr> <tr> |