Add latest changes from gitlab-org/gitlab@master

2 files changed, 15 insertions, 7 deletions

diff --git a/qa/qa/page/project/registry/show.rb b/qa/qa/page/project/registry/show.rb
index 270445560be..95850f34962 100644
--- a/qa/qa/page/project/registry/show.rb
+++ b/qa/qa/page/project/registry/show.rb
@@ -11,10 +11,8 @@ module QA
 
           view 'app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue' do
             element :more_actions_menu
-          end
-
-          view 'app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue' do
             element :tag_delete_button
+            element :tag_name_content
           end
 
           def has_registry_repository?(name)
@@ -26,11 +24,11 @@ module QA
           end
 
           def has_tag?(tag_name)
-            has_button?(tag_name)
+            has_element?(:tag_name_content, text: tag_name)
           end
 
           def has_no_tag?(tag_name)
-            has_no_button?(tag_name)
+            has_no_element?(:tag_name_content, text: tag_name)
           end
 
           def click_delete
diff --git a/qa/qa/resource/project.rb b/qa/qa/resource/project.rb
index 2db4f4b5f65..59964c5833d 100644
--- a/qa/qa/resource/project.rb
+++ b/qa/qa/resource/project.rb
@@ -7,14 +7,15 @@ module QA
       include Members
       include Visibility
 
-      attr_accessor :repository_storage, # requires admin access
-                    :initialize_with_readme,
+      attr_accessor :initialize_with_readme,
                     :auto_devops_enabled,
                     :github_personal_access_token,
                     :github_repository_path,
                     :gitlab_repository_path,
                     :personal_namespace
 
+      attr_reader :repository_storage
+
       attributes :id,
                  :name,
                  :path,
@@ -70,6 +71,15 @@ module QA
         @name = @add_name_uuid ? "#{raw_name}-#{SecureRandom.hex(8)}" : raw_name
       end
 
+      # Sets the project's repository storage
+      # This feature requires admin access so be sure to fabricate the project as an admin user, and add the metadata
+      # `:requires_admin` to the test it's used in.
+      def repository_storage=(name)
+        raise ArgumentError, "Please provide a valid repository storage name" if name.to_s.empty?
+
+        @repository_storage = name
+      end
+
       def fabricate!
         return if @import