Merge branch 'ml-update-blank-repo-no-branch-tests' into 'master'

Fix e2e tests that fail when the default branch is 'main'

See merge request gitlab-org/gitlab!52041

qa/qa/resource/project.rb

@@ -25,10 +25,6 @@ module QA
       attribute :template_name
       attribute :import
 
-      attribute :default_branch do
-        api_response[:default_branch] || Runtime::Env.default_branch
-      end
-
       attribute :group do
         Group.fabricate!
       end
@@ -224,6 +220,10 @@ module QA
         parse_body(get(Runtime::API::Request.new(api_client, api_commits_path).url))
       end
 
+      def default_branch
+        reload!.api_response[:default_branch] || Runtime::Env.default_branch
+      end
+
       def import_status
         response = get Runtime::API::Request.new(api_client, "/projects/#{id}/import").url
 

qa/qa/resource/repository/wiki_push.rb

@@ -12,14 +12,11 @@ module QA
           end
         end
 
-        def branch_name
-          @branch_name ||= wiki.project.default_branch
-        end
-
         def initialize
           @file_name = 'Home.md'
           @file_content = 'This line was created using git push'
           @commit_message = 'Updating using git push'
+          @branch_name = 'master'
           @new_branch = false
         end
 

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

@@ -14,10 +14,12 @@ module QA
         Git::Repository.perform do |repository|
           repository.uri = project.repository_http_location.uri
           repository.use_default_credentials
+          repository.default_branch = project.default_branch
 
           repository.act do
             clone
             configure_identity('GitLab QA', 'root@gitlab.com')
+            checkout(default_branch, new_branch: true)
             commit_file('test.rb', 'class Test; end', 'Add Test class')
             commit_file('README.md', '# Test', 'Add Readme')
             push_changes

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

@@ -26,6 +26,8 @@ module QA
           repository.use_default_credentials
           repository.clone
           repository.configure_identity(username, email)
+          repository.default_branch = project.default_branch
+          repository.checkout(project.default_branch, new_branch: true)
 
           git_protocol_reported = repository.push_with_git_protocol(
             git_protocol,

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

@@ -49,6 +49,8 @@ module QA
             repository.use_ssh_key(ssh_key)
             repository.clone
             repository.configure_identity(username, email)
+            repository.default_branch = project.default_branch
+            repository.checkout(project.default_branch, new_branch: true)
 
             git_protocol_reported = repository.push_with_git_protocol(
               git_protocol,