diff options
Diffstat (limited to 'qa/lib')
| -rw-r--r-- | qa/lib/gitlab/page/group/settings/billing.rb | 9 | ||||
| -rw-r--r-- | qa/lib/gitlab/page/group/settings/usage_quotas.rb | 28 |
2 files changed, 34 insertions, 3 deletions
diff --git a/qa/lib/gitlab/page/group/settings/billing.rb b/qa/lib/gitlab/page/group/settings/billing.rb index 45a67526682..0d25a012db3 100644 --- a/qa/lib/gitlab/page/group/settings/billing.rb +++ b/qa/lib/gitlab/page/group/settings/billing.rb @@ -33,10 +33,13 @@ module Gitlab # Waits for subscription to be synced and UI to be updated # # @param subscription_plan [String] - def wait_for_subscription(subscription_plan, page:) + def wait_for_subscription(subscription_plan) ::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 + max_duration: ::QA::Support::Helpers::Zuora::ZUORA_TIMEOUT, + sleep_interval: 2, + reload_page: Chemlab.configuration.browser.session, + 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 ce540b5ee56..5fc40a64722 100644 --- a/qa/lib/gitlab/page/group/settings/usage_quotas.rb +++ b/qa/lib/gitlab/page/group/settings/usage_quotas.rb @@ -82,6 +82,34 @@ module Gitlab purchased_usage_total[/(\d+){2}.\d+/].to_f end + + # Waits for additional CI minutes to be available on the page + def wait_for_additional_ci_minutes_available + ::QA::Support::Waiter.wait_until( + max_duration: ::QA::Support::Helpers::Zuora::ZUORA_TIMEOUT, + sleep_interval: 2, + reload_page: Chemlab.configuration.browser.session, + message: 'Expected additional CI minutes but they did not appear.' + ) do + additional_ci_minutes_added? + end + end + + # Waits for additional CI minutes amount to match the expected number of minutes + # + # @param [String] minutes + def wait_for_additional_ci_minute_limits(minutes) + wait_for_additional_ci_minutes_available + + ::QA::Support::Waiter.wait_until( + max_duration: ::QA::Support::Helpers::Zuora::ZUORA_TIMEOUT, + sleep_interval: 2, + reload_page: Chemlab.configuration.browser.session, + message: "Expected additional CI minutes to equal #{minutes}" + ) do + additional_ci_limits == minutes + end + end end end end |