1 files changed, 22 insertions, 12 deletions
diff --git a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
index d58857f6da2..d9b246fc458 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb
@@ -98,8 +98,10 @@ module QA
         before do
           enable_require_admin_approval_after_user_signup_via_ui
 
-          @user = Resource::User.fabricate_via_browser_ui! do |user|
-            user.expect_fabrication_success = false
+          Support::Retrier.retry_on_exception do
+            @user = Resource::User.fabricate_via_browser_ui! do |user|
+              user.expect_fabrication_success = false
+            end
           end
         end
 
@@ -148,26 +150,34 @@ module QA
     end
 
     def set_require_admin_approval_after_user_signup_via_api(enable_or_disable)
-      return if Runtime::ApplicationSettings.get_application_settings[:require_admin_approval_after_user_signup] == enable_or_disable
+      return if get_require_admin_approval_after_user_signup_via_api == enable_or_disable
 
       Runtime::ApplicationSettings.set_application_settings(require_admin_approval_after_user_signup: enable_or_disable)
 
       sleep 10 # It takes a moment for the setting to come into effect
     end
 
+    def get_require_admin_approval_after_user_signup_via_api
+      Runtime::ApplicationSettings.get_application_settings[:require_admin_approval_after_user_signup]
+    end
+
     def enable_require_admin_approval_after_user_signup_via_ui
-      unless Runtime::ApplicationSettings.get_application_settings[:require_admin_approval_after_user_signup]
-        Flow::Login.while_signed_in_as_admin do
-          Page::Main::Menu.perform(&:go_to_admin_area)
-          QA::Page::Admin::Menu.perform(&:go_to_general_settings)
-          Page::Admin::Settings::General.perform do |setting|
-            setting.expand_sign_up_restrictions do |settings|
-              settings.require_admin_approval_after_user_signup
+      unless get_require_admin_approval_after_user_signup_via_api
+        QA::Support::Retrier.retry_until do
+          Flow::Login.while_signed_in_as_admin do
+            Page::Main::Menu.perform(&:go_to_admin_area)
+            QA::Page::Admin::Menu.perform(&:go_to_general_settings)
+            Page::Admin::Settings::General.perform do |setting|
+              setting.expand_sign_up_restrictions do |settings|
+                settings.require_admin_approval_after_user_signup
+              end
             end
           end
-        end
 
-        sleep 10 # It takes a moment for the setting to come into effect
+          sleep 15 # It takes a moment for the setting to come into effect
+
+          get_require_admin_approval_after_user_signup_via_api
+        end
       end
     end
   end