diff options
author | Johann Hubert Sonntagbauer <johann.sonntagbauer@gmail.com> | 2018-10-03 08:34:13 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-10-03 08:34:13 +0000 |
commit | 65d7bf20e3b962f7f0db3dbc1dc331ec076a6823 (patch) | |
tree | ebe12ab2efd4a194a93fd9a0ae608c910bb40821 /spec/javascripts/sidebar | |
parent | 474231eab20718699a416d7030aba995973df8c1 (diff) | |
download | gitlab-ce-65d7bf20e3b962f7f0db3dbc1dc331ec076a6823.tar.gz |
Fix props name casing in time time tracker vue component
Diffstat (limited to 'spec/javascripts/sidebar')
-rw-r--r-- | spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js b/spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js index 9dff52a9d49..0e30759c41d 100644 --- a/spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js +++ b/spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js @@ -8,7 +8,10 @@ describe('Issuable Time Tracker', () => { let initialData; let vm; - const initTimeTrackingComponent = opts => { + const initTimeTrackingComponent = ({ timeEstimate, + timeSpent, + timeEstimateHumanReadable, + timeSpentHumanReadable }) => { setFixtures(` <div> <div id="mock-container"></div> @@ -16,10 +19,10 @@ describe('Issuable Time Tracker', () => { `); initialData = { - time_estimate: opts.timeEstimate, - time_spent: opts.timeSpent, - human_time_estimate: opts.timeEstimateHumanReadable, - human_time_spent: opts.timeSpentHumanReadable, + timeEstimate, + timeSpent, + humanTimeEstimate: timeEstimateHumanReadable, + humanTimeSpent: timeSpentHumanReadable, rootPath: '/', }; @@ -43,8 +46,8 @@ describe('Issuable Time Tracker', () => { describe('Initialization', () => { beforeEach(() => { initTimeTrackingComponent({ - timeEstimate: 100000, - timeSpent: 5000, + timeEstimate: 10000, // 2h 46m + timeSpent: 5000, // 1h 23m timeEstimateHumanReadable: '2h 46m', timeSpentHumanReadable: '1h 23m', }); @@ -56,14 +59,14 @@ describe('Issuable Time Tracker', () => { it('should correctly set timeEstimate', done => { Vue.nextTick(() => { - expect(vm.timeEstimate).toBe(initialData.time_estimate); + expect(vm.timeEstimate).toBe(initialData.timeEstimate); done(); }); }); it('should correctly set time_spent', done => { Vue.nextTick(() => { - expect(vm.timeSpent).toBe(initialData.time_spent); + expect(vm.timeSpent).toBe(initialData.timeSpent); done(); }); }); @@ -74,8 +77,8 @@ describe('Issuable Time Tracker', () => { describe('Comparison pane', () => { beforeEach(() => { initTimeTrackingComponent({ - timeEstimate: 100000, - timeSpent: 5000, + timeEstimate: 100000, // 1d 3h + timeSpent: 5000, // 1h 23m timeEstimateHumanReadable: '', timeSpentHumanReadable: '', }); @@ -106,8 +109,8 @@ describe('Issuable Time Tracker', () => { }); it('should display the remaining meter with the correct background color when over estimate', done => { - vm.time_estimate = 100000; - vm.time_spent = 20000000; + vm.timeEstimate = 10000; // 2h 46m + vm.timeSpent = 20000000; // 231 days Vue.nextTick(() => { expect(vm.$el.querySelector('.time-tracking-comparison-pane .progress[variant="danger"]')).not.toBeNull(); done(); @@ -119,7 +122,7 @@ describe('Issuable Time Tracker', () => { describe('Estimate only pane', () => { beforeEach(() => { initTimeTrackingComponent({ - timeEstimate: 100000, + timeEstimate: 10000, // 2h 46m timeSpent: 0, timeEstimateHumanReadable: '2h 46m', timeSpentHumanReadable: '', @@ -142,7 +145,7 @@ describe('Issuable Time Tracker', () => { beforeEach(() => { initTimeTrackingComponent({ timeEstimate: 0, - timeSpent: 5000, + timeSpent: 5000, // 1h 23m timeEstimateHumanReadable: '2h 46m', timeSpentHumanReadable: '1h 23m', }); |