From: Chris Hall <chall@pangeaequity.com>
Date: Tue, 6 Aug 2013 23:02:50 +0000 (-0500)
Subject: Split string value tests into their own test
X-Git-Tag: 2.2.0~33^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F979%2Fhead;p=thirdparty%2Fmoment.git

Split string value tests into their own test
---

diff --git a/test/moment/duration.js b/test/moment/duration.js
index 789479ae2..10ec139f0 100644
--- a/test/moment/duration.js
+++ b/test/moment/duration.js
@@ -11,8 +11,22 @@ exports.duration = {
             minutes: 9,
             seconds: 20,
             milliseconds: 12
-        }),
-        ds = moment.duration({
+        });
+
+        test.expect(8);
+        test.equal(d.years(),        2,  "years");
+        test.equal(d.months(),       3,  "months");
+        test.equal(d.weeks(),        2,  "weeks");
+        test.equal(d.days(),         15, "days"); // two weeks + 1 day
+        test.equal(d.hours(),        8,  "hours");
+        test.equal(d.minutes(),      9,  "minutes");
+        test.equal(d.seconds(),      20, "seconds");
+        test.equal(d.milliseconds(), 12, "milliseconds");
+        test.done();
+    },
+
+    "object instantiation with strings" : function (test) {
+        var d = moment.duration({
             years: '2',
             months: '3',
             weeks: '2',
@@ -23,7 +37,7 @@ exports.duration = {
             milliseconds: '12'
         });
 
-        test.expect(16);
+        test.expect(8);
         test.equal(d.years(),        2,  "years");
         test.equal(d.months(),       3,  "months");
         test.equal(d.weeks(),        2,  "weeks");
@@ -32,15 +46,6 @@ exports.duration = {
         test.equal(d.minutes(),      9,  "minutes");
         test.equal(d.seconds(),      20, "seconds");
         test.equal(d.milliseconds(), 12, "milliseconds");
-        // Check against string representations
-        test.equal(ds.years(),        d.years());
-        test.equal(ds.months(),       d.months());
-        test.equal(ds.weeks(),        d.weeks());
-        test.equal(ds.days(),         d.days());
-        test.equal(ds.hours(),        d.hours());
-        test.equal(ds.minutes(),      d.minutes());
-        test.equal(ds.seconds(),      d.seconds());
-        test.equal(ds.milliseconds(), d.milliseconds());
         test.done();
     },
 
@@ -52,22 +57,22 @@ exports.duration = {
 
     "instantiation by type" : function (test) {
         test.expect(16);
-        test.equal(moment.duration(1, "years").years(),         1, "years");
-        test.equal(moment.duration(1, "y").years(),         1, "y");
-        test.equal(moment.duration(2, "months").months(),        2, "months");
-        test.equal(moment.duration(2, "M").months(),        2, "M");
-        test.equal(moment.duration(3, "weeks").weeks(),         3, "weeks");
-        test.equal(moment.duration(3, "w").weeks(),         3, "weeks");
-        test.equal(moment.duration(4, "days").days(),          4, "days");
-        test.equal(moment.duration(4, "d").days(),          4, "d");
-        test.equal(moment.duration(5, "hours").hours(),         5, "hours");
-        test.equal(moment.duration(5, "h").hours(),         5, "h");
-        test.equal(moment.duration(6, "minutes").minutes(),       6, "minutes");
-        test.equal(moment.duration(6, "m").minutes(),       6, "m");
-        test.equal(moment.duration(7, "seconds").seconds(),       7, "seconds");
-        test.equal(moment.duration(7, "s").seconds(),       7, "s");
-        test.equal(moment.duration(8, "milliseconds").milliseconds(), 8, "milliseconds");
-        test.equal(moment.duration(8, "ms").milliseconds(), 8, "ms");
+        test.equal(moment.duration(1, "years").years(),                 1, "years");
+        test.equal(moment.duration(1, "y").years(),                     1, "y");
+        test.equal(moment.duration(2, "months").months(),               2, "months");
+        test.equal(moment.duration(2, "M").months(),                    2, "M");
+        test.equal(moment.duration(3, "weeks").weeks(),                 3, "weeks");
+        test.equal(moment.duration(3, "w").weeks(),                     3, "weeks");
+        test.equal(moment.duration(4, "days").days(),                   4, "days");
+        test.equal(moment.duration(4, "d").days(),                      4, "d");
+        test.equal(moment.duration(5, "hours").hours(),                 5, "hours");
+        test.equal(moment.duration(5, "h").hours(),                     5, "h");
+        test.equal(moment.duration(6, "minutes").minutes(),             6, "minutes");
+        test.equal(moment.duration(6, "m").minutes(),                   6, "m");
+        test.equal(moment.duration(7, "seconds").seconds(),             7, "seconds");
+        test.equal(moment.duration(7, "s").seconds(),                   7, "s");
+        test.equal(moment.duration(8, "milliseconds").milliseconds(),   8, "milliseconds");
+        test.equal(moment.duration(8, "ms").milliseconds(),             8, "ms");
         test.done();
     },