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

Web IDE: Fix "Discard all" for new and renamed files

See merge request gitlab-org/gitlab!21854

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

@@ -17,10 +17,18 @@ export const setInitialData = ({ commit }, data) => commit(types.SET_INITIAL_DAT
 
 export const discardAllChanges = ({ state, commit, dispatch }) => {
   state.changedFiles.forEach(file => {
-    commit(types.DISCARD_FILE_CHANGES, file.path);
+    if (file.tempFile || file.prevPath) dispatch('closeFile', file);
 
     if (file.tempFile) {
-      dispatch('closeFile', file);
+      dispatch('deleteEntry', file.path);
+    } else if (file.prevPath) {
+      dispatch('renameEntry', {
+        path: file.path,
+        name: file.prevName,
+        parentPath: file.prevParentPath,
+      });
+    } else {
+      commit(types.DISCARD_FILE_CHANGES, file.path);
     }
   });
 

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

+---
+title: Fix "Discard all" for new and renamed files
+merge_request: 21854
+author:
+type: fixed

spec/javascripts/ide/stores/actions_spec.js

@@ -92,26 +92,58 @@ describe('Multi-file store actions', () => {
         .catch(done.fail);
     });
 
-    it('closes the temp file if it was open', done => {
+    it('closes the temp file and deletes it if it was open', done => {
       f.tempFile = true;
 
       testAction(
         discardAllChanges,
         undefined,
         store.state,
+        [{ type: types.REMOVE_ALL_CHANGES_FILES }],
         [
-          { type: types.DISCARD_FILE_CHANGES, payload: 'discardAll' },
-          { type: types.REMOVE_ALL_CHANGES_FILES },
+          { type: 'closeFile', payload: jasmine.objectContaining({ path: 'discardAll' }) },
+          { type: 'deleteEntry', payload: 'discardAll' },
         ],
+        done,
+      );
+    });
+
+    it('renames the file to its original name and closes it if it was open', done => {
+      Object.assign(f, {
+        prevPath: 'parent/path/old_name',
+        prevName: 'old_name',
+        prevParentPath: 'parent/path',
+      });
+
+      testAction(
+        discardAllChanges,
+        undefined,
+        store.state,
+        [{ type: types.REMOVE_ALL_CHANGES_FILES }],
         [
+          { type: 'closeFile', payload: jasmine.objectContaining({ path: 'discardAll' }) },
           {
-            type: 'closeFile',
-            payload: jasmine.objectContaining({ path: 'discardAll' }),
+            type: 'renameEntry',
+            payload: { path: 'discardAll', name: 'old_name', parentPath: 'parent/path' },
           },
         ],
         done,
       );
     });
+
+    it('discards file changes on all other files', done => {
+      testAction(
+        discardAllChanges,
+        undefined,
+        store.state,
+        [
+          { type: types.DISCARD_FILE_CHANGES, payload: 'discardAll' },
+          { type: types.REMOVE_ALL_CHANGES_FILES },
+        ],
+        [],
+        done,
+      );
+    });
   });
 
   describe('closeAllFiles', () => {