Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js')
-rw-r--r--spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js
index b16fb5171e7..b6c16958993 100644
--- a/spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js
@@ -4,6 +4,7 @@ import MrWidgetMerging from '~/vue_merge_request_widget/components/states/mr_wid
describe('MRWidgetMerging', () => {
let wrapper;
+ const GlEmoji = { template: '<img />' };
beforeEach(() => {
wrapper = shallowMount(MrWidgetMerging, {
propsData: {
@@ -12,6 +13,9 @@ describe('MRWidgetMerging', () => {
targetBranch: 'branch',
},
},
+ stubs: {
+ GlEmoji,
+ },
});
});
@@ -27,7 +31,7 @@ describe('MRWidgetMerging', () => {
.trim()
.replace(/\s\s+/g, ' ')
.replace(/[\r\n]+/g, ' '),
- ).toContain('This merge request is in the process of being merged');
+ ).toContain('Merging!');
});
it('renders branch information', () => {