1 files changed, 18 insertions, 32 deletions

diff --git a/spec/frontend/ide/components/commit_sidebar/list_item_spec.js b/spec/frontend/ide/components/commit_sidebar/list_item_spec.js
index b91ee88e0d6..dea920ecb5e 100644
--- a/spec/frontend/ide/components/commit_sidebar/list_item_spec.js
+++ b/spec/frontend/ide/components/commit_sidebar/list_item_spec.js
@@ -1,5 +1,6 @@
-import Vue from 'vue';
+import Vue, { nextTick } from 'vue';
 import { trimText } from 'helpers/text_helper';
+import waitForPromises from 'helpers/wait_for_promises';
 import { createComponentWithStore } from 'helpers/vue_mount_component_helper';
 import listItem from '~/ide/components/commit_sidebar/list_item.vue';
 import { createRouter } from '~/ide/ide_router';
@@ -41,54 +42,42 @@ describe('Multi-file editor commit sidebar list item', () => {
     expect(findPathText()).toContain(f.path);
   });
 
-  it('correctly renders renamed entries', (done) => {
+  it('correctly renders renamed entries', async () => {
     Vue.set(vm.file, 'prevName', 'Old name');
 
-    vm.$nextTick()
-      .then(() => {
-        expect(findPathText()).toEqual(`Old name → ${f.name}`);
-      })
-      .then(done)
-      .catch(done.fail);
+    await nextTick();
+    expect(findPathText()).toEqual(`Old name → ${f.name}`);
   });
 
-  it('correctly renders entry, the name of which did not change after rename (as within a folder)', (done) => {
+  it('correctly renders entry, the name of which did not change after rename (as within a folder)', async () => {
     Vue.set(vm.file, 'prevName', f.name);
 
-    vm.$nextTick()
-      .then(() => {
-        expect(findPathText()).toEqual(f.name);
-      })
-      .then(done)
-      .catch(done.fail);
+    await nextTick();
+    expect(findPathText()).toEqual(f.name);
   });
 
-  it('opens a closed file in the editor when clicking the file path', (done) => {
+  it('opens a closed file in the editor when clicking the file path', async () => {
     jest.spyOn(vm, 'openPendingTab');
     jest.spyOn(router, 'push').mockImplementation(() => {});
 
     findPathEl.click();
 
-    setImmediate(() => {
-      expect(vm.openPendingTab).toHaveBeenCalled();
-      expect(router.push).toHaveBeenCalled();
+    await nextTick();
 
-      done();
-    });
+    expect(vm.openPendingTab).toHaveBeenCalled();
+    expect(router.push).toHaveBeenCalled();
   });
 
-  it('calls updateViewer with diff when clicking file', (done) => {
+  it('calls updateViewer with diff when clicking file', async () => {
     jest.spyOn(vm, 'openFileInEditor');
     jest.spyOn(vm, 'updateViewer');
     jest.spyOn(router, 'push').mockImplementation(() => {});
 
     findPathEl.click();
 
-    setImmediate(() => {
-      expect(vm.updateViewer).toHaveBeenCalledWith('diff');
+    await waitForPromises();
 
-      done();
-    });
+    expect(vm.updateViewer).toHaveBeenCalledWith('diff');
   });
 
   describe('computed', () => {
@@ -134,14 +123,11 @@ describe('Multi-file editor commit sidebar list item', () => {
       expect(vm.$el.querySelector('.is-active')).toBe(null);
     });
 
-    it('adds active class when keys match', (done) => {
+    it('adds active class when keys match', async () => {
       vm.keyPrefix = 'staged';
 
-      vm.$nextTick(() => {
-        expect(vm.$el.querySelector('.is-active')).not.toBe(null);
-
-        done();
-      });
+      await nextTick();
+      expect(vm.$el.querySelector('.is-active')).not.toBe(null);
     });
   });
 });