From a4aa229f7621a1982b4220bbd6db1fbceb738a2e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 26 Nov 2021 18:12:26 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- qa/lib/gitlab/page/group/settings/usage_quotas.rb | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'qa/lib') diff --git a/qa/lib/gitlab/page/group/settings/usage_quotas.rb b/qa/lib/gitlab/page/group/settings/usage_quotas.rb index 455a695f703..b935c52dd76 100644 --- a/qa/lib/gitlab/page/group/settings/usage_quotas.rb +++ b/qa/lib/gitlab/page/group/settings/usage_quotas.rb @@ -10,8 +10,11 @@ module Gitlab link :buy_ci_minutes, text: 'Buy additional minutes' link :buy_storage, text: /Purchase more storage/ strong :additional_minutes, text: 'Additional minutes' + div :purchased_usage, 'data-testid': 'purchased-usage' div(:additional_minutes_usage) { additional_minutes_element.following_sibling.span } - div :purchase_successful_alert, text: /You have successfully purchased CI minutes/ + div :ci_purchase_successful_alert, text: /You have successfully purchased CI minutes/ + div :storage_purchase_successful_alert, text: /You have successfully purchased a storage/ + h4 :storage_available_alert, text: /purchased storage is available/ def plan_minutes_limits plan_minutes_usage[%r{([^/ ]+)$}] @@ -20,6 +23,23 @@ module Gitlab def additional_limits additional_minutes_usage[%r{([^/ ]+)$}] 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 + def purchased_storage_available? + storage_available_alert_element.wait_until(timeout: 5, &:present?) + rescue Watir::Wait::TimeoutError + false + end + + # Returns total purchased storage value once it's ready on page + # + # @return [Float] Total purchased storage value in GiB + def total_purchased_storage + storage_available_alert_element.wait_until(&:present?) + purchased_usage_element.p.spans[3].text.to_f + end end end end -- cgit v1.2.3