Merge branch 'fl-fix-ca-time-component' into 'master'

app/assets/javascripts/cycle_analytics/components/total_time_component.vue

@@ -20,7 +20,7 @@
       <template v-if="time.days">{{ time.days }} <span>{{ n__('day', 'days', time.days) }}</span></template>
       <template v-if="time.hours">{{ time.hours }} <span>{{ n__('Time|hr', 'Time|hrs', time.hours) }}</span></template>
       <template v-if="time.mins && !time.days">{{ time.mins }} <span>{{ n__('Time|min', 'Time|mins', time.mins) }}</span></template>
-      <template v-if="time.seconds && hasDa === 1 || time.seconds === 0">{{ time.seconds }} <span>{{ s__('Time|s') }}</span></template>
+      <template v-if="time.seconds && hasData === 1 || time.seconds === 0">{{ time.seconds }} <span>{{ s__('Time|s') }}</span></template>
     </template>
     <template v-else>
       --

changelogs/unreleased/fl-fix-ca-time-component.yml

+---
+title: Fix typo in cycle analytics breaking time component
+merge_request:
+author:
+type: fixed

spec/javascripts/cycle_analytics/total_time_component_spec.js

+import Vue from 'vue';
+import component from '~/cycle_analytics/components/total_time_component.vue';
+import mountComponent from '../helpers/vue_mount_component_helper';
+
+describe('Total time component', () => {
+  let vm;
+  let Component;
+
+  beforeEach(() => {
+    Component = Vue.extend(component);
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('With data', () => {
+    it('should render information for days and hours', () => {
+      vm = mountComponent(Component, {
+        time: {
+          days: 3,
+          hours: 4,
+        },
+      });
+
+      expect(vm.$el.textContent.trim()).toEqual('3 days 4 hrs');
+    });
+
+    it('should render information for hours and minutes', () => {
+      vm = mountComponent(Component, {
+        time: {
+          hours: 4,
+          mins: 35,
+        },
+      });
+
+      expect(vm.$el.textContent.trim()).toEqual('4 hrs 35 mins');
+    });
+
+    it('should render information for seconds', () => {
+      vm = mountComponent(Component, {
+        time: {
+          seconds: 45,
+        },
+      });
+
+      expect(vm.$el.textContent.trim()).toEqual('45 s');
+    });
+  });
+
+  describe('Without data', () => {
+    it('should render no information', () => {
+      vm = mountComponent(Component);
+
+      expect(vm.$el.textContent.trim()).toEqual('--');
+    });
+  });
+});