Add latest changes from gitlab-org/gitlab@13-3-stable-ee

1 files changed, 18 insertions, 4 deletions

diff --git a/spec/frontend/vue_shared/components/time_ago_tooltip_spec.js b/spec/frontend/vue_shared/components/time_ago_tooltip_spec.js
index 46fcb92455b..691e19473c1 100644
--- a/spec/frontend/vue_shared/components/time_ago_tooltip_spec.js
+++ b/spec/frontend/vue_shared/components/time_ago_tooltip_spec.js
@@ -1,16 +1,19 @@
 import { shallowMount } from '@vue/test-utils';
-import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
+
 import { formatDate, getTimeago } from '~/lib/utils/datetime_utility';
+import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 
 describe('Time ago with tooltip component', () => {
   let vm;
 
-  const buildVm = (propsData = {}) => {
+  const buildVm = (propsData = {}, scopedSlots = {}) => {
     vm = shallowMount(TimeAgoTooltip, {
       propsData,
+      scopedSlots,
     });
   };
   const timestamp = '2017-05-08T14:57:39.781Z';
+  const timeAgoTimestamp = getTimeago().format(timestamp);
 
   afterEach(() => {
     vm.destroy();
@@ -20,10 +23,9 @@ describe('Time ago with tooltip component', () => {
     buildVm({
       time: timestamp,
     });
-    const timeago = getTimeago();
 
     expect(vm.attributes('title')).toEqual(formatDate(timestamp));
-    expect(vm.text()).toEqual(timeago.format(timestamp));
+    expect(vm.text()).toEqual(timeAgoTimestamp);
   });
 
   it('should render provided html class', () => {
@@ -34,4 +36,16 @@ describe('Time ago with tooltip component', () => {
 
     expect(vm.classes()).toContain('foo');
   });
+
+  it('should render with the datetime attribute', () => {
+    buildVm({ time: timestamp });
+
+    expect(vm.attributes('datetime')).toEqual(timestamp);
+  });
+
+  it('should render provided scope content with the correct timeAgo string', () => {
+    buildVm({ time: timestamp }, { default: `<span>The time is {{ props.timeAgo }}</span>` });
+
+    expect(vm.text()).toEqual(`The time is ${timeAgoTimestamp}`);
+  });
 });