Add latest changes from gitlab-org/gitlab@master

1 files changed, 22 insertions, 0 deletions

diff --git a/spec/frontend/lib/utils/datetime_utility_spec.js b/spec/frontend/lib/utils/datetime_utility_spec.js
index e584150ba70..27b88d78ff0 100644
--- a/spec/frontend/lib/utils/datetime_utility_spec.js
+++ b/spec/frontend/lib/utils/datetime_utility_spec.js
@@ -1,4 +1,6 @@
 import { __, s__ } from '~/locale';
+import $ from 'jquery';
+import '~/commons/bootstrap';
 import * as datetimeUtility from '~/lib/utils/datetime_utility';
 
 describe('Date time utils', () => {
@@ -563,3 +565,23 @@ describe('approximateDuration', () => {
     expect(datetimeUtility.approximateDuration(seconds)).toBe(approximation);
   });
 });
+
+describe('localTimeAgo', () => {
+  beforeEach(() => {
+    document.body.innerHTML = `<time title="some time" datetime="2020-02-18T22:22:32Z">1 hour ago</time>`;
+  });
+
+  it.each`
+    timeagoArg | title          | dataOriginalTitle
+    ${false}   | ${'some time'} | ${null}
+    ${true}    | ${''}          | ${'Feb 18, 2020 10:22pm GMT+0000'}
+  `('converts $seconds seconds to $approximation', ({ timeagoArg, title, dataOriginalTitle }) => {
+    const element = document.querySelector('time');
+    datetimeUtility.localTimeAgo($(element), timeagoArg);
+
+    jest.runAllTimers();
+
+    expect(element.getAttribute('data-original-title')).toBe(dataOriginalTitle);
+    expect(element.getAttribute('title')).toBe(title);
+  });
+});