diff options
Diffstat (limited to 'spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js')
-rw-r--r-- | spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js | 12 |
1 files changed, 8 insertions, 4 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 850bbd93df5..4dd1bd2aa9c 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 @@ -1,11 +1,11 @@ -import { nextTick } from 'vue'; 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 autoMergeEnabledComponent from '~/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue'; -import MRWidgetService from '~/vue_merge_request_widget/services/mr_widget_service'; -import eventHub from '~/vue_merge_request_widget/event_hub'; import { MWPS_MERGE_STRATEGY } from '~/vue_merge_request_widget/constants'; +import eventHub from '~/vue_merge_request_widget/event_hub'; +import MRWidgetService from '~/vue_merge_request_widget/services/mr_widget_service'; let wrapper; let mergeRequestWidgetGraphqlEnabled = false; @@ -202,7 +202,11 @@ describe('MRWidgetAutoMergeEnabled', () => { wrapper.vm.cancelAutomaticMerge(); setImmediate(() => { expect(wrapper.vm.isCancellingAutoMerge).toBeTruthy(); - expect(eventHub.$emit).toHaveBeenCalledWith('UpdateWidgetData', mrObj); + if (mergeRequestWidgetGraphql) { + expect(eventHub.$emit).toHaveBeenCalledWith('MRWidgetUpdateRequested'); + } else { + expect(eventHub.$emit).toHaveBeenCalledWith('UpdateWidgetData', mrObj); + } done(); }); }); |