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/stores/actions_spec.js b/spec/frontend/ide/stores/actions_spec.js
index ad55313da93..e575667b8c6 100644
--- a/spec/frontend/ide/stores/actions_spec.js
+++ b/spec/frontend/ide/stores/actions_spec.js
@@ -777,7 +777,7 @@ describe('Multi-file store actions', () => {
 
       it('routes to the renamed file if the original file has been opened', (done) => {
         store.state.currentProjectId = 'test/test';
-        store.state.currentBranchId = 'master';
+        store.state.currentBranchId = 'main';
 
         Object.assign(store.state.entries.orig, {
           opened: true,
@@ -790,7 +790,7 @@ describe('Multi-file store actions', () => {
           })
           .then(() => {
             expect(router.push.mock.calls).toHaveLength(1);
-            expect(router.push).toHaveBeenCalledWith(`/project/test/test/tree/master/-/renamed/`);
+            expect(router.push).toHaveBeenCalledWith(`/project/test/test/tree/main/-/renamed/`);
           })
           .then(done)
           .catch(done.fail);
@@ -1019,7 +1019,7 @@ describe('Multi-file store actions', () => {
           },
           {
             projectId: 'abc/def',
-            branchId: 'master-testing',
+            branchId: 'main-testing',
           },
         ];
         dispatch = jest.fn();