summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSanad Liaquat <sliaquat@gitlab.com>2019-07-09 11:34:13 +0500
committerSanad Liaquat <sliaquat@gitlab.com>2019-07-09 11:34:13 +0500
commitd4466ea970480d6e494190bd25a6d195882d57f5 (patch)
tree7183d76129372eab1c9c2a2adc02695b857030c9
parentd920f705b43b6d25449f911a9344b6520d3acfe7 (diff)
downloadgitlab-ce-d4466ea970480d6e494190bd25a6d195882d57f5.tar.gz
Revert to using retry_untilsl-stablise-basic-login-spec
-rw-r--r--app/views/layouts/header/_current_user_dropdown.html.haml2
-rw-r--r--qa/qa/page/main/menu.rb4
-rw-r--r--qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb4
3 files changed, 6 insertions, 4 deletions
diff --git a/app/views/layouts/header/_current_user_dropdown.html.haml b/app/views/layouts/header/_current_user_dropdown.html.haml
index 4f3e4031fe3..45fc39dbbdb 100644
--- a/app/views/layouts/header/_current_user_dropdown.html.haml
+++ b/app/views/layouts/header/_current_user_dropdown.html.haml
@@ -24,4 +24,4 @@
- if current_user_menu?(:sign_out)
%li.divider
%li
- = link_to _("Sign out"), destroy_user_session_path, class: "sign-out-link"
+ = link_to _("Sign out"), destroy_user_session_path, class: "sign-out-link qa-sign-out-link"
diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb
index 8381467c8dc..9c99e43d4c0 100644
--- a/qa/qa/page/main/menu.rb
+++ b/qa/qa/page/main/menu.rb
@@ -5,7 +5,7 @@ module QA
module Main
class Menu < Page::Base
view 'app/views/layouts/header/_current_user_dropdown.html.haml' do
- element :user_sign_out_link, 'link_to _("Sign out")' # rubocop:disable QA/ElementWithPattern
+ element :sign_out_link
element :settings_link, 'link_to s_("CurrentUser|Settings")' # rubocop:disable QA/ElementWithPattern
end
@@ -53,7 +53,7 @@ module QA
def sign_out
within_user_menu do
- click_element :user_sign_out_link, Page::Main::Login
+ click_element :sign_out_link
end
end
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb
index c4a6f8dbb04..5cd6bac3f5a 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb
@@ -11,8 +11,10 @@ module QA
expect(menu).to have_personal_area
end
- Support::Retrier.retry_on_exception do
+ Support::Retrier.retry_until(reload: false, sleep_interval: 0.5) do
Page::Main::Menu.perform(&:sign_out)
+
+ Page::Main::Login.perform(&:has_sign_in_tab?)
end
Page::Main::Login.perform do |form|