fixed closeAll & discardAll specs

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

@@ -10,7 +10,7 @@ export const setInitialData = ({ commit }, data) =>
   commit(types.SET_INITIAL_DATA, data);
 
 export const discardAllChanges = ({ state, commit, dispatch }) => {
-  state.changedFiles.forEach((file) => {
+  state.changedFiles.forEach(file => {
     commit(types.DISCARD_FILE_CHANGES, file.path);
 
     if (file.tempFile) {
@@ -22,7 +22,7 @@ export const discardAllChanges = ({ state, commit, dispatch }) => {
 };
 
 export const closeAllFiles = ({ state, dispatch }) => {
-  state.openFiles.forEach(file => dispatch('closeFile', file));
+  state.openFiles.forEach(file => dispatch('closeFile', file.path));
 };
 
 export const setPanelCollapsedStatus = ({ commit }, { side, collapsed }) => {
@@ -40,12 +40,23 @@ export const setResizingStatus = ({ commit }, resizing) => {
 export const createTempEntry = (
   { state, commit, dispatch },
   { branchId, name, type, content = '', base64 = false },
-) => new Promise((resolve) => {
+) =>
+  new Promise(resolve => {
     const worker = new FilesDecoratorWorker();
-  const fullName = name.slice(-1) !== '/' && type === 'tree' ? `${name}/` : name;
+    const fullName =
+      name.slice(-1) !== '/' && type === 'tree' ? `${name}/` : name;
 
     if (state.entries[name]) {
-    flash(`The name "${name.split('/').pop()}" is already taken in this directory.`, 'alert', document, null, false, true);
+      flash(
+        `The name "${name
+          .split('/')
+          .pop()}" is already taken in this directory.`,
+        'alert',
+        document,
+        null,
+        false,
+        true,
+      );
 
       resolve();
 
@@ -83,7 +94,7 @@ export const createTempEntry = (
     });
 
     return null;
-});
+  });
 
 export const scrollToTab = () => {
   Vue.nextTick(() => {

spec/javascripts/ide/stores/actions_spec.js

@@ -13,10 +13,11 @@ describe('Multi-file store actions', () => {
   });
 
   describe('redirectToUrl', () => {
-    it('calls visitUrl', (done) => {
+    it('calls visitUrl', done => {
       spyOn(urlUtils, 'visitUrl');
 
-      store.dispatch('redirectToUrl', 'test')
+      store
+        .dispatch('redirectToUrl', 'test')
         .then(() => {
           expect(urlUtils.visitUrl).toHaveBeenCalledWith('test');
 
@@ -27,8 +28,9 @@ describe('Multi-file store actions', () => {
   });
 
   describe('setInitialData', () => {
-    it('commits initial data', (done) => {
-      store.dispatch('setInitialData', { canCommit: true })
+    it('commits initial data', done => {
+      store
+        .dispatch('setInitialData', { canCommit: true })
         .then(() => {
           expect(store.state.canCommit).toBeTruthy();
           done();
@@ -44,10 +46,12 @@ describe('Multi-file store actions', () => {
 
       store.state.openFiles.push(f);
       store.state.changedFiles.push(f);
+      store.state.entries[f.path] = f;
     });
 
-    it('discards changes in file', (done) => {
-      store.dispatch('discardAllChanges')
+    it('discards changes in file', done => {
+      store
+        .dispatch('discardAllChanges')
         .then(() => {
           expect(store.state.openFiles.changed).toBeFalsy();
         })
@@ -55,8 +59,9 @@ describe('Multi-file store actions', () => {
         .catch(done.fail);
     });
 
-    it('removes all files from changedFiles state', (done) => {
-      store.dispatch('discardAllChanges')
+    it('removes all files from changedFiles state', done => {
+      store
+        .dispatch('discardAllChanges')
         .then(() => {
           expect(store.state.changedFiles.length).toBe(0);
           expect(store.state.openFiles.length).toBe(1);
@@ -68,12 +73,15 @@ describe('Multi-file store actions', () => {
 
   describe('closeAllFiles', () => {
     beforeEach(() => {
-      store.state.openFiles.push(file('closeAll'));
+      const f = file('closeAll');
+      store.state.openFiles.push(f);
       store.state.openFiles[0].opened = true;
+      store.state.entries[f.path] = f;
     });
 
-    it('closes all open files', (done) => {
-      store.dispatch('closeAllFiles')
+    it('closes all open files', done => {
+      store
+        .dispatch('closeAllFiles')
         .then(() => {
           expect(store.state.openFiles.length).toBe(0);
 
@@ -103,8 +111,9 @@ describe('Multi-file store actions', () => {
     });
 
     describe('tree', () => {
-      it('creates temp tree', (done) => {
-        store.dispatch('createTempEntry', {
+      it('creates temp tree', done => {
+        store
+          .dispatch('createTempEntry', {
             branchId: store.state.currentBranchId,
             name: 'test',
             type: 'tree',
@@ -116,10 +125,11 @@ describe('Multi-file store actions', () => {
             expect(entry.type).toBe('tree');
 
             done();
-        }).catch(done.fail);
+          })
+          .catch(done.fail);
       });
 
-      it('creates new folder inside another tree', (done) => {
+      it('creates new folder inside another tree', done => {
         const tree = {
           type: 'tree',
           name: 'testing',
@@ -129,7 +139,8 @@ describe('Multi-file store actions', () => {
 
         store.state.entries[tree.path] = tree;
 
-        store.dispatch('createTempEntry', {
+        store
+          .dispatch('createTempEntry', {
             branchId: store.state.currentBranchId,
             name: 'testing/test',
             type: 'tree',
@@ -140,10 +151,11 @@ describe('Multi-file store actions', () => {
             expect(tree.tree[0].type).toBe('tree');
 
             done();
-        }).catch(done.fail);
+          })
+          .catch(done.fail);
       });
 
-      it('does not create new tree if already exists', (done) => {
+      it('does not create new tree if already exists', done => {
         const tree = {
           type: 'tree',
           path: 'testing',
@@ -153,7 +165,8 @@ describe('Multi-file store actions', () => {
 
         store.state.entries[tree.path] = tree;
 
-        store.dispatch('createTempEntry', {
+        store
+          .dispatch('createTempEntry', {
             branchId: store.state.currentBranchId,
             name: 'testing',
             type: 'tree',
@@ -163,91 +176,109 @@ describe('Multi-file store actions', () => {
             expect(document.querySelector('.flash-alert')).not.toBeNull();
 
             done();
-        }).catch(done.fail);
+          })
+          .catch(done.fail);
       });
     });
 
     describe('blob', () => {
-      it('creates temp file', (done) => {
-        store.dispatch('createTempEntry', {
+      it('creates temp file', done => {
+        store
+          .dispatch('createTempEntry', {
             name: 'test',
             branchId: 'mybranch',
             type: 'blob',
-        }).then((f) => {
+          })
+          .then(f => {
             expect(f.tempFile).toBeTruthy();
-          expect(store.state.trees['abcproject/mybranch'].tree.length).toBe(1);
+            expect(store.state.trees['abcproject/mybranch'].tree.length).toBe(
+              1,
+            );
 
             done();
-        }).catch(done.fail);
+          })
+          .catch(done.fail);
       });
 
-      it('adds tmp file to open files', (done) => {
-        store.dispatch('createTempEntry', {
+      it('adds tmp file to open files', done => {
+        store
+          .dispatch('createTempEntry', {
             name: 'test',
             branchId: 'mybranch',
             type: 'blob',
-        }).then((f) => {
+          })
+          .then(f => {
             expect(store.state.openFiles.length).toBe(1);
             expect(store.state.openFiles[0].name).toBe(f.name);
 
             done();
-        }).catch(done.fail);
+          })
+          .catch(done.fail);
       });
 
-      it('adds tmp file to changed files', (done) => {
-        store.dispatch('createTempEntry', {
+      it('adds tmp file to changed files', done => {
+        store
+          .dispatch('createTempEntry', {
             name: 'test',
             branchId: 'mybranch',
             type: 'blob',
-        }).then((f) => {
+          })
+          .then(f => {
             expect(store.state.changedFiles.length).toBe(1);
             expect(store.state.changedFiles[0].name).toBe(f.name);
 
             done();
-        }).catch(done.fail);
+          })
+          .catch(done.fail);
       });
 
-      it('sets tmp file as active', (done) => {
-        store.dispatch('createTempEntry', {
+      it('sets tmp file as active', done => {
+        store
+          .dispatch('createTempEntry', {
             name: 'test',
             branchId: 'mybranch',
             type: 'blob',
-        }).then((f) => {
+          })
+          .then(f => {
             expect(f.active).toBeTruthy();
 
             done();
-        }).catch(done.fail);
+          })
+          .catch(done.fail);
       });
 
-      it('creates flash message if file already exists', (done) => {
+      it('creates flash message if file already exists', done => {
         const f = file('test', '1', 'blob');
         store.state.trees['abcproject/mybranch'].tree = [f];
         store.state.entries[f.path] = f;
 
-        store.dispatch('createTempEntry', {
+        store
+          .dispatch('createTempEntry', {
             name: 'test',
             branchId: 'mybranch',
             type: 'blob',
-        }).then(() => {
+          })
+          .then(() => {
             expect(document.querySelector('.flash-alert')).not.toBeNull();
 
             done();
-        }).catch(done.fail);
+          })
+          .catch(done.fail);
       });
     });
   });
 
-  describe('popHistoryState', () => {
-
-  });
+  describe('popHistoryState', () => {});
 
   describe('scrollToTab', () => {
-    it('focuses the current active element', (done) => {
-      document.body.innerHTML += '<div id="tabs"><div class="active"><div class="repo-tab"></div></div></div>';
+    it('focuses the current active element', done => {
+      document.body.innerHTML +=
+        '<div id="tabs"><div class="active"><div class="repo-tab"></div></div></div>';
       const el = document.querySelector('.repo-tab');
       spyOn(el, 'focus');
 
-      store.dispatch('scrollToTab')
+      store
+        .dispatch('scrollToTab')
         .then(() => {
           setTimeout(() => {
             expect(el.focus).toHaveBeenCalled();