Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 3 insertions, 3 deletions

diff --git a/spec/frontend/ide/components/commit_sidebar/new_merge_request_option_spec.js b/spec/frontend/ide/components/commit_sidebar/new_merge_request_option_spec.js
index 253c2a426ee..4474647552d 100644
--- a/spec/frontend/ide/components/commit_sidebar/new_merge_request_option_spec.js
+++ b/spec/frontend/ide/components/commit_sidebar/new_merge_request_option_spec.js
@@ -24,7 +24,7 @@ describe('create new MR checkbox', () => {
     store.state.projects[store.state.currentProjectId].userPermissions = permissions;
   };
 
-  const createComponent = ({ currentBranchId = 'master', createNewBranch = false } = {}) => {
+  const createComponent = ({ currentBranchId = 'main', createNewBranch = false } = {}) => {
     const Component = Vue.extend(NewMergeRequestOption);
 
     vm = createComponentWithStore(Component, store);
@@ -63,7 +63,7 @@ describe('create new MR checkbox', () => {
     describe('is rendered when pushing to a new branch', () => {
       beforeEach(() => {
         createComponent({
-          currentBranchId: 'master',
+          currentBranchId: 'main',
           createNewBranch: true,
         });
       });
@@ -87,7 +87,7 @@ describe('create new MR checkbox', () => {
     describe('is NOT rendered when pushing to the same branch', () => {
       beforeEach(() => {
         createComponent({
-          currentBranchId: 'master',
+          currentBranchId: 'main',
           createNewBranch: false,
         });
       });