Merge branch 'ml-update-test-filename' into 'master'

Use unique filename in case of retries

See merge request gitlab-org/gitlab!21712

qa/qa/resource/merge_request.rb

@@ -54,7 +54,7 @@ module QA
         @assignee = nil
         @milestone = nil
         @labels = []
-        @file_name = "added_file.txt"
+        @file_name = "added_file-#{SecureRandom.hex(8)}.txt"
         @file_content = "File Added"
         @target_new_branch = true
         @no_preparation = false

qa/qa/resource/merge_request_from_fork.rb

 # frozen_string_literal: true
 
+require 'securerandom'
+
 module QA
   module Resource
     class MergeRequestFromFork < MergeRequest
@@ -13,7 +15,7 @@ module QA
         Repository::ProjectPush.fabricate! do |resource|
           resource.project = fork.project
           resource.branch_name = fork_branch
-          resource.file_name = 'file2.txt'
+          resource.file_name = "file2-#{SecureRandom.hex(8)}.txt"
           resource.user = fork.user
         end
       end

qa/qa/resource/protected_branch.rb

 # frozen_string_literal: true
 
+require 'securerandom'
+
 module QA
   module Resource
     class ProtectedBranch < Base
@@ -15,7 +17,7 @@ module QA
       attribute :branch do
         Repository::ProjectPush.fabricate! do |project_push|
           project_push.project = project
-          project_push.file_name = 'new_file.md'
+          project_push.file_name = "new_file-#{SecureRandom.hex(8)}.md"
           project_push.commit_message = 'Add new file'
           project_push.branch_name = branch_name
           project_push.new_branch = true

qa/qa/resource/repository/project_push.rb

 # frozen_string_literal: true
 
+require 'securerandom'
+
 module QA
   module Resource
     module Repository
@@ -15,7 +17,7 @@ module QA
         end
 
         def initialize
-          @file_name = 'file.txt'
+          @file_name = "file-#{SecureRandom.hex(8)}.txt"
           @file_content = '# This is test project'
           @commit_message = "This is a test commit"
           @branch_name = 'master'

qa/qa/resource/repository/push.rb

 # frozen_string_literal: true
 
 require 'pathname'
+require 'securerandom'
 
 module QA
   module Resource
@@ -13,7 +14,7 @@ module QA
         attr_writer :remote_branch, :gpg_key_id
 
         def initialize
-          @file_name = 'file.txt'
+          @file_name = "file-#{SecureRandom.hex(8)}.txt"
           @file_content = '# This is test file'
           @commit_message = "This is a test commit"
           @branch_name = 'master'

qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb

@@ -4,12 +4,7 @@ module QA
   context 'Create' do
     describe 'Download merge request patch and diff' do
       before(:context) do
-        project = Resource::Project.fabricate_via_api! do |project|
-          project.name = 'project'
-        end
-
         @merge_request = Resource::MergeRequest.fabricate_via_api! do |merge_request|
-          merge_request.project = project
           merge_request.title = 'This is a merge request'
           merge_request.description = '... for downloading patches and diffs'
         end
@@ -23,7 +18,7 @@ module QA
 
         expect(page.text).to start_with('From')
         expect(page).to have_content('Subject: [PATCH] This is a test commit')
-        expect(page).to have_content('diff --git a/added_file.txt b/added_file.txt')
+        expect(page).to have_content("diff --git a/#{@merge_request.file_name} b/#{@merge_request.file_name}")
       end
 
       it 'views the merge request plain diff' do
@@ -32,7 +27,7 @@ module QA
         @merge_request.visit!
         Page::MergeRequest::Show.perform(&:view_plain_diff)
 
-        expect(page.text).to start_with('diff --git a/added_file.txt b/added_file.txt')
+        expect(page.text).to start_with("diff --git a/#{@merge_request.file_name} b/#{@merge_request.file_name}")
         expect(page).to have_content('+File Added')
       end
     end

qa/qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb

@@ -59,7 +59,7 @@ module QA
           commit.update_files(
             [
               {
-                file_path: 'added_file.txt',
+                file_path: merge_request.file_name,
                 content: "File updated"
               }
             ]

qa/qa/specs/features/ee/browser_ui/6_release/pipelines_for_merged_results_and_merge_trains_spec.rb

@@ -57,6 +57,7 @@ module QA
           project_push.project = @project
           project_push.new_branch = true
           project_push.branch_name = branch_name
+          project_push.file_name = "file-#{SecureRandom.hex(8)}.txt"
         end
 
         # Create a merge request to merge the branch we just created
@@ -91,7 +92,7 @@ module QA
           project_push.project = @project
           project_push.new_branch = true
           project_push.branch_name = branch_name
-          project_push.file_name = "another_file.txt"
+          project_push.file_name = "file-#{SecureRandom.hex(8)}.txt"
           project_push.file_content = "merge me"
         end