1 files changed, 48 insertions, 83 deletions

diff --git a/spec/javascripts/vue_mr_widget/components/mr_widget_related_links_spec.js b/spec/javascripts/vue_mr_widget/components/mr_widget_related_links_spec.js
index f86fb6a0b4b..637bf483deb 100644
--- a/spec/javascripts/vue_mr_widget/components/mr_widget_related_links_spec.js
+++ b/spec/javascripts/vue_mr_widget/components/mr_widget_related_links_spec.js
@@ -1,117 +1,82 @@
 import Vue from 'vue';
-import relatedLinksComponent from '~/vue_merge_request_widget/components/mr_widget_related_links';
+import relatedLinksComponent from '~/vue_merge_request_widget/components/mr_widget_related_links.vue';
+import mountComponent from '../../helpers/vue_mount_component_helper';
 
-const createComponent = (data) => {
-  const Component = Vue.extend(relatedLinksComponent);
+describe('MRWidgetRelatedLinks', () => {
+  let vm;
 
-  return new Component({
-    el: document.createElement('div'),
-    propsData: data,
-  });
-};
+  const createComponent = (data) => {
+    const Component = Vue.extend(relatedLinksComponent);
 
-describe('MRWidgetRelatedLinks', () => {
-  describe('props', () => {
-    it('should have props', () => {
-      const { relatedLinks } = relatedLinksComponent.props;
+    return mountComponent(Component, data);
+  };
 
-      expect(relatedLinks).toBeDefined();
-      expect(relatedLinks.type instanceof Object).toBeTruthy();
-      expect(relatedLinks.required).toBeTruthy();
-    });
+  afterEach(() => {
+    vm.$destroy();
   });
 
   describe('computed', () => {
-    const data = {
-      relatedLinks: {
-        closing: '/foo',
-        mentioned: '/foo',
-        assignToMe: '/foo',
-      },
-    };
-
-    describe('hasLinks', () => {
-      it('should return correct value when we have links reference', () => {
-        const vm = createComponent(data);
-        expect(vm.hasLinks).toBeTruthy();
-
-        vm.relatedLinks.closing = null;
-        expect(vm.hasLinks).toBeTruthy();
-
-        vm.relatedLinks.mentioned = null;
-        expect(vm.hasLinks).toBeTruthy();
-
-        vm.relatedLinks.assignToMe = null;
-        expect(vm.hasLinks).toBeFalsy();
-      });
-    });
-
     describe('closesText', () => {
-      it('returns correct text for open merge request', () => {
-        data.state = 'open';
-        const vm = createComponent(data);
+      it('returns Closes text for open merge request', () => {
+        vm = createComponent({ state: 'open', relatedLinks: {} });
         expect(vm.closesText).toEqual('Closes');
       });
 
       it('returns correct text for closed merge request', () => {
-        data.state = 'closed';
-        const vm = createComponent(data);
+        vm = createComponent({ state: 'closed', relatedLinks: {} });
         expect(vm.closesText).toEqual('Did not close');
       });
 
       it('returns correct tense for merged request', () => {
-        data.state = 'merged';
-        const vm = createComponent(data);
+        vm = createComponent({ state: 'merged', relatedLinks: {} });
         expect(vm.closesText).toEqual('Closed');
       });
     });
   });
 
-  describe('template', () => {
-    it('should have only have closing issues text', () => {
-      const vm = createComponent({
-        relatedLinks: {
-          closing: '<a href="#">#23</a> and <a>#42</a>',
-        },
-      });
-      const content = vm.$el.textContent.replace(/\n(\s)+/g, ' ').trim();
-
-      expect(content).toContain('Closes #23 and #42');
-      expect(content).not.toContain('Mentions');
+  it('should have only have closing issues text', () => {
+    vm = createComponent({
+      relatedLinks: {
+        closing: '<a href="#">#23</a> and <a>#42</a>',
+      },
     });
+    const content = vm.$el.textContent.replace(/\n(\s)+/g, ' ').trim();
 
-    it('should have only have mentioned issues text', () => {
-      const vm = createComponent({
-        relatedLinks: {
-          mentioned: '<a href="#">#7</a>',
-        },
-      });
+    expect(content).toContain('Closes #23 and #42');
+    expect(content).not.toContain('Mentions');
+  });
 
-      expect(vm.$el.innerText).toContain('Mentions #7');
-      expect(vm.$el.innerText).not.toContain('Closes');
+  it('should have only have mentioned issues text', () => {
+    vm = createComponent({
+      relatedLinks: {
+        mentioned: '<a href="#">#7</a>',
+      },
     });
 
-    it('should have closing and mentioned issues at the same time', () => {
-      const vm = createComponent({
-        relatedLinks: {
-          closing: '<a href="#">#7</a>',
-          mentioned: '<a href="#">#23</a> and <a>#42</a>',
-        },
-      });
-      const content = vm.$el.textContent.replace(/\n(\s)+/g, ' ').trim();
+    expect(vm.$el.innerText).toContain('Mentions #7');
+    expect(vm.$el.innerText).not.toContain('Closes');
+  });
 
-      expect(content).toContain('Closes #7');
-      expect(content).toContain('Mentions #23 and #42');
+  it('should have closing and mentioned issues at the same time', () => {
+    vm = createComponent({
+      relatedLinks: {
+        closing: '<a href="#">#7</a>',
+        mentioned: '<a href="#">#23</a> and <a>#42</a>',
+      },
     });
+    const content = vm.$el.textContent.replace(/\n(\s)+/g, ' ').trim();
 
-    it('should have assing issues link', () => {
-      const vm = createComponent({
-        relatedLinks: {
-          assignToMe: '<a href="#">Assign yourself to these issues</a>',
-        },
-      });
+    expect(content).toContain('Closes #7');
+    expect(content).toContain('Mentions #23 and #42');
+  });
 
-      expect(vm.$el.innerText).toContain('Assign yourself to these issues');
+  it('should have assing issues link', () => {
+    vm = createComponent({
+      relatedLinks: {
+        assignToMe: '<a href="#">Assign yourself to these issues</a>',
+      },
     });
+
+    expect(vm.$el.innerText).toContain('Assign yourself to these issues');
   });
 });