Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 43 insertions, 0 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
new file mode 100644
index 00000000000..222cb74cc66
--- /dev/null
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_merging_spec.js
@@ -0,0 +1,43 @@
+import Vue from 'vue';
+import mountComponent from 'helpers/vue_mount_component_helper';
+import mergingComponent from '~/vue_merge_request_widget/components/states/mr_widget_merging.vue';
+
+describe('MRWidgetMerging', () => {
+  let vm;
+  beforeEach(() => {
+    const Component = Vue.extend(mergingComponent);
+
+    vm = mountComponent(Component, {
+      mr: {
+        targetBranchPath: '/branch-path',
+        targetBranch: 'branch',
+      },
+    });
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  it('renders information about merge request being merged', () => {
+    expect(
+      vm.$el
+        .querySelector('.media-body')
+        .textContent.trim()
+        .replace(/\s\s+/g, ' ')
+        .replace(/[\r\n]+/g, ' '),
+    ).toContain('This merge request is in the process of being merged');
+  });
+
+  it('renders branch information', () => {
+    expect(
+      vm.$el
+        .querySelector('.mr-info-list')
+        .textContent.trim()
+        .replace(/\s\s+/g, ' ')
+        .replace(/[\r\n]+/g, ' '),
+    ).toEqual('The changes will be merged into branch');
+
+    expect(vm.$el.querySelector('a').getAttribute('href')).toEqual('/branch-path');
+  });
+});