Fixed week/weeks rollover in relativeTime

mde · Sep 4, 2012 · f8cef24 · f8cef24
1 parent 9bf2db4
commit f8cef24
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/lib/date.js b/lib/date.js
@@ -832,11 +832,11 @@ date = new (function () {
         num = parseInt((diff / day), 10);
         ret = abbr ? num + 'd' : 'about ' + num + ' days ago';
         break;
-      case diff < (8*day):
+      case diff < (11*day):
         ret = abbr ? '1w': 'one week ago';
         break;
       case diff < (1*month):
-        num = parseInt((diff / week), 10);
+        num = Math.round(diff / week);
         ret = abbr ? num + 'w' : 'about ' + num + ' weeks ago';
         break;
       default:

diff --git a/test/date.js b/test/date.js
@@ -22,36 +22,54 @@ var date = require('../lib/date')
 
 tests = {
 
-  'test strftime for date': function() {
+  'test strftime for date': function () {
     var data = date.strftime(_date, "%w")
       , actual = _date.getDay();
     assert.equal(actual, data);
   }
 
-, 'test calcCentury using current year for date': function() {
+, 'test calcCentury using current year for date': function () {
     var data = date.calcCentury()
       , actual = '21';
     assert.equal(actual, data);
   }
 
-, 'test calcCentury using 20th century year for date': function() {
+, 'test calcCentury using 20th century year for date': function () {
     var data = date.calcCentury(2000)
       , actual = '20';
     assert.equal(actual, data);
   }
 
-, 'test calcCentury using 1st century year for date': function() {
+, 'test calcCentury using 1st century year for date': function () {
     var data = date.calcCentury(10)
       , actual = '1';
     assert.equal(actual, data);
   }
 
-, 'test getMeridiem for date': function() {
+, 'test getMeridiem for date': function () {
     var data = date.getMeridiem(_date.getHours())
       , actual = (_date.getHours() > 11) ? 'PM' : 'AM';
     assert.equal(actual, data);
   }
 
+, 'test relativeTime week/weeks switchover': function () {
+    var dtA = new Date()
+      , dtB
+      , res;
+
+      dtB = date.add(dtA, 'day', 10);
+      dtB = date.add(dtB, 'hour', 23);
+      dtB = date.add(dtB, 'minute', 59);
+      dtB = date.add(dtB, 'second', 59);
+      dtB = date.add(dtB, 'millisecond', 999);
+    res = date.relativeTime(dtA, {now: dtB});
+    assert.equal('one week ago', res);
+
+    dtB = date.add(dtB, 'millisecond', 1);
+    res = date.relativeTime(dtA, {now: dtB});
+    assert.equal('about 2 weeks ago', res);
+  }
+
 };
 
 module.exports = tests;