Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 166 deletions

diff --git a/qa/lib/gitlab/page/group/settings/usage_quotas.rb b/qa/lib/gitlab/page/group/settings/usage_quotas.rb
index cdb0760ad9c..8ae9e8fd25a 100644
--- a/qa/lib/gitlab/page/group/settings/usage_quotas.rb
+++ b/qa/lib/gitlab/page/group/settings/usage_quotas.rb
@@ -6,14 +6,10 @@ module Gitlab
       module Settings
         class UsageQuotas < Chemlab::Page
           # Seats section
-          link :seats_tab
           div :seats_in_use
           p :seats_used
           p :seats_owed
           table :subscription_users
-          div :pending_members_alert
-          button :remove_user
-          button :view_pending_approvals, text: /View pending approvals/
 
           # Pipelines section
           link :pipelines_tab
@@ -27,23 +23,17 @@ module Gitlab
           link :purchase_more_storage
           div :namespace_usage_total
           div :group_usage_message
-          div :dependency_proxy_usage
           span :dependency_proxy_size
-          div :container_registry_usage
-          div :project
-          div :storage_type_legend
-          span :container_registry_size
-          div :storage_purchased, 'data-testid': 'storage-purchased'
+          div :storage_purchased
           div :storage_purchase_successful_alert, text: /You have successfully purchased a storage/
           span :project_repository_size
-          span :project_lfs_object_size
-          span :project_build_artifact_size
-          span :project_packages_size
           span :project_wiki_size
           span :project_snippets_size
           span :project_containers_registry_size
 
           # Pending members
+          button :view_pending_approvals, text: /View pending approvals/
+          div :pending_members_alert
           div :pending_members
           button :approve_member
           button :confirm_member_approval, text: /^OK$/
@@ -62,15 +52,6 @@ module Gitlab
             additional_ci_minutes?
           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
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 8099d1cf53a..748c9a82d59 100644
--- a/qa/lib/gitlab/page/group/settings/usage_quotas.stub.rb
+++ b/qa/lib/gitlab/page/group/settings/usage_quotas.stub.rb
@@ -5,30 +5,6 @@ module Gitlab
     module Group
       module Settings
         module UsageQuotas
-          # @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::UsageQuotas.perform do |usage_quotas|
-          #     expect(usage_quotas.seats_tab_element).to exist
-          #   end
-          # @return [Watir::Link] The raw +Link+ element
-          def seats_tab_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_seats_tab
-          #   end
-          # @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 +div :seats_in_use+
           # @return [String] The text content or value of +seats_in_use+
           def seats_in_use
@@ -125,30 +101,6 @@ module Gitlab
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
-          # @note Defined as +button :remove_user+
-          # Clicks +remove_user+
-          def remove_user
-            # 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.remove_user_element).to exist
-          #   end
-          # @return [Watir::Button] The raw +Button+ element
-          def remove_user_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_remove_user
-          #   end
-          # @return [Boolean] true if the +remove_user+ element is present on the page
-          def remove_user?
-            # This is a stub, used for indexing. The method is dynamically generated.
-          end
-
           # @note Defined as +link :pipelines_tab+
           # Clicks +pipelines_tab+
           def pipelines_tab
@@ -365,30 +317,6 @@ module Gitlab
             # 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::UsageQuotas.perform do |usage_quotas|
-          #     expect(usage_quotas.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::UsageQuotas.perform do |usage_quotas|
-          #     expect(usage_quotas).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
@@ -413,30 +341,6 @@ module Gitlab
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
-          # @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::UsageQuotas.perform do |usage_quotas|
-          #     expect(usage_quotas.container_registry_usage_element).to exist
-          #   end
-          # @return [Watir::Div] The raw +Div+ element
-          def container_registry_usage_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_container_registry_usage
-          #   end
-          # @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 +div :project_storage_used+
           # @return [String] The text content or value of +project_storage_used+
           def project_storage_used
@@ -485,54 +389,6 @@ module Gitlab
             # This is a stub, used for indexing. The method is dynamically generated.
           end
 
-          # @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::UsageQuotas.perform do |usage_quotas|
-          #     expect(usage_quotas.storage_type_legend_element).to exist
-          #   end
-          # @return [Watir::Div] The raw +Div+ element
-          def storage_type_legend_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_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::UsageQuotas.perform do |usage_quotas|
-          #     expect(usage_quotas.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::UsageQuotas.perform do |usage_quotas|
-          #     expect(usage_quotas).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 :storage_purchased+
           # @return [String] The text content or value of +storage_purchased+
           def storage_purchased