1 files changed, 20 insertions, 19 deletions

diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js
index 52a56af454f..7387ed2d5e9 100644
--- a/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js
@@ -2,6 +2,7 @@ import { shallowMount } from '@vue/test-utils';
 import { nextTick } from 'vue';
 import { trimText } from 'helpers/text_helper';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
+import waitForPromises from 'helpers/wait_for_promises';
 import autoMergeEnabledComponent from '~/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue';
 import { MWPS_MERGE_STRATEGY } from '~/vue_merge_request_widget/constants';
 import eventHub from '~/vue_merge_request_widget/event_hub';
@@ -185,7 +186,7 @@ describe('MRWidgetAutoMergeEnabled', () => {
 
       describe('methods', () => {
         describe('cancelAutomaticMerge', () => {
-          it('should set flag and call service then tell main component to update the widget with data', (done) => {
+          it('should set flag and call service then tell main component to update the widget with data', async () => {
             factory({
               ...defaultMrProps(),
             });
@@ -201,20 +202,20 @@ describe('MRWidgetAutoMergeEnabled', () => {
             );
 
             wrapper.vm.cancelAutomaticMerge();
-            setImmediate(() => {
-              expect(wrapper.vm.isCancellingAutoMerge).toBeTruthy();
-              if (mergeRequestWidgetGraphql) {
-                expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested');
-              } else {
-                expect(eventHub.$emit).toHaveBeenCalledWith('UpdateWidgetData', mrObj);
-              }
-              done();
-            });
+
+            await waitForPromises();
+
+            expect(wrapper.vm.isCancellingAutoMerge).toBeTruthy();
+            if (mergeRequestWidgetGraphql) {
+              expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested');
+            } else {
+              expect(eventHub.$emit).toHaveBeenCalledWith('UpdateWidgetData', mrObj);
+            }
           });
         });
 
         describe('removeSourceBranch', () => {
-          it('should set flag and call service then request main component to update the widget', (done) => {
+          it('should set flag and call service then request main component to update the widget', async () => {
             factory({
               ...defaultMrProps(),
             });
@@ -227,14 +228,14 @@ describe('MRWidgetAutoMergeEnabled', () => {
             );
 
             wrapper.vm.removeSourceBranch();
-            setImmediate(() => {
-              expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested');
-              expect(wrapper.vm.service.merge).toHaveBeenCalledWith({
-                sha,
-                auto_merge_strategy: MWPS_MERGE_STRATEGY,
-                should_remove_source_branch: true,
-              });
-              done();
+
+            await waitForPromises();
+
+            expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested');
+            expect(wrapper.vm.service.merge).toHaveBeenCalledWith({
+              sha,
+              auto_merge_strategy: MWPS_MERGE_STRATEGY,
+              should_remove_source_branch: true,
             });
           });
         });