diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-25 18:12:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-25 18:12:22 +0300 |
commit | f8888a274f6b095075fd8648d3732ad577a3a742 (patch) | |
tree | 4b5c3f082951846ebca4bb80265d10390bdc210c /qa/lib/gitlab | |
parent | df65129ab40540728d4b391fc1a21d5a1de87b9c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/lib/gitlab')
-rw-r--r-- | qa/lib/gitlab/page/admin/subscription.rb | 2 | ||||
-rw-r--r-- | qa/lib/gitlab/page/group/settings/usage_quotas.rb | 30 | ||||
-rw-r--r-- | qa/lib/gitlab/page/group/settings/usage_quotas.stub.rb | 48 |
3 files changed, 40 insertions, 40 deletions
diff --git a/qa/lib/gitlab/page/admin/subscription.rb b/qa/lib/gitlab/page/admin/subscription.rb index e19f0580007..6decdeeb3f7 100644 --- a/qa/lib/gitlab/page/admin/subscription.rb +++ b/qa/lib/gitlab/page/admin/subscription.rb @@ -39,7 +39,7 @@ module Gitlab # @option plan [Hash] Support::Helpers::PREMIUM_SELF_MANAGED # @option plan [Hash] Support::Helpers::ULTIMATE # @option plan [Hash] Support::Helpers::ULTIMATE_SELF_MANAGED - # @option plan [Hash] Support::Helpers::CI_MINUTES + # @option plan [Hash] Support::Helpers::COMPUTE_MINUTES # @option plan [Hash] Support::Helpers::STORAGE # @param users_in_license [Integer] Number of users in license # @param license_type [Hash] Type of the license diff --git a/qa/lib/gitlab/page/group/settings/usage_quotas.rb b/qa/lib/gitlab/page/group/settings/usage_quotas.rb index 8ae9e8fd25a..eab40ab8941 100644 --- a/qa/lib/gitlab/page/group/settings/usage_quotas.rb +++ b/qa/lib/gitlab/page/group/settings/usage_quotas.rb @@ -13,9 +13,9 @@ module Gitlab # Pipelines section link :pipelines_tab - link :buy_ci_minutes - div :plan_ci_minutes - div :additional_ci_minutes + link :buy_compute_minutes + div :plan_compute_minutes + div :additional_compute_minutes div :ci_purchase_successful_alert, text: /You have successfully purchased CI minutes/ # Storage section @@ -39,17 +39,17 @@ module Gitlab button :confirm_member_approval, text: /^OK$/ def plan_ci_limits - plan_ci_minutes[/(\d+){2}/] + plan_compute_minutes[/(\d+){2}/] end def additional_ci_limits - additional_ci_minutes[/(\d+){2}/] + additional_compute_minutes[/(\d+){2}/] end - def additional_ci_minutes_added? + def additional_compute_minutes_added? # When opening the Usage quotas page, Seats quota tab is opened briefly even when url is to a different tab ::QA::Support::WaitForRequests.wait_for_requests - additional_ci_minutes? + additional_compute_minutes? end # Returns total purchased storage value once it's ready on page @@ -61,29 +61,29 @@ module Gitlab storage_purchased[/(\d+){2}.\d+/].to_f end - # Waits for additional CI minutes to be available on the page - def wait_for_additional_ci_minutes_available + # Waits for additional compute minutes to be available on the page + def wait_for_additional_compute_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.' + message: 'Expected additional compute minutes but they did not appear.' ) do - additional_ci_minutes_added? + additional_compute_minutes_added? end end - # Waits for additional CI minutes amount to match the expected number of minutes + # Waits for additional compute 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 + def wait_for_additional_compute_minute_limits(minutes) + wait_for_additional_compute_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}" + message: "Expected additional compute minutes to equal #{minutes}" ) do additional_ci_limits == minutes end diff --git a/qa/lib/gitlab/page/group/settings/usage_quotas.stub.rb b/qa/lib/gitlab/page/group/settings/usage_quotas.stub.rb index 748c9a82d59..0c473123340 100644 --- a/qa/lib/gitlab/page/group/settings/usage_quotas.stub.rb +++ b/qa/lib/gitlab/page/group/settings/usage_quotas.stub.rb @@ -125,75 +125,75 @@ module Gitlab # This is a stub, used for indexing. The method is dynamically generated. end - # @note Defined as +link :buy_ci_minutes+ - # Clicks +buy_ci_minutes+ - def buy_ci_minutes + # @note Defined as +link :buy_compute_minutes+ + # Clicks +buy_compute_minutes+ + def buy_compute_minutes # This is a stub, used for indexing. The method is dynamically generated. end # @example # Gitlab::Page::Group::Settings::UsageQuotas.perform do |usage_quotas| - # expect(usage_quotas.buy_ci_minutes_element).to exist + # expect(usage_quotas.buy_compute_minutes_element).to exist # end # @return [Watir::Link] The raw +Link+ element - def buy_ci_minutes_element + def buy_compute_minutes_element # This is a stub, used for indexing. The method is dynamically generated. end # @example # Gitlab::Page::Group::Settings::UsageQuotas.perform do |usage_quotas| - # expect(usage_quotas).to be_buy_ci_minutes + # expect(usage_quotas).to be_buy_compute_minutes # end - # @return [Boolean] true if the +buy_ci_minutes+ element is present on the page - def buy_ci_minutes? + # @return [Boolean] true if the +buy_compute_minutes+ element is present on the page + def buy_compute_minutes? # This is a stub, used for indexing. The method is dynamically generated. end - # @note Defined as +div :plan_ci_minutes+ - # @return [String] The text content or value of +plan_ci_minutes+ - def plan_ci_minutes + # @note Defined as +div :plan_compute_minutes+ + # @return [String] The text content or value of +plan_compute_minutes+ + def plan_compute_minutes # This is a stub, used for indexing. The method is dynamically generated. end # @example # Gitlab::Page::Group::Settings::UsageQuotas.perform do |usage_quotas| - # expect(usage_quotas.plan_ci_minutes_element).to exist + # expect(usage_quotas.plan_compute_minutes_element).to exist # end # @return [Watir::Div] The raw +Div+ element - def plan_ci_minutes_element + def plan_compute_minutes_element # This is a stub, used for indexing. The method is dynamically generated. end # @example # Gitlab::Page::Group::Settings::UsageQuotas.perform do |usage_quotas| - # expect(usage_quotas).to be_plan_ci_minutes + # expect(usage_quotas).to be_plan_compute_minutes # end - # @return [Boolean] true if the +plan_ci_minutes+ element is present on the page - def plan_ci_minutes? + # @return [Boolean] true if the +plan_compute_minutes+ element is present on the page + def plan_compute_minutes? # This is a stub, used for indexing. The method is dynamically generated. end - # @note Defined as +div :additional_ci_minutes+ - # @return [String] The text content or value of +additional_ci_minutes+ - def additional_ci_minutes + # @note Defined as +div :additional_compute_minutes+ + # @return [String] The text content or value of +additional_compute_minutes+ + def additional_compute_minutes # This is a stub, used for indexing. The method is dynamically generated. end # @example # Gitlab::Page::Group::Settings::UsageQuotas.perform do |usage_quotas| - # expect(usage_quotas.additional_ci_minutes_element).to exist + # expect(usage_quotas.additional_compute_minutes_element).to exist # end # @return [Watir::Div] The raw +Div+ element - def additional_ci_minutes_element + def additional_compute_minutes_element # This is a stub, used for indexing. The method is dynamically generated. end # @example # Gitlab::Page::Group::Settings::UsageQuotas.perform do |usage_quotas| - # expect(usage_quotas).to be_additional_ci_minutes + # expect(usage_quotas).to be_additional_compute_minutes # end - # @return [Boolean] true if the +additional_ci_minutes+ element is present on the page - def additional_ci_minutes? + # @return [Boolean] true if the +additional_compute_minutes+ element is present on the page + def additional_compute_minutes? # This is a stub, used for indexing. The method is dynamically generated. end |