From d4466ea970480d6e494190bd25a6d195882d57f5 Mon Sep 17 00:00:00 2001 From: Sanad Liaquat Date: Tue, 9 Jul 2019 11:34:13 +0500 Subject: Revert to using retry_until --- qa/qa/page/main/menu.rb | 4 ++-- qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'qa') 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| -- cgit v1.2.1