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

1 files changed, 4 insertions, 4 deletions

diff --git a/spec/frontend/ide/components/repo_editor_spec.js b/spec/frontend/ide/components/repo_editor_spec.js
index 646e51160d8..8e8fb31b15a 100644
--- a/spec/frontend/ide/components/repo_editor_spec.js
+++ b/spec/frontend/ide/components/repo_editor_spec.js
@@ -63,8 +63,8 @@ const prepareStore = (state, activeFile) => {
     projects: {
       'gitlab-org/gitlab': {
         branches: {
-          master: {
-            name: 'master',
+          main: {
+            name: 'main',
             commit: {
               id: 'abcdefgh',
             },
@@ -73,7 +73,7 @@ const prepareStore = (state, activeFile) => {
       },
     },
     currentProjectId: 'gitlab-org/gitlab',
-    currentBranchId: 'master',
+    currentBranchId: 'main',
     entries: {
       [activeFile.path]: activeFile,
     },
@@ -656,7 +656,7 @@ describe('RepoEditor', () => {
     });
 
     it("does not add file to state or set markdown image syntax if the file isn't markdown", async () => {
-      wrapper.setProps({
+      await wrapper.setProps({
         file: setFileName('myfile.txt'),
       });
       pasteImage();