Merge branch 'fix-Build-timeFor' into 'master'

Fix typo in Build page JavaScript

## What does this MR do?

fixes #24614

See merge request !7563

4 files changed, 25 insertions, 1 deletions

diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js
index 68012e8cf42..e198306e67a 100644
--- a/app/assets/javascripts/build.js
+++ b/app/assets/javascripts/build.js
@@ -172,7 +172,7 @@
       $date = $('.js-artifacts-remove');
       if ($date.length) {
         date = $date.text();
-        return $date.text(gl.utils.timefor(new Date(date.replace(/([0-9]+)-([0-9]+)-([0-9]+)/g, '$1/$2/$3')), ' '));
+        return $date.text(gl.utils.timeFor(new Date(date.replace(/([0-9]+)-([0-9]+)-([0-9]+)/g, '$1/$2/$3')), ' '));
       }
     };
 
diff --git a/changelogs/unreleased/fix-Build-timeFor.yml b/changelogs/unreleased/fix-Build-timeFor.yml
new file mode 100644
index 00000000000..ea115f7ee67
--- /dev/null
+++ b/changelogs/unreleased/fix-Build-timeFor.yml
@@ -0,0 +1,4 @@
+---
+title: Fix typo in Build page JavaScript
+merge_request: 7563
+author: winniehell
diff --git a/spec/javascripts/build_spec.js.es6 b/spec/javascripts/build_spec.js.es6
index 370944b6a8c..e21e5844a26 100644
--- a/spec/javascripts/build_spec.js.es6
+++ b/spec/javascripts/build_spec.js.es6
@@ -1,5 +1,7 @@
 /* global Build */
 /* eslint-disable no-new */
+//= require lib/utils/timeago
+//= require lib/utils/datetime_utility
 //= require build
 //= require breakpoints
 //= require jquery.nicescroll
@@ -24,7 +26,15 @@
       });
 
       describe('setup', function () {
+        const removeDate = new Date();
+        removeDate.setUTCFullYear(removeDate.getUTCFullYear() + 1);
+        // give the test three days to run
+        removeDate.setTime(removeDate.getTime() + (3 * 24 * 60 * 60 * 1000));
+
         beforeEach(function () {
+          const removeDateElement = document.querySelector('.js-artifacts-remove');
+          removeDateElement.innerText = removeDate.toString();
+
           this.build = new Build();
         });
 
@@ -54,6 +64,11 @@
           expect($('.build-job[data-stage="test"]').is(':visible')).toBe(false);
           expect($('.build-job[data-stage="deploy"]').is(':visible')).toBe(false);
         });
+
+        it('displays the remove date correctly', function () {
+          const removeDateElement = document.querySelector('.js-artifacts-remove');
+          expect(removeDateElement.innerText.trim()).toBe('1 year');
+        });
       });
 
       describe('initial build trace', function () {
diff --git a/spec/javascripts/fixtures/build.html.haml b/spec/javascripts/fixtures/build.html.haml
index a2bc81c6be7..27136beb14c 100644
--- a/spec/javascripts/fixtures/build.html.haml
+++ b/spec/javascripts/fixtures/build.html.haml
@@ -55,3 +55,8 @@
   build_status: 'passed',
   build_stage: 'test',
   state1: 'buildstate' }}
+
+%p.build-detail-row
+  The artifacts will be removed in
+  %span.js-artifacts-remove
+    2016-12-19 09:02:12 UTC