Merge branch '327686-update-merge-request-specs' into 'master'

Update default branch name in merge request specs

See merge request gitlab-org/gitlab!60623

spec/frontend/create_merge_request_dropdown_spec.js

@@ -56,7 +56,7 @@ describe('CreateMergeRequestDropdown', () => {
   describe('updateCreatePaths', () => {
     it('escapes branch names correctly', () => {
       dropdown.createBranchPath = `${TEST_HOST}/branches?branch_name=some-branch&issue=42`;
-      dropdown.createMrPath = `${TEST_HOST}/create_merge_request?branch_name=some-branch&ref=master`;
+      dropdown.createMrPath = `${TEST_HOST}/create_merge_request?branch_name=some-branch&ref=main`;
 
       dropdown.updateCreatePaths('branch', 'contains#hash');
 
@@ -65,7 +65,7 @@ describe('CreateMergeRequestDropdown', () => {
       );
 
       expect(dropdown.createMrPath).toBe(
-        `${TEST_HOST}/create_merge_request?branch_name=contains%23hash&ref=master`,
+        `${TEST_HOST}/create_merge_request?branch_name=contains%23hash&ref=main`,
       );
     });
   });

spec/frontend/merge_conflicts/components/merge_conflict_resolver_app_spec.js

@@ -57,7 +57,7 @@ describe('Merge Conflict Resolver App', () => {
     const title = findConflictsCount();
 
     expect(title.exists()).toBe(true);
-    expect(title.text().trim()).toBe('Showing 3 conflicts between test-conflicts and master');
+    expect(title.text().trim()).toBe('Showing 3 conflicts between test-conflicts and main');
   });
 
   describe('files', () => {

spec/frontend/merge_conflicts/mock_data.js

 export const conflictsMock = {
-  target_branch: 'master',
+  target_branch: 'main',
   source_branch: 'test-conflicts',
   commit_sha: '6dbf385a3c7bf01e09b5d2d9e5d72f8fb8c590a3',
   commit_message:
-    "Merge branch 'master' into 'test-conflicts'\n\n# Conflicts:\n#   .gitlab-ci.yml\n#   README.md",
+    "Merge branch 'main' into 'test-conflicts'\n\n# Conflicts:\n#   .gitlab-ci.yml\n#   README.md",
   files: [
     {
       old_path: '.gitlab-ci.yml',