2 files changed, 13 insertions, 36 deletions
diff --git a/spec/frontend/vue_shared/components/issue/issue_milestone_spec.js b/spec/frontend/vue_shared/components/issue/issue_milestone_spec.js
index 4c654e01f74..90c3fe54901 100644
--- a/spec/frontend/vue_shared/components/issue/issue_milestone_spec.js
+++ b/spec/frontend/vue_shared/components/issue/issue_milestone_spec.js
@@ -36,9 +36,7 @@ describe('IssueMilestoneComponent', () => {
     describe('isMilestoneStarted', () => {
       it('should return `false` when milestoneStart prop is not defined', () => {
         wrapper.setProps({
-          milestone: Object.assign({}, mockMilestone, {
-            start_date: '',
-          }),
+          milestone: { ...mockMilestone, start_date: '' },
         });
 
         expect(wrapper.vm.isMilestoneStarted).toBe(false);
@@ -46,9 +44,7 @@ describe('IssueMilestoneComponent', () => {
 
       it('should return `true` when milestone start date is past current date', () => {
         wrapper.setProps({
-          milestone: Object.assign({}, mockMilestone, {
-            start_date: '1990-07-22',
-          }),
+          milestone: { ...mockMilestone, start_date: '1990-07-22' },
         });
 
         expect(wrapper.vm.isMilestoneStarted).toBe(true);
@@ -58,9 +54,7 @@ describe('IssueMilestoneComponent', () => {
     describe('isMilestonePastDue', () => {
       it('should return `false` when milestoneDue prop is not defined', () => {
         wrapper.setProps({
-          milestone: Object.assign({}, mockMilestone, {
-            due_date: '',
-          }),
+          milestone: { ...mockMilestone, due_date: '' },
         });
 
         expect(wrapper.vm.isMilestonePastDue).toBe(false);
@@ -68,9 +62,7 @@ describe('IssueMilestoneComponent', () => {
 
       it('should return `true` when milestone due is past current date', () => {
         wrapper.setProps({
-          milestone: Object.assign({}, mockMilestone, {
-            due_date: '1990-07-22',
-          }),
+          milestone: { ...mockMilestone, due_date: '1990-07-22' },
         });
 
         expect(wrapper.vm.isMilestonePastDue).toBe(true);
@@ -84,9 +76,7 @@ describe('IssueMilestoneComponent', () => {
 
       it('returns string containing absolute milestone start date when due date is not present', () => {
         wrapper.setProps({
-          milestone: Object.assign({}, mockMilestone, {
-            due_date: '',
-          }),
+          milestone: { ...mockMilestone, due_date: '' },
         });
 
         expect(wrapper.vm.milestoneDatesAbsolute).toBe('(January 1, 2018)');
@@ -94,10 +84,7 @@ describe('IssueMilestoneComponent', () => {
 
       it('returns empty string when both milestone start and due dates are not present', () => {
         wrapper.setProps({
-          milestone: Object.assign({}, mockMilestone, {
-            start_date: '',
-            due_date: '',
-          }),
+          milestone: { ...mockMilestone, start_date: '', due_date: '' },
         });
 
         expect(wrapper.vm.milestoneDatesAbsolute).toBe('');
@@ -107,9 +94,7 @@ describe('IssueMilestoneComponent', () => {
     describe('milestoneDatesHuman', () => {
       it('returns string containing milestone due date when date is yet to be due', () => {
         wrapper.setProps({
-          milestone: Object.assign({}, mockMilestone, {
-            due_date: `${new Date().getFullYear() + 10}-01-01`,
-          }),
+          milestone: { ...mockMilestone, due_date: `${new Date().getFullYear() + 10}-01-01` },
         });
 
         expect(wrapper.vm.milestoneDatesHuman).toContain('years remaining');
@@ -117,10 +102,7 @@ describe('IssueMilestoneComponent', () => {
 
       it('returns string containing milestone start date when date has already started and due date is not present', () => {
         wrapper.setProps({
-          milestone: Object.assign({}, mockMilestone, {
-            start_date: '1990-07-22',
-            due_date: '',
-          }),
+          milestone: { ...mockMilestone, start_date: '1990-07-22', due_date: '' },
         });
 
         expect(wrapper.vm.milestoneDatesHuman).toContain('Started');
@@ -128,10 +110,11 @@ describe('IssueMilestoneComponent', () => {
 
       it('returns string containing milestone start date when date is yet to start and due date is not present', () => {
         wrapper.setProps({
-          milestone: Object.assign({}, mockMilestone, {
+          milestone: {
+            ...mockMilestone,
             start_date: `${new Date().getFullYear() + 10}-01-01`,
             due_date: '',
-          }),
+          },
         });
 
         expect(wrapper.vm.milestoneDatesHuman).toContain('Starts');
@@ -139,10 +122,7 @@ describe('IssueMilestoneComponent', () => {
 
       it('returns empty string when milestone start and due dates are not present', () => {
         wrapper.setProps({
-          milestone: Object.assign({}, mockMilestone, {
-            start_date: '',
-            due_date: '',
-          }),
+          milestone: { ...mockMilestone, start_date: '', due_date: '' },
         });
 
         expect(wrapper.vm.milestoneDatesHuman).toBe('');
diff --git a/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js b/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js
index f7b1f041ef2..dd24ecf707d 100644
--- a/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js
+++ b/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js
@@ -2,10 +2,7 @@ import Vue from 'vue';
 import { mount } from '@vue/test-utils';
 import { formatDate } from '~/lib/utils/datetime_utility';
 import RelatedIssuableItem from '~/vue_shared/components/issue/related_issuable_item.vue';
-import {
-  defaultAssignees,
-  defaultMilestone,
-} from '../../../../javascripts/vue_shared/components/issue/related_issuable_mock_data';
+import { defaultAssignees, defaultMilestone } from './related_issuable_mock_data';
 
 describe('RelatedIssuableItem', () => {
   let wrapper;