diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 21:10:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 21:10:01 +0000 |
| commit | 75d101a1c2684059ea22cea9f00ca74d2db78b38 (patch) | |
| tree | 67798118ceb61bc22c0825bd670b0448282dbed5 /qa | |
| parent | 830a1f59e2a0f2aab22def4d7463a1c30532764d (diff) | |
| download | gitlab-ce-75d101a1c2684059ea22cea9f00ca74d2db78b38.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/lib/gitlab/page/group/settings/usage_quotas.rb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/qa/lib/gitlab/page/group/settings/usage_quotas.rb b/qa/lib/gitlab/page/group/settings/usage_quotas.rb index 62f55aea2cc..3cb501efe13 100644 --- a/qa/lib/gitlab/page/group/settings/usage_quotas.rb +++ b/qa/lib/gitlab/page/group/settings/usage_quotas.rb @@ -32,8 +32,7 @@ module Gitlab div :project div :storage_type_legend span :container_registry_size - div :purchased_usage_total_free # Different UI for free namespace - span :purchased_usage_total + div :purchased_usage_total div :storage_purchase_successful_alert, text: /You have successfully purchased a storage/ div :additional_storage_alert, text: /purchase additional storage/ @@ -66,14 +65,10 @@ module Gitlab # Returns total purchased storage value once it's ready on page # # @return [Float] Total purchased storage value in GiB - def total_purchased_storage(free_name_space = true) + def total_purchased_storage additional_storage_alert_element.wait_until(&:present?) - if free_name_space - purchased_usage_total_free.split('/').last.match(/\d+\.\d+/)[0].to_f - else - purchased_usage_total.to_f - end + purchased_usage_total[/(\d+){2}.\d+/].to_f end def additional_ci_minutes_added? |