Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 10 deletions

diff --git a/qa/lib/gitlab/page/group/settings/usage_quotas.rb b/qa/lib/gitlab/page/group/settings/usage_quotas.rb
index 3b31d1c0a1c..0408668a81c 100644
--- a/qa/lib/gitlab/page/group/settings/usage_quotas.rb
+++ b/qa/lib/gitlab/page/group/settings/usage_quotas.rb
@@ -9,21 +9,19 @@ 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'
-          strong :plan_minutes, text: 'Current period usage'
-          div :purchased_usage, 'data-testid': 'purchased-usage'
-          div(:plan_minutes_usage) { plan_minutes_element.following_sibling.span }
-          div(:additional_minutes_usage) { additional_minutes_element.following_sibling.span }
+          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
@@ -40,7 +38,7 @@ module Gitlab
           # @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
+            purchased_usage_total.to_f
           end
         end
       end