Add tests for moment#toNow and fixed prototype

diff --git a/src/lib/moment/prototype.js b/src/lib/moment/prototype.js
index 2e77b6dfc69292a0b079e135b641e1ca28fac98f..5601bc0bf3b3dfbf87da7f5db4b76f4255c7db40 100644 (file)
--- a/src/lib/moment/prototype.js
+++ b/src/lib/moment/prototype.js
@@ -26,7 +26,7 @@ proto.format       = format;
 proto.from         = from;
 proto.fromNow      = fromNow;
 proto.to           = to;
-proto.toNow        = fromNow;
+proto.toNow        = toNow;
 proto.get          = getSet;
 proto.invalidAt    = invalidAt;
 proto.isAfter      = isAfter;

diff --git a/src/test/moment/relative_time.js b/src/test/moment/relative_time.js
index 359037b1119d3a5e37e7d53ea8b3e608858fc601..0270ab1753d62d65fe8131d64333493451389b66 100644 (file)
--- a/src/test/moment/relative_time.js
+++ b/src/test/moment/relative_time.js
@@ -3,7 +3,7 @@ import moment from '../../moment';
 
 module('relative time');
 
-test('default thresholds', function (assert) {
+test('default thresholds fromNow', function (assert) {
     var a = moment();
 
     // Seconds to minutes threshold
@@ -41,6 +41,44 @@ test('default thresholds', function (assert) {
     assert.equal(a.fromNow(), 'a year ago', 'Above default days to years threshold');
 });
 
+test('default thresholds toNow', function (assert) {
+    var a = moment();
+
+    // Seconds to minutes threshold
+    a.subtract(44, 'seconds');
+    assert.equal(a.toNow(), 'in a few seconds', 'Below default seconds to minutes threshold');
+    a.subtract(1, 'seconds');
+    assert.equal(a.toNow(), 'in a minute', 'Above default seconds to minutes threshold');
+
+    // Minutes to hours threshold
+    a = moment();
+    a.subtract(44, 'minutes');
+    assert.equal(a.toNow(), 'in 44 minutes', 'Below default minute to hour threshold');
+    a.subtract(1, 'minutes');
+    assert.equal(a.toNow(), 'in an hour', 'Above default minute to hour threshold');
+
+    // Hours to days threshold
+    a = moment();
+    a.subtract(21, 'hours');
+    assert.equal(a.toNow(), 'in 21 hours', 'Below default hours to day threshold');
+    a.subtract(1, 'hours');
+    assert.equal(a.toNow(), 'in a day', 'Above default hours to day threshold');
+
+    // Days to month threshold
+    a = moment();
+    a.subtract(25, 'days');
+    assert.equal(a.toNow(), 'in 25 days', 'Below default days to month (singular) threshold');
+    a.subtract(1, 'days');
+    assert.equal(a.toNow(), 'in a month', 'Above default days to month (singular) threshold');
+
+    // months to year threshold
+    a = moment();
+    a.subtract(10, 'months');
+    assert.equal(a.toNow(), 'in 10 months', 'Below default days to years threshold');
+    a.subtract(1, 'month');
+    assert.equal(a.toNow(), 'in a year', 'Above default days to years threshold');
+});
+
 test('custom thresholds', function (assert) {
     // Seconds to minutes threshold
     moment.relativeTimeThreshold('s', 55);