diff options
author | simonbrandhof <simon.brandhof@gmail.com> | 2010-09-14 11:57:30 +0000 |
---|---|---|
committer | simonbrandhof <simon.brandhof@gmail.com> | 2010-09-14 11:57:30 +0000 |
commit | 2f54216f77f9580f56891d662e56a5d151ce1a2a (patch) | |
tree | c3f817fd1120309f8bd8bd059dcf67b62d5976d1 | |
parent | 91b4e663c59c2fd03b64ce3746617e44aeab2bdd (diff) | |
download | sonarqube-2f54216f77f9580f56891d662e56a5d151ce1a2a.tar.gz sonarqube-2f54216f77f9580f56891d662e56a5d151ce1a2a.zip |
fix some integration tests
-rw-r--r-- | tests/integration/tests/src/it/selenium/all-tests.html | 11 | ||||
-rw-r--r-- | tests/integration/tests/src/it/selenium/profiles/link-profile-to-project.html (renamed from tests/integration/tests/src/it/selenium/profiles/profile_to_project_link_unlink.html) | 33 | ||||
-rw-r--r-- | tests/integration/tests/src/it/selenium/profiles/user-profiles-are-editable.html (renamed from tests/integration/tests/src/it/selenium/rules/rule_custom_rules_profile_can_be_modified.html) | 8 | ||||
-rw-r--r-- | tests/integration/tests/src/it/selenium/rules/SONAR-1000_quality_profile_with_space_or_dot.html | 70 |
4 files changed, 50 insertions, 72 deletions
diff --git a/tests/integration/tests/src/it/selenium/all-tests.html b/tests/integration/tests/src/it/selenium/all-tests.html index 97f7c18f83c..4bd3815867f 100644 --- a/tests/integration/tests/src/it/selenium/all-tests.html +++ b/tests/integration/tests/src/it/selenium/all-tests.html @@ -127,13 +127,6 @@ <td><a href="events/no_events_widget_on_module_and_package.html">events/no_events_widget_on_module_and_package</a> </td> </tr> -<!--><tr> - <td><a href="events/should_not_create_events_if_anonymous.html">events should_not_create_events_if_anonymous</a> - </td> -</tr> -<tr> - <td><a href="events/should_validate_event_on_creation.html">events should_validate_event_on_creation</a></td> -</tr>--> <tr> <td><a href="event_categories/should_create_category.html">event_categories should_create_category</a></td> </tr> @@ -413,7 +406,7 @@ </td> </tr> <tr> - <td><a href="profiles/profile_to_project_link_unlink.html">profiles/profile_to_project_link_unlink</a></td> + <td><a href="profiles/link-profile-to-project.html">profiles/profile_to_project_link_unlink</a></td> </tr> <tr> <td><a href="profiles/should_import_checkstyle_findbugs_pmd.html">profiles/should_import_checkstyle_findbugs_pmd</a> @@ -432,7 +425,7 @@ </tr> <tr> - <td><a href="rules/rule_custom_rules_profile_can_be_modified.html">rules/rule_custom_rules_profile_can_be_modified</a> + <td><a href="profiles/user-profiles-are-editable.html">profiles/user-profiles-are-editable</a> </td> </tr> <tr> diff --git a/tests/integration/tests/src/it/selenium/profiles/profile_to_project_link_unlink.html b/tests/integration/tests/src/it/selenium/profiles/link-profile-to-project.html index eecb5765ec8..cd92cfb1f48 100644 --- a/tests/integration/tests/src/it/selenium/profiles/profile_to_project_link_unlink.html +++ b/tests/integration/tests/src/it/selenium/profiles/link-profile-to-project.html @@ -3,13 +3,13 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="" /> -<title>profile_to_project_link_unlink</title> +<link rel="selenium.base" href="http://localhost:9000/" /> +<title>link-profile-to-project</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">profile_to_project_link_unlink</td></tr> +<tr><td rowspan="1" colspan="3">link-profile-to-project</td></tr> </thead><tbody> <tr> <td>open</td> @@ -43,7 +43,12 @@ </tr> <tr> <td>clickAndWait</td> - <td>projects_java_Sonar%20way</td> + <td>rules-java-Sonar%20way</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Projects</td> <td></td> </tr> <tr> @@ -72,14 +77,9 @@ <td></td> </tr> <tr> - <td>assertText</td> - <td>projects_java_Sonar%20way</td> - <td>1 project</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>projects_java_Sonar%20way</td> - <td></td> + <td>assertSelectOptions</td> + <td>to</td> + <td>Sonar tests - reference</td> </tr> <tr> <td>addSelection</td> @@ -97,15 +97,10 @@ <td></td> </tr> <tr> - <td>clickAndWait</td> - <td>link=Quality profiles</td> + <td>assertSelectOptions</td> + <td>to</td> <td></td> </tr> -<tr> - <td>assertText</td> - <td>projects_java_Sonar%20way</td> - <td>0 projects</td> -</tr> </tbody></table> </body> diff --git a/tests/integration/tests/src/it/selenium/rules/rule_custom_rules_profile_can_be_modified.html b/tests/integration/tests/src/it/selenium/profiles/user-profiles-are-editable.html index 7f228707b21..f5ab2feee61 100644 --- a/tests/integration/tests/src/it/selenium/rules/rule_custom_rules_profile_can_be_modified.html +++ b/tests/integration/tests/src/it/selenium/profiles/user-profiles-are-editable.html @@ -4,12 +4,12 @@ <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="selenium.base" href="http://localhost:9000/" /> -<title>rule_custom_rules_profile_can_be_modified</title> +<title>user-profiles-are-editable</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">rule_custom_rules_profile_can_be_modified</td></tr> +<tr><td rowspan="1" colspan="3">user-profiles-are-editable</td></tr> </thead><tbody> <tr> <td>store</td> @@ -53,7 +53,7 @@ </tr> <tr> <td>click</td> - <td>create_profile</td> + <td>create-link-java</td> <td></td> </tr> <tr> @@ -68,7 +68,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>commit</td> + <td>create-submit-java</td> <td></td> </tr> <tr> diff --git a/tests/integration/tests/src/it/selenium/rules/SONAR-1000_quality_profile_with_space_or_dot.html b/tests/integration/tests/src/it/selenium/rules/SONAR-1000_quality_profile_with_space_or_dot.html index a733e6b402b..d1d87c743bb 100644 --- a/tests/integration/tests/src/it/selenium/rules/SONAR-1000_quality_profile_with_space_or_dot.html +++ b/tests/integration/tests/src/it/selenium/rules/SONAR-1000_quality_profile_with_space_or_dot.html @@ -11,45 +11,35 @@ <thead> <tr><td rowspan="1" colspan="3">SONAR-1000_quality_profile_with_space_or_dot</td></tr> </thead><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>store</td> + <td>javascript{'space dot. '+(new Date()).getTime()}</td> + <td>PROFILE</td> +</tr> <tr> <td>open</td> - <td>/profiles</td> + <td>/sessions/logout</td> <td></td> </tr> <tr> - <td>clickAndWait</td> - <td>link=Sonar way</td> + <td>open</td> + <td>/sessions/login</td> <td></td> </tr> <tr> - <td>assertText</td> - <td>//a[contains(@href,'Sonar+way')]</td> - <td>Download</td> + <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> @@ -58,33 +48,33 @@ </tr> <tr> <td>click</td> - <td>create_profile</td> + <td>create-link-java</td> <td></td> </tr> <tr> - <td>waitForVisible</td> - <td>form_create_profile</td> + <td>waitForValue</td> + <td>name</td> <td></td> </tr> <tr> <td>type</td> <td>name</td> - <td>test . dot</td> + <td>${PROFILE}</td> </tr> <tr> <td>clickAndWait</td> - <td>commit</td> + <td>create-submit-java</td> <td></td> </tr> <tr> <td>clickAndWait</td> - <td>link=test . dot</td> + <td>link=${PROFILE}</td> <td></td> </tr> <tr> - <td>assertText</td> - <td>//a[contains(@href,'test+.+dot')]</td> - <td>Download</td> + <td>assertTextPresent</td> + <td>Quality profiles / java / ${PROFILE}</td> + <td></td> </tr> </tbody></table> |