Merge pull request #18639 from crdlc/bug-1000454

Bug 1000454 - [B2G][1.4][Gaia]: The timestamp for a file downloaded a we...

apps/settings/test/unit/download_formatter_test.js

@@ -4,11 +4,18 @@
 require('/shared/test/unit/mocks/mock_download.js');
 requireApp('settings/test/unit/mock_l10n.js');
 require('/shared/js/download/download_formatter.js');
+require('/shared/test/unit/mocks/mock_lazy_loader.js');
 
 
 suite('DownloadFormatter', function() {
   var realL10n;
 
+  var mocksHelperForDownloadFormatter = new MocksHelper([
+    'LazyLoader'
+  ]).init();
+
+  mocksHelperForDownloadFormatter.attachTestHelpers();
+
   suiteSetup(function() {
     realL10n = navigator.mozL10n;
     navigator.mozL10n = MockL10n;
@@ -208,4 +215,26 @@ suite('DownloadFormatter', function() {
     var retrievedUUID = DownloadFormatter.getUUID(mockDownload);
     assert.equal(retrievedUUID, expectedUUID);
   });
+
+  test(' getDate', function(done) {
+    var now = new Date();
+    var expectedPrettyDate = 'pretty' + now.toString();
+    var stub = sinon.stub(navigator.mozL10n, 'DateTimeFormat', function(date) {
+      return {
+        fromNow: function(date, useCompactFormat) {
+          assert.isUndefined(useCompactFormat);
+          return 'pretty' + date.toString();
+        }
+      };
+    });
+
+    var mockDownload = new MockDownload({
+      startTime: now
+    });
+
+    DownloadFormatter.getDate(mockDownload, function(date) {
+      assert.equal(date, expectedPrettyDate);
+      done();
+    });
+  });
 });

shared/js/download/download_formatter.js

@@ -74,7 +74,7 @@
       }
 
       LazyLoader.load(['shared/js/l10n_date.js'], function onload() {
-        var prettyDate = navigator.mozL10n.DateTimeFormat().fromNow(date, true);
+        var prettyDate = navigator.mozL10n.DateTimeFormat().fromNow(date);
         callback && callback(prettyDate);
       });
     },