From: Sam Vincent <sam_vincent@acl.com>
Date: Mon, 16 Jun 2014 23:41:00 +0000 (-0700)
Subject: Runt grunt tests for jbrockmeyer's comit for Issue 1715
X-Git-Tag: 2.8.0~30^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1716%2Fhead;p=thirdparty%2Fmoment.git

Runt grunt tests for jbrockmeyer's comit for Issue 1715
---

diff --git a/moment.js b/moment.js
index 83282c6fd..06cd1d995 100644
--- a/moment.js
+++ b/moment.js
@@ -1851,6 +1851,11 @@
       if (relativeTimeThresholds[threshold] === undefined) {
         return false;
       }
+
+      if(limit  === undefined){
+        return relativeTimeThresholds[threshold];
+      }
+
       relativeTimeThresholds[threshold] = limit;
       return true;
     };
diff --git a/test/moment/relative_time.js b/test/moment/relative_time.js
index 3a39d46f3..6e00f5b5b 100644
--- a/test/moment/relative_time.js
+++ b/test/moment/relative_time.js
@@ -111,6 +111,16 @@ exports.relativeTime = {
         a.subtract('days', 1);
         test.equal(a.fromNow(), "a year ago", "Above custom days to years threshold");
         moment.relativeTimeThreshold('dy', 345);
+        test.done();
+    },
+
+    "retrive threshold settings" : function (test) {
+        test.expect(1);
+        moment.relativeTimeThreshold('m', 45);
+        var minuteThreshold = moment.relativeTimeThreshold('m');
+
+        test.equal(minuteThreshold, 45, "Can retrieve minute setting");
+
         test.done();
     }
 };