From: Iskren Chernev <iskren.chernev@gmail.com>
Date: Thu, 2 Mar 2017 08:20:34 +0000 (+0200)
Subject: Fix test broken only in March
X-Git-Tag: 2.18.0~50^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5d8f03459d96069e2376e8eaefeec9c7982bb24;p=thirdparty%2Fmoment.git

Fix test broken only in March

Even if you set custom rounding threshold for days -> month, because relative
time works on durations, which computes it from two moments, if its over
a month in real terms (1st Feb to 2nd March) it will be shown as a month no
matter the thres. It might be considered a bug, but for now it's a feature.
---

diff --git a/src/test/moment/relative_time.js b/src/test/moment/relative_time.js
index adb9652a1..7579e909f 100644
--- a/src/test/moment/relative_time.js
+++ b/src/test/moment/relative_time.js
@@ -148,7 +148,7 @@ test('custom rounding', function (assert) {
     moment.relativeTimeThreshold('s', 60);
     moment.relativeTimeThreshold('m', 60);
     moment.relativeTimeThreshold('h', 24);
-    moment.relativeTimeThreshold('d', 31);
+    moment.relativeTimeThreshold('d', 27);
     moment.relativeTimeThreshold('M', 12);
 
     var a = moment.utc();
@@ -160,8 +160,12 @@ test('custom rounding', function (assert) {
     assert.equal(a.toNow(), 'in 23 hours', 'Round down towards the nearest hour');
 
     a = moment.utc();
-    a.subtract({days: 30, hours: 23, minutes: 59});
-    assert.equal(a.toNow(), 'in 30 days', 'Round down towards the nearest day');
+    a.subtract({days: 26, hours: 23, minutes: 59});
+    assert.equal(a.toNow(), 'in 26 days', 'Round down towards the nearest day (just under)');
+
+    a = moment.utc();
+    a.subtract({days: 27});
+    assert.equal(a.toNow(), 'in a month', 'Round down towards the nearest day (just over)');
 
     a = moment.utc();
     a.subtract({days: 364});