1 files changed, 14 insertions, 18 deletions
diff --git a/spec/frontend/vue_mr_widget/components/mr_widget_memory_usage_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_memory_usage_spec.js
index f55d313a719..c0a30a5093d 100644
--- a/spec/frontend/vue_mr_widget/components/mr_widget_memory_usage_spec.js
+++ b/spec/frontend/vue_mr_widget/components/mr_widget_memory_usage_spec.js
@@ -1,6 +1,7 @@
 import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
-import Vue from 'vue';
+import Vue, { nextTick } from 'vue';
+import waitForPromises from 'helpers/wait_for_promises';
 import MemoryUsage from '~/vue_merge_request_widget/components/deployment/memory_usage.vue';
 import MRWidgetService from '~/vue_merge_request_widget/services/mr_widget_service';
 
@@ -152,23 +153,18 @@ describe('MemoryUsage', () => {
     });
 
     describe('loadMetrics', () => {
-      const returnServicePromise = () =>
-        new Promise((resolve) => {
-          resolve({
-            data: metricsMockData,
-          });
+      it('should load metrics data using MRWidgetService', async () => {
+        jest.spyOn(MRWidgetService, 'fetchMetrics').mockResolvedValue({
+          data: metricsMockData,
         });
-
-      it('should load metrics data using MRWidgetService', (done) => {
-        jest.spyOn(MRWidgetService, 'fetchMetrics').mockReturnValue(returnServicePromise(true));
         jest.spyOn(vm, 'computeGraphData').mockImplementation(() => {});
 
         vm.loadMetrics();
-        setImmediate(() => {
-          expect(MRWidgetService.fetchMetrics).toHaveBeenCalledWith(url);
-          expect(vm.computeGraphData).toHaveBeenCalledWith(metrics, deployment_time);
-          done();
-        });
+
+        await waitForPromises();
+
+        expect(MRWidgetService.fetchMetrics).toHaveBeenCalledWith(url);
+        expect(vm.computeGraphData).toHaveBeenCalledWith(metrics, deployment_time);
       });
     });
   });
@@ -184,7 +180,7 @@ describe('MemoryUsage', () => {
       vm.hasMetrics = false;
       vm.loadFailed = false;
 
-      Vue.nextTick(() => {
+      nextTick(() => {
         expect(el.querySelector('.js-usage-info.usage-info-loading')).toBeDefined();
 
         expect(el.querySelector('.js-usage-info .usage-info-load-spinner')).toBeDefined();
@@ -203,7 +199,7 @@ describe('MemoryUsage', () => {
       vm.loadFailed = false;
       vm.memoryMetrics = metricsMockData.metrics.memory_values[0].values;
 
-      Vue.nextTick(() => {
+      nextTick(() => {
         expect(el.querySelector('.memory-graph-container')).toBeDefined();
         expect(el.querySelector('.js-usage-info').innerText).toContain(messages.hasMetrics);
         done();
@@ -215,7 +211,7 @@ describe('MemoryUsage', () => {
       vm.hasMetrics = false;
       vm.loadFailed = true;
 
-      Vue.nextTick(() => {
+      nextTick(() => {
         expect(el.querySelector('.js-usage-info.usage-info-failed')).toBeDefined();
 
         expect(el.querySelector('.js-usage-info').innerText).toContain(messages.loadFailed);
@@ -228,7 +224,7 @@ describe('MemoryUsage', () => {
       vm.hasMetrics = false;
       vm.loadFailed = false;
 
-      Vue.nextTick(() => {
+      nextTick(() => {
         expect(el.querySelector('.js-usage-info.usage-info-unavailable')).toBeDefined();
 
         expect(el.querySelector('.js-usage-info').innerText).toContain(messages.metricsUnavailable);