Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

1 files changed, 27 insertions, 7 deletions

diff --git a/qa/lib/gitlab/page/group/settings/usage_quotas.rb b/qa/lib/gitlab/page/group/settings/usage_quotas.rb
index 455a695f703..0408668a81c 100644
--- a/qa/lib/gitlab/page/group/settings/usage_quotas.rb
+++ b/qa/lib/gitlab/page/group/settings/usage_quotas.rb
@@ -9,16 +9,36 @@ module Gitlab
           link :storage_tab, id: 'storage-quota'
           link :buy_ci_minutes, text: 'Buy additional minutes'
           link :buy_storage, text: /Purchase more storage/
-          strong :additional_minutes, text: 'Additional minutes'
-          div(:additional_minutes_usage) { additional_minutes_element.following_sibling.span }
-          div :purchase_successful_alert, text: /You have successfully purchased CI minutes/
+          div :plan_ci_minutes
+          div :additional_ci_minutes
+          span :purchased_usage_total
+          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{([^/ ]+)$}]
+          def plan_ci_limits
+            plan_ci_minutes_element.span.text[%r{([^/ ]+)$}]
           end
 
-          def additional_limits
-            additional_minutes_usage[%r{([^/ ]+)$}]
+          def additional_ci_limits
+            additional_ci_minutes_element.span.text[%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_total.to_f
           end
         end
       end