From: Julien Lancelot Date: Wed, 22 Jun 2016 12:32:29 +0000 (+0200) Subject: SONAR-7761 Fix ITs as login page is now using AJAX X-Git-Tag: 6.0-RC1~236 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=76e0edc5acd6a67b735e9dc719b2faa159f5212b;p=sonarqube.git SONAR-7761 Fix ITs as login page is now using AJAX --- diff --git a/it/it-tests/src/test/resources/administration/UsersPageTest/admin_should_change_its_own_password.html b/it/it-tests/src/test/resources/administration/UsersPageTest/admin_should_change_its_own_password.html index 78bbdd81b58..6152139f9d5 100644 --- a/it/it-tests/src/test/resources/administration/UsersPageTest/admin_should_change_its_own_password.html +++ b/it/it-tests/src/test/resources/administration/UsersPageTest/admin_should_change_its_own_password.html @@ -34,6 +34,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /users diff --git a/it/it-tests/src/test/resources/administration/UsersPageTest/generate_and_revoke_user_token.html b/it/it-tests/src/test/resources/administration/UsersPageTest/generate_and_revoke_user_token.html index aeb8df593f6..005b6546d03 100644 --- a/it/it-tests/src/test/resources/administration/UsersPageTest/generate_and_revoke_user_token.html +++ b/it/it-tests/src/test/resources/administration/UsersPageTest/generate_and_revoke_user_token.html @@ -39,6 +39,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + open /users diff --git a/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/normal-user.html b/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/normal-user.html index dee98790990..1d1fb924396 100644 --- a/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/normal-user.html +++ b/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/normal-user.html @@ -9,56 +9,61 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
open/sessions/logout
open/sessions/new
typeid=loginnot_profileadm
typeid=passworduserpwd
clickAndWaitname=commit
open/profiles
waitForElementPresentcss=.quality-profiles-table-row[data-name="Basic"]
clickcss=.quality-profiles-table-row[data-name="Basic"] .quality-profiles-table-name a
waitForTextcss=.quality-profile-header*Basic*
assertElementNotPresentcss=.js-change-parent
open/sessions/logout
open/sessions/new
typeid=loginnot_profileadm
typeid=passworduserpwd
clickAndWaitname=commit
waitForElementPresentcss=.js-user-authenticated
open/profiles
waitForElementPresentcss=.quality-profiles-table-row[data-name="Basic"]
clickcss=.quality-profiles-table-row[data-name="Basic"] .quality-profiles-table-name a
waitForTextcss=.quality-profile-header*Basic*
assertElementNotPresentcss=.js-change-parent
diff --git a/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/profile-admin.html b/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/profile-admin.html index 76ec57eadc0..083c7539e19 100644 --- a/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/profile-admin.html +++ b/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/profile-admin.html @@ -33,6 +33,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + open /profiles diff --git a/it/it-tests/src/test/resources/issue/IssueNotificationsTest/email_configuration.html b/it/it-tests/src/test/resources/issue/IssueNotificationsTest/email_configuration.html index e79ce04527e..578817a1c43 100644 --- a/it/it-tests/src/test/resources/issue/IssueNotificationsTest/email_configuration.html +++ b/it/it-tests/src/test/resources/issue/IssueNotificationsTest/email_configuration.html @@ -33,6 +33,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /email_configuration diff --git a/it/it-tests/src/test/resources/issue/IssueNotificationsTest/user_notifications_settings.html b/it/it-tests/src/test/resources/issue/IssueNotificationsTest/user_notifications_settings.html index 0bd235376ec..ba82e3ac356 100644 --- a/it/it-tests/src/test/resources/issue/IssueNotificationsTest/user_notifications_settings.html +++ b/it/it-tests/src/test/resources/issue/IssueNotificationsTest/user_notifications_settings.html @@ -33,6 +33,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /account/notifications diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/copy_measure_filter.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/copy_measure_filter.html index 559a0d2e9d3..e88d2a374c5 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/copy_measure_filter.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/copy_measure_filter.html @@ -38,6 +38,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + open /measures diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/copy_uniqueness_of_name.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/copy_uniqueness_of_name.html index 4cdff2a7a6f..33c575f7dc2 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/copy_uniqueness_of_name.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/copy_uniqueness_of_name.html @@ -38,6 +38,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + open /measures diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_change_columns.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_change_columns.html index d7b3f886a06..2e7b51c505c 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_change_columns.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_change_columns.html @@ -33,6 +33,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + open /measures diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget.html index acbbc61e350..dd38f5d361f 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget.html @@ -33,6 +33,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + clickAndWait xpath=(//table[contains(@id, 'shared-filters')]//a[contains(text(),'Projects')]) diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget_sort.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget_sort.html index 2b4b072cde6..ab4dda0d92a 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget_sort.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget_sort.html @@ -38,6 +38,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + open /measures diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/save_with_special_characters.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/save_with_special_characters.html index ea6b998299b..a757677af9d 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/save_with_special_characters.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/save_with_special_characters.html @@ -34,6 +34,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /measures diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/should-not-share-filter-when-user-have-no-sharing-permissions.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/should-not-share-filter-when-user-have-no-sharing-permissions.html index cbcc3685da8..fe75c78c0b5 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/should-not-share-filter-when-user-have-no-sharing-permissions.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/should-not-share-filter-when-user-have-no-sharing-permissions.html @@ -38,6 +38,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /measures diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/should-unshare-filter-remove-other-filters-favourite.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/should-unshare-filter-remove-other-filters-favourite.html index dd5f99b68ff..885412059bb 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/should-unshare-filter-remove-other-filters-favourite.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/should-unshare-filter-remove-other-filters-favourite.html @@ -38,6 +38,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /measures @@ -113,6 +118,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /measures/manage @@ -158,6 +168,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /measures @@ -228,6 +243,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /measures/manage diff --git a/it/it-tests/src/test/resources/projectAdministration/BackgroundTasksTest/should_not_display_failing_and_search_and_filter_elements_on_project_level_page.html b/it/it-tests/src/test/resources/projectAdministration/BackgroundTasksTest/should_not_display_failing_and_search_and_filter_elements_on_project_level_page.html index 92e83f2859e..375340060e7 100644 --- a/it/it-tests/src/test/resources/projectAdministration/BackgroundTasksTest/should_not_display_failing_and_search_and_filter_elements_on_project_level_page.html +++ b/it/it-tests/src/test/resources/projectAdministration/BackgroundTasksTest/should_not_display_failing_and_search_and_filter_elements_on_project_level_page.html @@ -35,10 +35,15 @@ admin - clickAndWait + click commit + + waitForElementPresent + css=.js-user-authenticated + + open /project/background_tasks?id=test-project diff --git a/it/it-tests/src/test/resources/projectAdministration/BulkDeletionTest/bulk-delete-filter-projects.html b/it/it-tests/src/test/resources/projectAdministration/BulkDeletionTest/bulk-delete-filter-projects.html index a2335a7916c..b1a78ffe504 100644 --- a/it/it-tests/src/test/resources/projectAdministration/BulkDeletionTest/bulk-delete-filter-projects.html +++ b/it/it-tests/src/test/resources/projectAdministration/BulkDeletionTest/bulk-delete-filter-projects.html @@ -33,6 +33,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /projects diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html index d67d7b7d800..16a057b896a 100644 --- a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html +++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html @@ -38,6 +38,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open / diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/only-on-project-settings.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/only-on-project-settings.html index e06e83d52ce..9197fa9c348 100644 --- a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/only-on-project-settings.html +++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/only-on-project-settings.html @@ -38,6 +38,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + type id=input_prop_only_on_project diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/override-global-settings.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/override-global-settings.html index f9ab41f50b3..a73b2ca1475 100644 --- a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/override-global-settings.html +++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/override-global-settings.html @@ -38,6 +38,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + type id=input_sonar.exclusions 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 3a80a92df24..dcffc75a5a2 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 @@ -33,6 +33,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /dashboard/index/com.sonarsource.it.samples:multi-modules-sample 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 2e667543a15..f4e01d07dba 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 @@ -33,6 +33,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /dashboard/index/com.sonarsource.it.samples:multi-modules-sample diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-success.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-success.html index 88a5ea62b34..e75663989ca 100644 --- a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-success.html +++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-success.html @@ -33,6 +33,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /dashboard/index/com.sonarsource.it.samples:multi-modules-sample diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/fine-grained-update-impossible.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/fine-grained-update-impossible.html index c143353b823..d074667d223 100644 --- a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/fine-grained-update-impossible.html +++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/fine-grained-update-impossible.html @@ -33,6 +33,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /dashboard/index/com.sonarsource.it.samples:multi-modules-sample diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/fine-grained-update-success.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/fine-grained-update-success.html index fc2eaedd1ef..4f2d9d597eb 100644 --- a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/fine-grained-update-success.html +++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/fine-grained-update-success.html @@ -33,6 +33,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /dashboard/index/com.sonarsource.it.samples:multi-modules-sample diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html b/it/it-tests/src/test/resources/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html index 8062527e3e0..cbb6595ff20 100644 --- a/it/it-tests/src/test/resources/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html +++ b/it/it-tests/src/test/resources/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html @@ -39,6 +39,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /project_roles?id=project-permissions-project diff --git a/it/it-tests/src/test/resources/projectEvent/EventTest/create_delete_standard_event.html b/it/it-tests/src/test/resources/projectEvent/EventTest/create_delete_standard_event.html index f004a1f29a9..b94fadf8d65 100644 --- a/it/it-tests/src/test/resources/projectEvent/EventTest/create_delete_standard_event.html +++ b/it/it-tests/src/test/resources/projectEvent/EventTest/create_delete_standard_event.html @@ -38,6 +38,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /project/history?id=sample diff --git a/it/it-tests/src/test/resources/projectEvent/EventTest/create_event_with_special_character.html b/it/it-tests/src/test/resources/projectEvent/EventTest/create_event_with_special_character.html index 8df480d22a7..c191a260a07 100644 --- a/it/it-tests/src/test/resources/projectEvent/EventTest/create_event_with_special_character.html +++ b/it/it-tests/src/test/resources/projectEvent/EventTest/create_event_with_special_character.html @@ -38,6 +38,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /project/history?id=sample diff --git a/it/it-tests/src/test/resources/projectEvent/EventTest/show_events_using_filters.html b/it/it-tests/src/test/resources/projectEvent/EventTest/show_events_using_filters.html index 4ee440a0833..ca90b8077fc 100644 --- a/it/it-tests/src/test/resources/projectEvent/EventTest/show_events_using_filters.html +++ b/it/it-tests/src/test/resources/projectEvent/EventTest/show_events_using_filters.html @@ -38,6 +38,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /project/history?id=sample diff --git a/it/it-tests/src/test/resources/qualityGate/QualityGateUiTest/should-display-alerts-correctly-history-page.html b/it/it-tests/src/test/resources/qualityGate/QualityGateUiTest/should-display-alerts-correctly-history-page.html index 8a0c160497f..3038a8931cb 100644 --- a/it/it-tests/src/test/resources/qualityGate/QualityGateUiTest/should-display-alerts-correctly-history-page.html +++ b/it/it-tests/src/test/resources/qualityGate/QualityGateUiTest/should-display-alerts-correctly-history-page.html @@ -53,6 +53,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /dashboard/index/sample diff --git a/it/it-tests/src/test/resources/qualityGate/QualityGateUiTest/should-display-period-alerts-correctly.html b/it/it-tests/src/test/resources/qualityGate/QualityGateUiTest/should-display-period-alerts-correctly.html index 573cbbd9ff3..3a1f8699e13 100644 --- a/it/it-tests/src/test/resources/qualityGate/QualityGateUiTest/should-display-period-alerts-correctly.html +++ b/it/it-tests/src/test/resources/qualityGate/QualityGateUiTest/should-display-period-alerts-correctly.html @@ -53,6 +53,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /widget?id=alerts&resource=sample diff --git a/it/it-tests/src/test/resources/qualityGate/notifications/activate_notification_channels.html b/it/it-tests/src/test/resources/qualityGate/notifications/activate_notification_channels.html index fc1b770918e..40de82c178a 100644 --- a/it/it-tests/src/test/resources/qualityGate/notifications/activate_notification_channels.html +++ b/it/it-tests/src/test/resources/qualityGate/notifications/activate_notification_channels.html @@ -33,6 +33,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /sonar/account/notifications diff --git a/it/it-tests/src/test/resources/qualityGate/notifications/email_configuration.html b/it/it-tests/src/test/resources/qualityGate/notifications/email_configuration.html index dace0c5d07e..7b43cf8ee03 100644 --- a/it/it-tests/src/test/resources/qualityGate/notifications/email_configuration.html +++ b/it/it-tests/src/test/resources/qualityGate/notifications/email_configuration.html @@ -33,6 +33,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /email_configuration diff --git a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/missing_ip.html b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/missing_ip.html index c8a9607f25e..1a9725f07a8 100644 --- a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/missing_ip.html +++ b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/missing_ip.html @@ -53,6 +53,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /settings/index diff --git a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/organisation_must_not_accept_special_chars.html b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/organisation_must_not_accept_special_chars.html index d1d083a96d8..29823121244 100644 --- a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/organisation_must_not_accept_special_chars.html +++ b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/organisation_must_not_accept_special_chars.html @@ -28,6 +28,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /settings/index diff --git a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html index 9d469c02f28..eb9f7ea5cf1 100644 --- a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html +++ b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html @@ -38,6 +38,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /system/index diff --git a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/valid_id.html b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/valid_id.html index 2ad01661ed4..4f86397d642 100644 --- a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/valid_id.html +++ b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/valid_id.html @@ -33,6 +33,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /settings/index diff --git a/it/it-tests/src/test/resources/settings/PropertySetsTest/auto-generated/create.html b/it/it-tests/src/test/resources/settings/PropertySetsTest/auto-generated/create.html index bceffc86f12..a28e6426fdf 100644 --- a/it/it-tests/src/test/resources/settings/PropertySetsTest/auto-generated/create.html +++ b/it/it-tests/src/test/resources/settings/PropertySetsTest/auto-generated/create.html @@ -28,6 +28,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /settings?category=DEV diff --git a/it/it-tests/src/test/resources/settings/PropertySetsTest/auto-generated/update.html b/it/it-tests/src/test/resources/settings/PropertySetsTest/auto-generated/update.html index dc4e7ac8ccf..2db17093913 100644 --- a/it/it-tests/src/test/resources/settings/PropertySetsTest/auto-generated/update.html +++ b/it/it-tests/src/test/resources/settings/PropertySetsTest/auto-generated/update.html @@ -28,6 +28,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /settings?category=DEV diff --git a/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/all_types.html b/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/all_types.html index 9cdfdc43d0b..4dfffa1d384 100644 --- a/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/all_types.html +++ b/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/all_types.html @@ -28,6 +28,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /settings?category=DEV diff --git a/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/create.html b/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/create.html index d1bc2b3a11b..d85e447c5c4 100644 --- a/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/create.html +++ b/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/create.html @@ -28,6 +28,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /settings?category=DEV diff --git a/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/delete.html b/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/delete.html index 8cc1952ef60..aa0e9cacc6d 100644 --- a/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/delete.html +++ b/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/delete.html @@ -28,6 +28,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /settings?category=DEV diff --git a/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/reference.html b/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/reference.html index d282e68e528..c212340711f 100644 --- a/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/reference.html +++ b/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/reference.html @@ -28,6 +28,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /settings?category=DEV diff --git a/it/it-tests/src/test/resources/settings/SettingsTest/display-license.html b/it/it-tests/src/test/resources/settings/SettingsTest/display-license.html index 4ddf1814649..f2f1d31bb87 100644 --- a/it/it-tests/src/test/resources/settings/SettingsTest/display-license.html +++ b/it/it-tests/src/test/resources/settings/SettingsTest/display-license.html @@ -33,6 +33,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + type id=input_typed.license.secured diff --git a/it/it-tests/src/test/resources/settings/SettingsTest/display-untyped-license.html b/it/it-tests/src/test/resources/settings/SettingsTest/display-untyped-license.html index a6bd3b1a7b8..ae353cf7618 100644 --- a/it/it-tests/src/test/resources/settings/SettingsTest/display-untyped-license.html +++ b/it/it-tests/src/test/resources/settings/SettingsTest/display-untyped-license.html @@ -33,6 +33,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + type id=input_untyped.license.secured diff --git a/it/it-tests/src/test/resources/settings/SettingsTest/encrypt-text.html b/it/it-tests/src/test/resources/settings/SettingsTest/encrypt-text.html index 329f11dfd76..fe174478d54 100644 --- a/it/it-tests/src/test/resources/settings/SettingsTest/encrypt-text.html +++ b/it/it-tests/src/test/resources/settings/SettingsTest/encrypt-text.html @@ -33,6 +33,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + selectFrame settings_iframe diff --git a/it/it-tests/src/test/resources/settings/SettingsTest/general-settings.html b/it/it-tests/src/test/resources/settings/SettingsTest/general-settings.html index f412bf865a4..89061e138ba 100644 --- a/it/it-tests/src/test/resources/settings/SettingsTest/general-settings.html +++ b/it/it-tests/src/test/resources/settings/SettingsTest/general-settings.html @@ -38,6 +38,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /settings/index diff --git a/it/it-tests/src/test/resources/settings/SettingsTest/generate-secret-key.html b/it/it-tests/src/test/resources/settings/SettingsTest/generate-secret-key.html index 8632039e4ab..c667bf3ca0b 100644 --- a/it/it-tests/src/test/resources/settings/SettingsTest/generate-secret-key.html +++ b/it/it-tests/src/test/resources/settings/SettingsTest/generate-secret-key.html @@ -33,6 +33,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + selectFrame settings_iframe diff --git a/it/it-tests/src/test/resources/settings/SettingsTest/global-extension-property.html b/it/it-tests/src/test/resources/settings/SettingsTest/global-extension-property.html index 73093c729ac..ad3d97682b3 100644 --- a/it/it-tests/src/test/resources/settings/SettingsTest/global-extension-property.html +++ b/it/it-tests/src/test/resources/settings/SettingsTest/global-extension-property.html @@ -33,7 +33,11 @@ commit - + + waitForElementPresent + css=.js-user-authenticated + + open /settings?category=Settings diff --git a/it/it-tests/src/test/resources/settings/SettingsTest/hidden-extension-property.html b/it/it-tests/src/test/resources/settings/SettingsTest/hidden-extension-property.html index 87f773db812..7aa9bd9cba1 100644 --- a/it/it-tests/src/test/resources/settings/SettingsTest/hidden-extension-property.html +++ b/it/it-tests/src/test/resources/settings/SettingsTest/hidden-extension-property.html @@ -33,7 +33,11 @@ commit - + + waitForElementPresent + css=.js-user-authenticated + + open /settings?category=Settings diff --git a/it/it-tests/src/test/resources/settings/SettingsTest/hide-passwords.html b/it/it-tests/src/test/resources/settings/SettingsTest/hide-passwords.html index c2ee4b33517..531e11e8bd4 100644 --- a/it/it-tests/src/test/resources/settings/SettingsTest/hide-passwords.html +++ b/it/it-tests/src/test/resources/settings/SettingsTest/hide-passwords.html @@ -33,6 +33,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + waitForText block_password diff --git a/it/it-tests/src/test/resources/settings/SettingsTest/ignore-corrupted-license.html b/it/it-tests/src/test/resources/settings/SettingsTest/ignore-corrupted-license.html index 8e735cc8c8b..e05b5727102 100644 --- a/it/it-tests/src/test/resources/settings/SettingsTest/ignore-corrupted-license.html +++ b/it/it-tests/src/test/resources/settings/SettingsTest/ignore-corrupted-license.html @@ -33,6 +33,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + type id=input_typed.license.secured diff --git a/it/it-tests/src/test/resources/settings/SettingsTest/property_relocation.html b/it/it-tests/src/test/resources/settings/SettingsTest/property_relocation.html index 26a649141f3..37986cd560d 100644 --- a/it/it-tests/src/test/resources/settings/SettingsTest/property_relocation.html +++ b/it/it-tests/src/test/resources/settings/SettingsTest/property_relocation.html @@ -33,6 +33,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + waitForText properties diff --git a/it/it-tests/src/test/resources/settings/SettingsTest/validate-property-type.html b/it/it-tests/src/test/resources/settings/SettingsTest/validate-property-type.html index 43cf2f62c89..96024f79b91 100644 --- a/it/it-tests/src/test/resources/settings/SettingsTest/validate-property-type.html +++ b/it/it-tests/src/test/resources/settings/SettingsTest/validate-property-type.html @@ -33,6 +33,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + type id=input_float diff --git a/it/it-tests/src/test/resources/settings/subcategories/global-subcategories-no-default.html b/it/it-tests/src/test/resources/settings/subcategories/global-subcategories-no-default.html index 99a509350ec..a4b69712397 100644 --- a/it/it-tests/src/test/resources/settings/subcategories/global-subcategories-no-default.html +++ b/it/it-tests/src/test/resources/settings/subcategories/global-subcategories-no-default.html @@ -28,6 +28,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /settings?category=Category 2 diff --git a/it/it-tests/src/test/resources/settings/subcategories/global-subcategories.html b/it/it-tests/src/test/resources/settings/subcategories/global-subcategories.html index af4901ab6ef..3f578222762 100644 --- a/it/it-tests/src/test/resources/settings/subcategories/global-subcategories.html +++ b/it/it-tests/src/test/resources/settings/subcategories/global-subcategories.html @@ -28,6 +28,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /settings?category=Category 1 diff --git a/it/it-tests/src/test/resources/settings/subcategories/project-subcategories-no-default.html b/it/it-tests/src/test/resources/settings/subcategories/project-subcategories-no-default.html index 5ff1df8ba20..f0efe3fcf35 100644 --- a/it/it-tests/src/test/resources/settings/subcategories/project-subcategories-no-default.html +++ b/it/it-tests/src/test/resources/settings/subcategories/project-subcategories-no-default.html @@ -28,6 +28,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /project/settings/sample?category=Category 2 diff --git a/it/it-tests/src/test/resources/settings/subcategories/project-subcategories.html b/it/it-tests/src/test/resources/settings/subcategories/project-subcategories.html index 8e50d946ecb..1d6b7efc0c7 100644 --- a/it/it-tests/src/test/resources/settings/subcategories/project-subcategories.html +++ b/it/it-tests/src/test/resources/settings/subcategories/project-subcategories.html @@ -28,6 +28,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /project/settings/sample?category=Category 1 diff --git a/it/it-tests/src/test/resources/updateCenter/installed-plugins.html b/it/it-tests/src/test/resources/updateCenter/installed-plugins.html index 44bf85163fe..05c21066451 100644 --- a/it/it-tests/src/test/resources/updateCenter/installed-plugins.html +++ b/it/it-tests/src/test/resources/updateCenter/installed-plugins.html @@ -33,6 +33,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + open /updatecenter diff --git a/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/create-and-delete-user.html b/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/create-and-delete-user.html index 4a1f636691f..90d1eb36714 100644 --- a/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/create-and-delete-user.html +++ b/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/create-and-delete-user.html @@ -33,6 +33,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /users diff --git a/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/external-user-details.html b/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/external-user-details.html index f05ca36e3a5..60751a0adef 100644 --- a/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/external-user-details.html +++ b/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/external-user-details.html @@ -33,6 +33,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /account/index diff --git a/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/external-user-details2.html b/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/external-user-details2.html index 0c2dc5868a7..a245110f624 100644 --- a/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/external-user-details2.html +++ b/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/external-user-details2.html @@ -33,6 +33,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /account/index diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/allow_users_to_sign_up.html b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/allow_users_to_sign_up.html index 69784618a44..7538eaf5a11 100644 --- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/allow_users_to_sign_up.html +++ b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/allow_users_to_sign_up.html @@ -83,6 +83,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + waitForText css=.navbar diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html index 3b8f6cb4440..a2f80c42291 100644 --- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html +++ b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html @@ -48,6 +48,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + waitForText css=.navbar diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/login_successful.html b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/login_successful.html index 430e94aa539..68257d74485 100644 --- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/login_successful.html +++ b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/login_successful.html @@ -38,6 +38,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + waitForText css=.navbar diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_direct_login.html b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_direct_login.html index 65fb94f9368..3b4dc0e8a5f 100644 --- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_direct_login.html +++ b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_direct_login.html @@ -38,6 +38,11 @@ name=commit + + waitForElementPresent + css=.js-user-authenticated + + waitForText css=.navbar diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_indirect_login.html b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_indirect_login.html index 0200a72cf4b..ef3618524db 100644 --- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_indirect_login.html +++ b/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_indirect_login.html @@ -42,6 +42,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + waitForText css=.navbar diff --git a/it/it-tests/src/test/resources/user/MyAccountPageTest/should_change_password.html b/it/it-tests/src/test/resources/user/MyAccountPageTest/should_change_password.html index 7d224eb3b87..58ad7b8b089 100644 --- a/it/it-tests/src/test/resources/user/MyAccountPageTest/should_change_password.html +++ b/it/it-tests/src/test/resources/user/MyAccountPageTest/should_change_password.html @@ -34,6 +34,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /sonar/account/security diff --git a/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_issues.html b/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_issues.html index ac6bc7c6240..ab2e1c438f3 100644 --- a/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_issues.html +++ b/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_issues.html @@ -34,6 +34,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /sonar/account/issues diff --git a/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_no_projects.html b/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_no_projects.html index 80ec05c080b..4060bf595a6 100644 --- a/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_no_projects.html +++ b/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_no_projects.html @@ -34,6 +34,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /account/projects diff --git a/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_projects.html b/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_projects.html index fe8ce780330..5f580876c51 100644 --- a/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_projects.html +++ b/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_projects.html @@ -34,6 +34,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /account/projects diff --git a/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_user_details.html b/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_user_details.html index f1543e174d5..1036819238c 100644 --- a/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_user_details.html +++ b/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_user_details.html @@ -34,6 +34,11 @@ commit + + waitForElementPresent + css=.js-user-authenticated + + open /sonar/account/ diff --git a/server/sonar-web/src/main/js/main/nav/global/global-nav-user.js b/server/sonar-web/src/main/js/main/nav/global/global-nav-user.js index 52b0820c52e..8068fae02a9 100644 --- a/server/sonar-web/src/main/js/main/nav/global/global-nav-user.js +++ b/server/sonar-web/src/main/js/main/nav/global/global-nav-user.js @@ -25,7 +25,7 @@ import { translate } from '../../../helpers/l10n'; export default React.createClass({ renderAuthenticated() { return ( -
  • +
  •   {window.SS.userName}