Merge branch '34522-webide-empty-repos' into 'master'

Resolve "WebIDE doesn't work on empty repositories again"

See merge request gitlab-org/gitlab!22950

app/assets/javascripts/ide/stores/actions/project.js

@@ -83,8 +83,11 @@ export const showBranchNotFoundError = ({ dispatch }, branchId) => {
   });
 };
 
-export const showEmptyState = ({ commit, state }, { projectId, branchId }) => {
+export const showEmptyState = ({ commit, state, dispatch }, { projectId, branchId }) => {
   const treePath = `${projectId}/${branchId}`;
+
+  dispatch('setCurrentBranchId', branchId);
+
   commit(types.CREATE_TREE, { treePath });
   commit(types.TOGGLE_LOADING, {
     entry: state.trees[treePath],

changelogs/unreleased/34522-webide-empty-repos.yml

+---
+title: 'Fix: WebIDE doesn''t work on empty repositories again'
+merge_request: 22950
+author:
+type: fixed

spec/javascripts/ide/stores/actions/project_spec.js

@@ -201,35 +201,30 @@ describe('IDE store project actions', () => {
   });
 
   describe('showEmptyState', () => {
-    it('commits proper mutations when supplied error is 404', done => {
+    it('creates a blank tree and sets loading state to false', done => {
       testAction(
         showEmptyState,
-        {
-          err: {
-            response: {
-              status: 404,
-            },
-          },
-          projectId: 'abc/def',
-          branchId: 'master',
-        },
+        { projectId: 'abc/def', branchId: 'master' },
         store.state,
         [
-          {
-            type: 'CREATE_TREE',
-            payload: {
-              treePath: 'abc/def/master',
-            },
-          },
+          { type: 'CREATE_TREE', payload: { treePath: 'abc/def/master' } },
           {
             type: 'TOGGLE_LOADING',
-            payload: {
-              entry: store.state.trees['abc/def/master'],
-              forceValue: false,
-            },
+            payload: { entry: store.state.trees['abc/def/master'], forceValue: false },
           },
         ],
-        [],
+        jasmine.any(Object),
+        done,
+      );
+    });
+
+    it('sets the currentBranchId to the branchId that was passed', done => {
+      testAction(
+        showEmptyState,
+        { projectId: 'abc/def', branchId: 'master' },
+        store.state,
+        jasmine.any(Object),
+        [{ type: 'setCurrentBranchId', payload: 'master' }],
         done,
       );
     });