Use retry on exception

2 files changed, 2 insertions, 4 deletions

diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb
index 5eb24d2d2ba..8381467c8dc 100644
--- a/qa/qa/page/main/menu.rb
+++ b/qa/qa/page/main/menu.rb
@@ -53,7 +53,7 @@ module QA
 
         def sign_out
           within_user_menu do
-            click_link 'Sign out'
+            click_element :user_sign_out_link, Page::Main::Login
           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 a6bc6d2077c..c4a6f8dbb04 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,10 +11,8 @@ module QA
           expect(menu).to have_personal_area
         end
 
-        Support::Retrier.retry_until(reload: false, sleep_interval: 1.0) do
+        Support::Retrier.retry_on_exception do
           Page::Main::Menu.perform(&:sign_out)
-
-          Page::Main::Login.perform(&:has_sign_in_tab?)
         end
 
         Page::Main::Login.perform do |form|