diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 21:06:29 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 21:06:29 +0000 |
commit | b9254657872c4db441ab268154686f5476fb4bc6 (patch) | |
tree | ab045c623296a049d1246ba2d66800456a1077aa /spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js | |
parent | c792263edfaf826c58f4aa41d26904464a17a3e7 (diff) | |
download | gitlab-ce-b9254657872c4db441ab268154686f5476fb4bc6.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js')
-rw-r--r-- | spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js | 14 |
1 files changed, 12 insertions, 2 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 2e1863cff86..ab28190ae64 100644 --- a/spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js +++ b/spec/javascripts/sidebar/components/time_tracking/time_tracker_spec.js @@ -83,8 +83,8 @@ describe('Issuable Time Tracker', () => { initTimeTrackingComponent({ timeEstimate: 100000, // 1d 3h timeSpent: 5000, // 1h 23m - timeEstimateHumanReadable: '', - timeSpentHumanReadable: '', + timeEstimateHumanReadable: '1d 3h', + timeSpentHumanReadable: '1h 23m', }); }); @@ -98,6 +98,16 @@ describe('Issuable Time Tracker', () => { }); }); + it('should show full times when the sidebar is collapsed', done => { + Vue.nextTick(() => { + const timeTrackingText = vm.$el.querySelector('.time-tracking-collapsed-summary span') + .innerText; + + expect(timeTrackingText).toBe('1h 23m / 1d 3h'); + done(); + }); + }); + describe('Remaining meter', () => { it('should display the remaining meter with the correct width', done => { Vue.nextTick(() => { |