Add latest changes from gitlab-org/gitlab@master

4 files changed, 21 insertions, 8 deletions

diff --git a/qa/lib/gitlab/page/group/settings/billing.rb b/qa/lib/gitlab/page/group/settings/billing.rb
index 1cb31c995f6..45a67526682 100644
--- a/qa/lib/gitlab/page/group/settings/billing.rb
+++ b/qa/lib/gitlab/page/group/settings/billing.rb
@@ -34,7 +34,9 @@ module Gitlab
           #
           # @param subscription_plan [String]
           def wait_for_subscription(subscription_plan, page:)
-            ::QA::Support::Waiter.wait_until(max_duration: 30, sleep_interval: 3, reload_page: page) do
+            ::QA::Support::Waiter.wait_until(
+              max_duration: ::QA::Support::Helpers::Zuora::ZUORA_TIMEOUT, sleep_interval: 2, reload_page: page,
+              message: "Subscription plan '#{subscription_plan}' failed to appear") do
               billing_plan_header.match?(/currently using the #{subscription_plan} saas plan/i)
             end
           end
diff --git a/qa/lib/gitlab/page/group/settings/usage_quotas.rb b/qa/lib/gitlab/page/group/settings/usage_quotas.rb
index a6d9cfa7846..ce540b5ee56 100644
--- a/qa/lib/gitlab/page/group/settings/usage_quotas.rb
+++ b/qa/lib/gitlab/page/group/settings/usage_quotas.rb
@@ -50,6 +50,12 @@ module Gitlab
             additional_ci_minutes[/(\d+){2}/]
           end
 
+          def additional_ci_minutes_added?
+            #  When opening the Usage quotas page, Seats quota tab is opened briefly even when url is to a different tab
+            ::QA::Support::WaitForRequests.wait_for_requests
+            additional_ci_minutes?
+          end
+
           # Waits and Checks if storage available alert presents on the page
           #
           # @return [Boolean] True if the alert presents, false if not after 5 second wait
@@ -76,12 +82,6 @@ module Gitlab
 
             purchased_usage_total[/(\d+){2}.\d+/].to_f
           end
-
-          def additional_ci_minutes_added?
-            # When opening the Usage quotas page, Seats quota tab is opened briefly even when url is to a different tab
-            ::QA::Support::WaitForRequests.wait_for_requests
-            additional_ci_minutes?
-          end
         end
       end
     end
diff --git a/qa/qa/flow/purchase.rb b/qa/qa/flow/purchase.rb
index 32c4f469207..2eee15b874c 100644
--- a/qa/qa/flow/purchase.rb
+++ b/qa/qa/flow/purchase.rb
@@ -3,7 +3,7 @@
 module QA
   module Flow
     module Purchase
-      include QA::Support::Helpers::Plan
+      include Support::Helpers::Plan
 
       extend self
 
diff --git a/qa/qa/support/helpers/zuora.rb b/qa/qa/support/helpers/zuora.rb
new file mode 100644
index 00000000000..0f75d9bb1e6
--- /dev/null
+++ b/qa/qa/support/helpers/zuora.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module QA
+  module Support
+    module Helpers
+      module Zuora
+        ZUORA_TIMEOUT = 60
+      end
+    end
+  end
+end