Moves status icon into a vue file and adds tests

Moves merging component into a vue file, adds i18n and better test cases

3 files changed, 78 insertions, 33 deletions

diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_status_icon_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_status_icon_spec.js
new file mode 100644
index 00000000000..c39fcda0071
--- /dev/null
+++ b/spec/javascripts/vue_mr_widget/components/mr_widget_status_icon_spec.js
@@ -0,0 +1,44 @@
+import Vue from 'vue';
+import mrStatusIcon from '~/vue_merge_request_widget/components/mr_widget_status_icon.vue';
+import mountComponent from '../../helpers/vue_mount_component_helper';
+
+describe('MR widget status icon component', () => {
+  let vm;
+  let Component;
+
+  beforeEach(() => {
+    Component = Vue.extend(mrStatusIcon);
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('while loading', () => {
+    it('renders loading icon', () => {
+      vm = mountComponent(Component, { status: 'loading' });
+      expect(vm.$el.querySelector('.mr-widget-icon i').classList).toContain('fa-spinner');
+    });
+  });
+
+  describe('with status icon', () => {
+    it('renders ci status icon', () => {
+      vm = mountComponent(Component, { status: 'failed' });
+      expect(vm.$el.querySelector('.js-ci-status-icon-failed')).not.toBeNull();
+    });
+  });
+
+  describe('with disabled button', () => {
+    it('renders a disabled button', () => {
+      vm = mountComponent(Component, { status: 'failed', showDisabledButton: true });
+      expect(vm.$el.querySelector('.js-disabled-merge-button').textContent.trim()).toEqual('Merge');
+    });
+  });
+
+  describe('without disabled button', () => {
+    it('does not render a disabled button', () => {
+      vm = mountComponent(Component, { status: 'failed' });
+      expect(vm.$el.querySelector('.js-disabled-merge-button')).toBeNull();
+    });
+  });
+});
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_locked_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_locked_spec.js
deleted file mode 100644
index 237035648cf..00000000000
--- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_locked_spec.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import Vue from 'vue';
-import mergingComponent from '~/vue_merge_request_widget/components/states/mr_widget_merging';
-
-describe('MRWidgetMerging', () => {
-  describe('props', () => {
-    it('should have props', () => {
-      const { mr } = mergingComponent.props;
-
-      expect(mr.type instanceof Object).toBeTruthy();
-      expect(mr.required).toBeTruthy();
-    });
-  });
-
-  describe('template', () => {
-    it('should have correct elements', () => {
-      const Component = Vue.extend(mergingComponent);
-      const mr = {
-        targetBranchPath: '/branch-path',
-        targetBranch: 'branch',
-      };
-      const el = new Component({
-        el: document.createElement('div'),
-        propsData: { mr },
-      }).$el;
-
-      expect(el.classList.contains('mr-widget-body')).toBeTruthy();
-      expect(el.innerText).toContain('This merge request is in the process of being merged');
-      expect(el.innerText).toContain('changes will be merged into');
-      expect(el.querySelector('.label-branch a').getAttribute('href')).toEqual(mr.targetBranchPath);
-      expect(el.querySelector('.label-branch a').textContent).toContain(mr.targetBranch);
-    });
-  });
-});
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merging_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merging_spec.js
new file mode 100644
index 00000000000..d67669ac090
--- /dev/null
+++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merging_spec.js
@@ -0,0 +1,34 @@
+import Vue from 'vue';
+import mergingComponent from '~/vue_merge_request_widget/components/states/mr_widget_merging.vue';
+import mountComponent from '../../../helpers/vue_mount_component_helper';
+
+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(),
+    ).toEqual('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');
+  });
+});