Add latest changes from gitlab-org/gitlab@master

2 files changed, 374 insertions, 62 deletions

diff --git a/qa/lib/gitlab/page/group/settings/usage_quota.stub.rb b/qa/lib/gitlab/page/group/settings/usage_quota.stub.rb
index 192e71e6c90..2a5d9a6bb5e 100644
--- a/qa/lib/gitlab/page/group/settings/usage_quota.stub.rb
+++ b/qa/lib/gitlab/page/group/settings/usage_quota.stub.rb
@@ -5,51 +5,51 @@ module Gitlab
     module Group
       module Settings
         module UsageQuota
-          # @note Defined as +link :pipeline_tab+
-          # Clicks +pipeline_tab+
-          def pipeline_tab
+          # @note Defined as +link :seats_tab+
+          # Clicks +seats_tab+
+          def seats_tab
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
           # @example
           #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
-          #     expect(usage_quota.pipeline_tab_element).to exist
+          #     expect(usage_quota.seats_tab_element).to exist
           #   end
           # @return [Watir::Link] The raw +Link+ element
-          def pipeline_tab_element
+          def seats_tab_element
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
           # @example
           #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
-          #     expect(usage_quota).to be_pipeline_tab
+          #     expect(usage_quota).to be_seats_tab
           #   end
-          # @return [Boolean] true if the +pipeline_tab+ element is present on the page
-          def pipeline_tab?
+          # @return [Boolean] true if the +seats_tab+ element is present on the page
+          def seats_tab?
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
-          # @note Defined as +link :storage_tab+
-          # Clicks +storage_tab+
-          def storage_tab
+          # @note Defined as +link :pipelines_tab+
+          # Clicks +pipelines_tab+
+          def pipelines_tab
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
           # @example
           #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
-          #     expect(usage_quota.storage_tab_element).to exist
+          #     expect(usage_quota.pipelines_tab_element).to exist
           #   end
           # @return [Watir::Link] The raw +Link+ element
-          def storage_tab_element
+          def pipelines_tab_element
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
           # @example
           #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
-          #     expect(usage_quota).to be_storage_tab
+          #     expect(usage_quota).to be_pipelines_tab
           #   end
-          # @return [Boolean] true if the +storage_tab+ element is present on the page
-          def storage_tab?
+          # @return [Boolean] true if the +pipelines_tab+ element is present on the page
+          def pipelines_tab?
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
@@ -77,6 +77,102 @@ module Gitlab
             # 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
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota.plan_ci_minutes_element).to exist
+          #   end
+          # @return [Watir::Div] The raw +Div+ element
+          def plan_ci_minutes_element
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota).to be_plan_ci_minutes
+          #   end
+          # @return [Boolean] true if the +plan_ci_minutes+ element is present on the page
+          def plan_ci_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
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota.additional_ci_minutes_element).to exist
+          #   end
+          # @return [Watir::Div] The raw +Div+ element
+          def additional_ci_minutes_element
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota).to be_additional_ci_minutes
+          #   end
+          # @return [Boolean] true if the +additional_ci_minutes+ element is present on the page
+          def additional_ci_minutes?
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @note Defined as +div :ci_purchase_successful_alert+
+          # @return [String] The text content or value of +ci_purchase_successful_alert+
+          def ci_purchase_successful_alert
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota.ci_purchase_successful_alert_element).to exist
+          #   end
+          # @return [Watir::Div] The raw +Div+ element
+          def ci_purchase_successful_alert_element
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota).to be_ci_purchase_successful_alert
+          #   end
+          # @return [Boolean] true if the +ci_purchase_successful_alert+ element is present on the page
+          def ci_purchase_successful_alert?
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @note Defined as +link :storage_tab+
+          # Clicks +storage_tab+
+          def storage_tab
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota.storage_tab_element).to exist
+          #   end
+          # @return [Watir::Link] The raw +Link+ element
+          def storage_tab_element
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota).to be_storage_tab
+          #   end
+          # @return [Boolean] true if the +storage_tab+ element is present on the page
+          def storage_tab?
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
           # @note Defined as +link :buy_storage+
           # Clicks +buy_storage+
           def buy_storage
@@ -101,123 +197,315 @@ module Gitlab
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
-          # @note Defined as +strong :additional_minutes+
-          # @return [String] The text content or value of +additional_minutes+
-          def additional_minutes
+          # @note Defined as +div :used_storage_message+
+          # @return [String] The text content or value of +used_storage_message+
+          def used_storage_message
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota.used_storage_message_element).to exist
+          #   end
+          # @return [Watir::Div] The raw +Div+ element
+          def used_storage_message_element
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota).to be_used_storage_message
+          #   end
+          # @return [Boolean] true if the +used_storage_message+ element is present on the page
+          def used_storage_message?
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @note Defined as +div :group_usage_message+
+          # @return [String] The text content or value of +group_usage_message+
+          def group_usage_message
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota.group_usage_message_element).to exist
+          #   end
+          # @return [Watir::Div] The raw +Div+ element
+          def group_usage_message_element
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota).to be_group_usage_message
+          #   end
+          # @return [Boolean] true if the +group_usage_message+ element is present on the page
+          def group_usage_message?
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @note Defined as +div :dependency_proxy_usage+
+          # @return [String] The text content or value of +dependency_proxy_usage+
+          def dependency_proxy_usage
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota.dependency_proxy_usage_element).to exist
+          #   end
+          # @return [Watir::Div] The raw +Div+ element
+          def dependency_proxy_usage_element
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota).to be_dependency_proxy_usage
+          #   end
+          # @return [Boolean] true if the +dependency_proxy_usage+ element is present on the page
+          def dependency_proxy_usage?
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @note Defined as +span :dependency_proxy_size+
+          # @return [String] The text content or value of +dependency_proxy_size+
+          def dependency_proxy_size
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
           # @example
           #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
-          #     expect(usage_quota.additional_minutes_element).to exist
+          #     expect(usage_quota.dependency_proxy_size_element).to exist
           #   end
-          # @return [Watir::Strong] The raw +Strong+ element
-          def additional_minutes_element
+          # @return [Watir::Span] The raw +Span+ element
+          def dependency_proxy_size_element
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
           # @example
           #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
-          #     expect(usage_quota).to be_additional_minutes
+          #     expect(usage_quota).to be_dependency_proxy_size
           #   end
-          # @return [Boolean] true if the +additional_minutes+ element is present on the page
-          def additional_minutes?
+          # @return [Boolean] true if the +dependency_proxy_size+ element is present on the page
+          def dependency_proxy_size?
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
-          # @note Defined as +div :additional_minutes_usage+
-          # @return [String] The text content or value of +additional_minutes_usage+
-          def additional_minutes_usage
+          # @note Defined as +div :container_registry_usage+
+          # @return [String] The text content or value of +container_registry_usage+
+          def container_registry_usage
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
           # @example
           #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
-          #     expect(usage_quota.additional_minutes_usage_element).to exist
+          #     expect(usage_quota.container_registry_usage_element).to exist
           #   end
           # @return [Watir::Div] The raw +Div+ element
-          def additional_minutes_usage_element
+          def container_registry_usage_element
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
           # @example
           #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
-          #     expect(usage_quota).to be_additional_minutes_usage
+          #     expect(usage_quota).to be_container_registry_usage
           #   end
-          # @return [Boolean] true if the +additional_minutes_usage+ element is present on the page
-          def additional_minutes_usage?
+          # @return [Boolean] true if the +container_registry_usage+ element is present on the page
+          def container_registry_usage?
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
-          # @note Defined as +strong :plan_minutes+
-          # @return [String] The text content or value of +plan_minutes+
-          def plan_minutes
+          # @note Defined as +div :project_storage_used+
+          # @return [String] The text content or value of +project_storage_used+
+          def project_storage_used
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
           # @example
           #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
-          #     expect(usage_quota.plan_minutes_element).to exist
+          #     expect(usage_quota.project_storage_used_element).to exist
           #   end
-          # @return [Watir::Strong] The raw +Strong+ element
-          def plan_minutes_element
+          # @return [Watir::Div] The raw +Div+ element
+          def project_storage_used_element
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
           # @example
           #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
-          #     expect(usage_quota).to be_plan_minutes
+          #     expect(usage_quota).to be_project_storage_used
           #   end
-          # @return [Boolean] true if the +plan_minutes+ element is present on the page
-          def plan_minutes?
+          # @return [Boolean] true if the +project_storage_used+ element is present on the page
+          def project_storage_used?
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
-          # @note Defined as +div :plan_minutes_usage+
-          # @return [String] The text content or value of +plan_minutes_usage+
-          def plan_minutes_usage
+          # @note Defined as +div :project+
+          # @return [String] The text content or value of +project+
+          def project
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
           # @example
           #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
-          #     expect(usage_quota.plan_minutes_usage_element).to exist
+          #     expect(usage_quota.project_element).to exist
           #   end
           # @return [Watir::Div] The raw +Div+ element
-          def plan_minutes_usage_element
+          def project_element
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
           # @example
           #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
-          #     expect(usage_quota).to be_plan_minutes_usage
+          #     expect(usage_quota).to be_project
           #   end
-          # @return [Boolean] true if the +plan_minutes_usage+ element is present on the page
-          def plan_minutes_usage?
+          # @return [Boolean] true if the +project+ element is present on the page
+          def project?
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
-          # @note Defined as +div :purchase_successful_alert+
-          # @return [String] The text content or value of +purchase_successful_alert+
-          def purchase_successful_alert
+          # @note Defined as +div :storage_type_legend+
+          # @return [String] The text content or value of +storage_type_legend+
+          def storage_type_legend
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
           # @example
           #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
-          #     expect(usage_quota.purchase_successful_alert_element).to exist
+          #     expect(usage_quota.storage_type_legend_element).to exist
           #   end
           # @return [Watir::Div] The raw +Div+ element
-          def purchase_successful_alert_element
+          def storage_type_legend_element
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota).to be_storage_type_legend
+          #   end
+          # @return [Boolean] true if the +storage_type_legend+ element is present on the page
+          def storage_type_legend?
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @note Defined as +span :container_registry_size+
+          # @return [String] The text content or value of +container_registry_size+
+          def container_registry_size
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota.container_registry_size_element).to exist
+          #   end
+          # @return [Watir::Span] The raw +Span+ element
+          def container_registry_size_element
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota).to be_container_registry_size
+          #   end
+          # @return [Boolean] true if the +container_registry_size+ element is present on the page
+          def container_registry_size?
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @note Defined as +div :purchased_usage_total_free+
+          # @return [String] The text content or value of +purchased_usage_total_free+
+          def purchased_usage_total_free
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota.purchased_usage_total_free_element).to exist
+          #   end
+          # @return [Watir::Div] The raw +Div+ element
+          def purchased_usage_total_free_element
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota).to be_purchased_usage_total_free
+          #   end
+          # @return [Boolean] true if the +purchased_usage_total_free+ element is present on the page
+          def purchased_usage_total_free?
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @note Defined as +span :purchased_usage_total+
+          # @return [String] The text content or value of +purchased_usage_total+
+          def purchased_usage_total
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota.purchased_usage_total_element).to exist
+          #   end
+          # @return [Watir::Span] The raw +Span+ element
+          def purchased_usage_total_element
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota).to be_purchased_usage_total
+          #   end
+          # @return [Boolean] true if the +purchased_usage_total+ element is present on the page
+          def purchased_usage_total?
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @note Defined as +div :storage_purchase_successful_alert+
+          # @return [String] The text content or value of +storage_purchase_successful_alert+
+          def storage_purchase_successful_alert
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota.storage_purchase_successful_alert_element).to exist
+          #   end
+          # @return [Watir::Div] The raw +Div+ element
+          def storage_purchase_successful_alert_element
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota).to be_storage_purchase_successful_alert
+          #   end
+          # @return [Boolean] true if the +storage_purchase_successful_alert+ element is present on the page
+          def storage_purchase_successful_alert?
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @note Defined as +h2 :storage_available_alert+
+          # @return [String] The text content or value of +storage_available_alert+
+          def storage_available_alert
+            # This is a stub, used for indexing. The method is dynamically generated.
+          end
+
+          # @example
+          #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
+          #     expect(usage_quota.storage_available_alert_element).to exist
+          #   end
+          # @return [Watir::H2] The raw +H2+ element
+          def storage_available_alert_element
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
           # @example
           #   Gitlab::Page::Group::Settings::UsageQuota.perform do |usage_quota|
-          #     expect(usage_quota).to be_purchase_successful_alert
+          #     expect(usage_quota).to be_storage_available_alert
           #   end
-          # @return [Boolean] true if the +purchase_successful_alert+ element is present on the page
-          def purchase_successful_alert?
+          # @return [Boolean] true if the +storage_available_alert+ element is present on the page
+          def storage_available_alert?
             # This is a stub, used for indexing. The method is dynamically generated.
           end
         end
diff --git a/qa/lib/gitlab/page/group/settings/usage_quotas.rb b/qa/lib/gitlab/page/group/settings/usage_quotas.rb
index 596f9cd7748..a1ab345bf1e 100644
--- a/qa/lib/gitlab/page/group/settings/usage_quotas.rb
+++ b/qa/lib/gitlab/page/group/settings/usage_quotas.rb
@@ -5,15 +5,30 @@ module Gitlab
     module Group
       module Settings
         class UsageQuotas < Chemlab::Page
+          # Seats section
+          link :seats_tab
+
+          # Pipelines section
           link :pipelines_tab
-          link :storage_tab
           link :buy_ci_minutes
-          link :purchase_more_storage
           div :plan_ci_minutes
           div :additional_ci_minutes
-          span :purchased_usage_total
-          div :purchased_usage_total_free, 'data-testid': 'purchased-usage-card' # Different UI for free namespace
           div :ci_purchase_successful_alert, text: /You have successfully purchased CI minutes/
+
+          # Storage section
+          link :storage_tab
+          link :purchase_more_storage
+          div :used_storage_message
+          div :group_usage_message
+          div :dependency_proxy_usage
+          span :dependency_proxy_size
+          div :container_registry_usage
+          div :project_storage_used
+          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 :storage_purchase_successful_alert, text: /You have successfully purchased a storage/
           h2 :storage_available_alert, text: /purchased storage is available/
 
@@ -34,6 +49,15 @@ module Gitlab
             false
           end
 
+          # Waits and Checks if storage project data loaded
+          #
+          # @return [Boolean] True if the alert presents, false if not after 5 second wait
+          def project_storage_data_available?
+            storage_type_legend_element.wait_until(timeout: 3, &: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