Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-12

danger/changelog/Dangerfile

@@ -59,7 +59,7 @@ end
 
 if changelog_needed
   if changelog_found
-    check_changelog(path)
+    check_changelog(changelog_found)
   else
     warn format(MISSING_CHANGELOG_MESSAGE, mr_iid: gitlab.mr_json["iid"], labels: presented_no_changelog_labels)
   end

spec/javascripts/issuable_time_tracker_spec.js → spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js

-/* eslint-disable no-unused-vars, func-call-spacing, no-spaced-func, semi, quotes, space-infix-ops, max-len */
-
 import $ from 'jquery';
 import Vue from 'vue';
 
-import timeTracker from '~/sidebar/components/time_tracking/time_tracker.vue';
+import TimeTracker from '~/sidebar/components/time_tracking/time_tracker.vue';
+
+import mountComponent from 'spec/helpers/vue_mount_component_helper';
 
-function initTimeTrackingComponent(opts) {
-  setFixtures(`
+describe('Issuable Time Tracker', () => {
+  let initialData;
+  let vm;
+
+  const initTimeTrackingComponent = opts => {
+    setFixtures(`
     <div>
       <div id="mock-container"></div>
     </div>
   `);
 
-  this.initialData = {
-    time_estimate: opts.timeEstimate,
-    time_spent: opts.timeSpent,
-    human_time_estimate: opts.timeEstimateHumanReadable,
-    human_time_spent: opts.timeSpentHumanReadable,
-    rootPath: '/',
+    initialData = {
+      time_estimate: opts.timeEstimate,
+      time_spent: opts.timeSpent,
+      human_time_estimate: opts.timeEstimateHumanReadable,
+      human_time_spent: opts.timeSpentHumanReadable,
+      rootPath: '/',
+    };
+
+    const TimeTrackingComponent = Vue.extend({
+      ...TimeTracker,
+      components: {
+        ...TimeTracker.components,
+        transition: {
+          // disable animations
+          template: '<div><slot></slot></div>',
+        },
+      },
+    });
+    vm = mountComponent(TimeTrackingComponent, initialData, '#mock-container');
   };
 
-  const TimeTrackingComponent = Vue.extend(timeTracker);
-  this.timeTracker = new TimeTrackingComponent({
-    el: '#mock-container',
-    propsData: this.initialData,
+  afterEach(() => {
+    vm.$destroy();
   });
-}
 
-describe('Issuable Time Tracker', function() {
-  describe('Initialization', function() {
-    beforeEach(function() {
-      initTimeTrackingComponent.call(this, { timeEstimate: 100000, timeSpent: 5000, timeEstimateHumanReadable: '2h 46m', timeSpentHumanReadable: '1h 23m' });
+  describe('Initialization', () => {
+    beforeEach(() => {
+      initTimeTrackingComponent({
+        timeEstimate: 100000,
+        timeSpent: 5000,
+        timeEstimateHumanReadable: '2h 46m',
+        timeSpentHumanReadable: '1h 23m',
+      });
     });
 
-    it('should return something defined', function() {
-      expect(this.timeTracker).toBeDefined();
+    it('should return something defined', () => {
+      expect(vm).toBeDefined();
     });
 
-    it ('should correctly set timeEstimate', function(done) {
+    it('should correctly set timeEstimate', done => {
       Vue.nextTick(() => {
-        expect(this.timeTracker.timeEstimate).toBe(this.initialData.time_estimate);
+        expect(vm.timeEstimate).toBe(initialData.time_estimate);
         done();
       });
     });
-    it ('should correctly set time_spent', function(done) {
+
+    it('should correctly set time_spent', done => {
       Vue.nextTick(() => {
-        expect(this.timeTracker.timeSpent).toBe(this.initialData.time_spent);
+        expect(vm.timeSpent).toBe(initialData.time_spent);
         done();
       });
     });
   });
 
-  describe('Content Display', function() {
-    describe('Panes', function() {
-      describe('Comparison pane', function() {
-        beforeEach(function() {
-          initTimeTrackingComponent.call(this, { timeEstimate: 100000, timeSpent: 5000, timeEstimateHumanReadable: '', timeSpentHumanReadable: '' });
+  describe('Content Display', () => {
+    describe('Panes', () => {
+      describe('Comparison pane', () => {
+        beforeEach(() => {
+          initTimeTrackingComponent({
+            timeEstimate: 100000,
+            timeSpent: 5000,
+            timeEstimateHumanReadable: '',
+            timeSpentHumanReadable: '',
+          });
         });
 
-        it('should show the "Comparison" pane when timeEstimate and time_spent are truthy', function(done) {
+        it('should show the "Comparison" pane when timeEstimate and time_spent are truthy', done => {
           Vue.nextTick(() => {
-            const $comparisonPane = this.timeTracker.$el.querySelector('.time-tracking-comparison-pane');
-            expect(this.timeTracker.showComparisonState).toBe(true);
+            expect(vm.showComparisonState).toBe(true);
+            const $comparisonPane = vm.$el.querySelector('.time-tracking-comparison-pane');
+            expect($comparisonPane).toBeVisible();
             done();
           });
         });
 
-        describe('Remaining meter', function() {
-          it('should display the remaining meter with the correct width', function(done) {
+        describe('Remaining meter', () => {
+          it('should display the remaining meter with the correct width', done => {
             Vue.nextTick(() => {
-              const meterWidth = this.timeTracker.$el.querySelector('.time-tracking-comparison-pane .meter-fill').style.width;
+              const meterWidth = vm.$el.querySelector('.time-tracking-comparison-pane .meter-fill')
+                .style.width;
               const correctWidth = '5%';
 
               expect(meterWidth).toBe(correctWidth);
               done();
-            })
+            });
           });
 
-          it('should display the remaining meter with the correct background color when within estimate', function(done) {
+          it('should display the remaining meter with the correct background color when within estimate', done => {
             Vue.nextTick(() => {
-              const styledMeter = $(this.timeTracker.$el).find('.time-tracking-comparison-pane .within_estimate .meter-fill');
+              const styledMeter = $(vm.$el).find(
+                '.time-tracking-comparison-pane .within_estimate .meter-fill',
+              );
               expect(styledMeter.length).toBe(1);
-              done()
+              done();
             });
           });
 
-          it('should display the remaining meter with the correct background color when over estimate', function(done) {
-            this.timeTracker.time_estimate = 100000;
-            this.timeTracker.time_spent = 20000000;
+          it('should display the remaining meter with the correct background color when over estimate', done => {
+            vm.time_estimate = 100000;
+            vm.time_spent = 20000000;
             Vue.nextTick(() => {
-              const styledMeter = $(this.timeTracker.$el).find('.time-tracking-comparison-pane .over_estimate .meter-fill');
+              const styledMeter = $(vm.$el).find(
+                '.time-tracking-comparison-pane .over_estimate .meter-fill',
+              );
               expect(styledMeter.length).toBe(1);
               done();
             });
@@ -97,14 +127,20 @@ describe('Issuable Time Tracker', function() {
         });
       });
 
-      describe("Estimate only pane", function() {
-        beforeEach(function() {
-          initTimeTrackingComponent.call(this, { timeEstimate: 100000, timeSpent: 0, timeEstimateHumanReadable: '2h 46m', timeSpentHumanReadable: '' });
+      describe('Estimate only pane', () => {
+        beforeEach(() => {
+          initTimeTrackingComponent({
+            timeEstimate: 100000,
+            timeSpent: 0,
+            timeEstimateHumanReadable: '2h 46m',
+            timeSpentHumanReadable: '',
+          });
         });
 
-        it('should display the human readable version of time estimated', function(done) {
+        it('should display the human readable version of time estimated', done => {
           Vue.nextTick(() => {
-            const estimateText = this.timeTracker.$el.querySelector('.time-tracking-estimate-only-pane').innerText;
+            const estimateText = vm.$el.querySelector('.time-tracking-estimate-only-pane')
+              .innerText;
             const correctText = 'Estimated: 2h 46m';
 
             expect(estimateText).toBe(correctText);
@@ -113,14 +149,19 @@ describe('Issuable Time Tracker', function() {
         });
       });
 
-      describe('Spent only pane', function() {
-        beforeEach(function() {
-          initTimeTrackingComponent.call(this, { timeEstimate: 0, timeSpent: 5000, timeEstimateHumanReadable: '2h 46m', timeSpentHumanReadable: '1h 23m' });
+      describe('Spent only pane', () => {
+        beforeEach(() => {
+          initTimeTrackingComponent({
+            timeEstimate: 0,
+            timeSpent: 5000,
+            timeEstimateHumanReadable: '2h 46m',
+            timeSpentHumanReadable: '1h 23m',
+          });
         });
 
-        it('should display the human readable version of time spent', function(done) {
+        it('should display the human readable version of time spent', done => {
           Vue.nextTick(() => {
-            const spentText = this.timeTracker.$el.querySelector('.time-tracking-spend-only-pane').innerText;
+            const spentText = vm.$el.querySelector('.time-tracking-spend-only-pane').innerText;
             const correctText = 'Spent: 1h 23m';
 
             expect(spentText).toBe(correctText);
@@ -129,18 +170,23 @@ describe('Issuable Time Tracker', function() {
         });
       });
 
-      describe('No time tracking pane', function() {
-        beforeEach(function() {
-          initTimeTrackingComponent.call(this, { timeEstimate: 0, timeSpent: 0, timeEstimateHumanReadable: '', timeSpentHumanReadable: '' });
+      describe('No time tracking pane', () => {
+        beforeEach(() => {
+          initTimeTrackingComponent({
+            timeEstimate: 0,
+            timeSpent: 0,
+            timeEstimateHumanReadable: '',
+            timeSpentHumanReadable: '',
+          });
         });
 
-        it('should only show the "No time tracking" pane when both timeEstimate and time_spent are falsey', function(done) {
+        it('should only show the "No time tracking" pane when both timeEstimate and time_spent are falsey', done => {
           Vue.nextTick(() => {
-            const $noTrackingPane = this.timeTracker.$el.querySelector('.time-tracking-no-tracking-pane');
-            const noTrackingText =$noTrackingPane.innerText;
+            const $noTrackingPane = vm.$el.querySelector('.time-tracking-no-tracking-pane');
+            const noTrackingText = $noTrackingPane.innerText;
             const correctText = 'No estimate or time spent';
 
-            expect(this.timeTracker.showNoTimeTrackingState).toBe(true);
+            expect(vm.showNoTimeTrackingState).toBe(true);
             expect($noTrackingPane).toBeVisible();
             expect(noTrackingText).toBe(correctText);
             done();
@@ -148,52 +194,48 @@ describe('Issuable Time Tracker', function() {
         });
       });
 
-      describe("Help pane", function() {
-        beforeEach(function() {
-          initTimeTrackingComponent.call(this, { timeEstimate: 0, timeSpent: 0 });
-        });
+      describe('Help pane', () => {
+        const helpButton = () => vm.$el.querySelector('.help-button');
+        const closeHelpButton = () => vm.$el.querySelector('.close-help-button');
+        const helpPane = () => vm.$el.querySelector('.time-tracking-help-state');
 
-        it('should not show the "Help" pane by default', function(done) {
-          Vue.nextTick(() => {
-            const $helpPane = this.timeTracker.$el.querySelector('.time-tracking-help-state');
+        beforeEach(done => {
+          initTimeTrackingComponent({ timeEstimate: 0, timeSpent: 0 });
 
-            expect(this.timeTracker.showHelpState).toBe(false);
-            expect($helpPane).toBeNull();
-            done();
-          });
+          Vue.nextTick()
+            .then(done)
+            .catch(done.fail);
         });
 
-        it('should show the "Help" pane when help button is clicked', function(done) {
-          Vue.nextTick(() => {
-            $(this.timeTracker.$el).find('.help-button').click();
-
-            setTimeout(() => {
-              const $helpPane = this.timeTracker.$el.querySelector('.time-tracking-help-state');
-              expect(this.timeTracker.showHelpState).toBe(true);
-              expect($helpPane).toBeVisible();
-              done();
-            }, 10);
-          });
+        it('should not show the "Help" pane by default', () => {
+          expect(vm.showHelpState).toBe(false);
+          expect(helpPane()).toBeNull();
         });
 
-        it('should not show the "Help" pane when help button is clicked and then closed', function(done) {
-          Vue.nextTick(() => {
-            $(this.timeTracker.$el).find('.help-button').click();
-
-            setTimeout(() => {
+        it('should show the "Help" pane when help button is clicked', done => {
+          helpButton().click();
 
-              $(this.timeTracker.$el).find('.close-help-button').click();
-
-              setTimeout(() => {
-                const $helpPane = this.timeTracker.$el.querySelector('.time-tracking-help-state');
+          Vue.nextTick()
+            .then(() => {
+              expect(vm.showHelpState).toBe(true);
+              expect(helpPane()).toBeVisible();
+            })
+            .then(done)
+            .catch(done.fail);
+        });
 
-                expect(this.timeTracker.showHelpState).toBe(false);
-                expect($helpPane).toBeNull();
+        it('should not show the "Help" pane when help button is clicked and then closed', done => {
+          helpButton().click();
 
-                done();
-              }, 1000);
-            }, 1000);
-          });
+          Vue.nextTick()
+            .then(() => closeHelpButton().click())
+            .then(() => Vue.nextTick())
+            .then(() => {
+              expect(vm.showHelpState).toBe(false);
+              expect(helpPane()).toBeNull();
+            })
+            .then(done)
+            .catch(done.fail);
         });
       });
     });