Merge branch 'qa-ml-refactor-protected-branch-test' into 'master'

Refactor protected branch resource and spec

See merge request gitlab-org/gitlab-ee!16310

qa/qa.rb

@@ -54,7 +54,7 @@ module QA
     autoload :MergeRequestFromFork, 'qa/resource/merge_request_from_fork'
     autoload :DeployKey, 'qa/resource/deploy_key'
     autoload :DeployToken, 'qa/resource/deploy_token'
-    autoload :Branch, 'qa/resource/branch'
+    autoload :ProtectedBranch, 'qa/resource/protected_branch'
     autoload :CiVariable, 'qa/resource/ci_variable'
     autoload :Runner, 'qa/resource/runner'
     autoload :PersonalAccessToken, 'qa/resource/personal_access_token'

qa/qa/resource/branch.rb → qa/qa/resource/protected_branch.rb

@@ -2,13 +2,24 @@
 
 module QA
   module Resource
-    class Branch < Base
-      attr_accessor :project, :branch_name,
-                    :allow_to_push, :allow_to_merge, :protected
+    class ProtectedBranch < Base
+      attr_accessor :branch_name, :allow_to_push, :allow_to_merge, :protected
 
       attribute :project do
-        Project.fabricate! do |resource|
+        Project.fabricate_via_api! do |resource|
           resource.name = 'protected-branch-project'
+          resource.initialize_with_readme = true
+        end
+      end
+
+      attribute :branch do
+        Repository::ProjectPush.fabricate! do |project_push|
+          project_push.project = project
+          project_push.file_name = 'new_file.md'
+          project_push.commit_message = 'Add new file'
+          project_push.branch_name = branch_name
+          project_push.new_branch = true
+          project_push.remote_branch = @branch_name
         end
       end
 
@@ -20,32 +31,16 @@ module QA
       end
 
       def fabricate!
-        project.visit!
-
-        Repository::ProjectPush.fabricate! do |resource|
-          resource.project = project
-          resource.file_name = 'kick-off.txt'
-          resource.commit_message = 'First commit'
-        end
+        populate(:branch)
 
-        branch = Repository::ProjectPush.fabricate! do |resource|
-          resource.project = project
-          resource.file_name = 'README.md'
-          resource.commit_message = 'Add readme'
-          resource.branch_name = 'master'
-          resource.new_branch = false
-          resource.remote_branch = @branch_name
-        end
-
-        Page::Project::Show.perform do |page|
-          page.wait { page.has_content?(branch_name) }
-        end
+        project.wait_for_push_new_branch @branch_name
 
         # The upcoming process will make it access the Protected Branches page,
         # select the already created branch and protect it according
         # to `allow_to_push` variable.
         return branch unless @protected
 
+        project.visit!
         Page::Project::Menu.perform(&:go_to_repository_settings)
 
         Page::Project::Settings::Repository.perform do |setting|

qa/qa/resource/repository/project_push.rb

@@ -33,7 +33,6 @@ module QA
         def fabricate!
           super
           project.wait_for_push @commit_message if @wait_for_push
-          project.visit!
         end
       end
     end

qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb

@@ -8,6 +8,7 @@ module QA
       let(:project) do
         Resource::Project.fabricate! do |resource|
           resource.name = 'protected-branch-project'
+          resource.initialize_with_readme = true
         end
       end
 
@@ -42,7 +43,7 @@ module QA
       end
 
       def create_protected_branch(allow_to_push:)
-        Resource::Branch.fabricate! do |resource|
+        Resource::ProtectedBranch.fabricate! do |resource|
           resource.branch_name = branch_name
           resource.project = project
           resource.allow_to_push = allow_to_push

qa/qa/specs/features/browser_ui/4_verify/pipeline/create_and_process_pipeline_spec.rb

@@ -58,7 +58,7 @@ module QA
                 paths:
                 - my-artifacts/
           EOF
-        end
+        end.project.visit!
 
         expect(page).to have_content('Add .gitlab-ci.yml')
 

qa/qa/specs/features/ee/browser_ui/3_create/elasticsearch/elasticsearch_reindexing_spec.rb

@@ -23,7 +23,7 @@ module QA
           push.project = @project
           push.file_name = @project_file_name
           push.file_content = @project_file_content
-        end
+        end.project.visit!
       end
 
       it 'tests reindexing after push' do

qa/qa/specs/features/ee/browser_ui/3_create/repository/file_locking_spec.rb

@@ -23,7 +23,7 @@ module QA
         add_to_project user: @user_one
         add_to_project user: @user_two
 
-        Resource::Branch.unprotect_via_api! do |branch|
+        Resource::ProtectedBranch.unprotect_via_api! do |branch|
           branch.project = @project
           branch.branch_name = 'master'
         end

qa/qa/specs/features/ee/browser_ui/geo/http_push_spec.rb

@@ -34,7 +34,7 @@ module QA
               push.file_name = file_name
               push.file_content = "# #{file_content}"
               push.commit_message = 'Add README.md'
-            end
+            end.project.visit!
 
             # Validate git push worked and file exists with content
             Page::Project::Show.perform do |show|
@@ -99,6 +99,7 @@ module QA
             expect(push.output).to match(/Locking support detected on remote/)
 
             # Validate git push worked and file exists with content
+            push.project.visit!
             Page::Project::Show.perform do |show|
               show.wait_for_repository_replication
 

qa/qa/specs/features/ee/browser_ui/geo/ssh_push_spec.rb

@@ -42,7 +42,7 @@ module QA
               push.file_name = file_name
               push.file_content = "# #{file_content}"
               push.commit_message = 'Add README.md'
-            end
+            end.project.visit!
 
             # Validate git push worked and file exists with content
             Page::Project::Show.perform do |show|
@@ -121,6 +121,7 @@ module QA
             expect(push.output).to match(/Locking support detected on remote/)
 
             # Validate git push worked and file exists with content
+            push.project.visit!
             Page::Project::Show.perform do |show|
               show.wait_for_repository_replication
 

qa/qa/specs/features/ee/browser_ui/secure/security_reports_spec.rb

@@ -40,7 +40,7 @@ module QA
             .new(__dir__)
             .join('../../../../../ee/fixtures/secure_premade_reports')
           push.commit_message = 'Create Secure compatible application to serve premade reports'
-        end
+        end.project.visit!
 
         Page::Project::Menu.perform(&:click_ci_cd_pipelines)
         Page::Project::Pipeline::Index.perform(&:click_on_latest_pipeline)