Merge branch '27244-webide-discard-all-changes' into 'master'

Web IDE: Fix the console error that happens when discarding a newly added/uploaded file.

See merge request gitlab-org/gitlab!21537

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

@@ -20,7 +20,7 @@ export const discardAllChanges = ({ state, commit, dispatch }) => {
     commit(types.DISCARD_FILE_CHANGES, file.path);
 
     if (file.tempFile) {
-      dispatch('closeFile', file.path);
+      dispatch('closeFile', file);
     }
   });
 

changelogs/unreleased/27244-webide-discard-all-changes.yml

+---
+title: "Web IDE: Fix the console error that happens when discarding a newly added/uploaded file."
+merge_request: 21537
+author:
+type: fixed

spec/javascripts/ide/stores/actions_spec.js

@@ -12,6 +12,7 @@ import actions, {
   renameEntry,
   getBranchData,
   createTempEntry,
+  discardAllChanges,
 } from '~/ide/stores/actions';
 import axios from '~/lib/utils/axios_utils';
 import { createStore } from '~/ide/stores';
@@ -60,8 +61,9 @@ describe('Multi-file store actions', () => {
   });
 
   describe('discardAllChanges', () => {
+    let f;
     beforeEach(() => {
-      const f = file('discardAll');
+      f = file('discardAll');
       f.changed = true;
 
       store.state.openFiles.push(f);
@@ -89,6 +91,27 @@ describe('Multi-file store actions', () => {
         .then(done)
         .catch(done.fail);
     });
+
+    it('closes the temp file if it was open', done => {
+      f.tempFile = true;
+
+      testAction(
+        discardAllChanges,
+        undefined,
+        store.state,
+        [
+          { type: types.DISCARD_FILE_CHANGES, payload: 'discardAll' },
+          { type: types.REMOVE_ALL_CHANGES_FILES },
+        ],
+        [
+          {
+            type: 'closeFile',
+            payload: jasmine.objectContaining({ path: 'discardAll' }),
+          },
+        ],
+        done,
+      );
+    });
   });
 
   describe('closeAllFiles', () => {