Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 14 deletions

diff --git a/spec/frontend/ide/stores/actions/tree_spec.js b/spec/frontend/ide/stores/actions/tree_spec.js
index ece10d2a602..8322e401a90 100644
--- a/spec/frontend/ide/stores/actions/tree_spec.js
+++ b/spec/frontend/ide/stores/actions/tree_spec.js
@@ -57,26 +57,15 @@ describe('Multi-file store tree actions', () => {
       });
 
       it('calls service getFiles', () => {
-        return (
-          store
-            .dispatch('getFiles', basicCallParameters)
-            // getFiles actions calls lodash.defer
-            .then(() => jest.runOnlyPendingTimers())
-            .then(() => {
-              expect(service.getFiles).toHaveBeenCalledWith('foo/abcproject', '12345678');
-            })
-        );
+        return store.dispatch('getFiles', basicCallParameters).then(() => {
+          expect(service.getFiles).toHaveBeenCalledWith('foo/abcproject', '12345678');
+        });
       });
 
       it('adds data into tree', (done) => {
         store
           .dispatch('getFiles', basicCallParameters)
           .then(() => {
-            // The populating of the tree is deferred for performance reasons.
-            // See this merge request for details: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/25700
-            jest.advanceTimersByTime(1);
-          })
-          .then(() => {
             projectTree = store.state.trees['abcproject/master'];
 
             expect(projectTree.tree.length).toBe(2);