From: Tim Wood <washwithcare@gmail.com>
Date: Fri, 9 Dec 2011 17:29:04 +0000 (+0200)
Subject: Cleaning up timezone unit tests
X-Git-Tag: 1.3.0~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89663e53723235b0d2d8fd8f74b59c7d3140c2d2;p=thirdparty%2Fmoment.git

Cleaning up timezone unit tests

Adding disclaimer to isDST and only checking adding DST tests if there
is actually DST.
See #91
---

diff --git a/sitesrc/js/unit-tests.js b/sitesrc/js/unit-tests.js
index ea73b5100..48d3056c8 100755
--- a/sitesrc/js/unit-tests.js
+++ b/sitesrc/js/unit-tests.js
@@ -228,7 +228,11 @@ test("adding across DST", 3, function(){
     b.add('hours', 24);
     c.add('months', 1);
     equal(a.hours(), 5, 'adding days over DST difference should result in the same hour');
-    equal(b.hours(), 6, 'adding hours over DST difference should result in a different hour');
+    if (b.isDST()) {
+        equal(b.hours(), 6, 'adding hours over DST difference should result in a different hour');
+    } else {
+        equal(b.hours(), 5, 'adding hours over DST difference should result in a same hour if the timezone does not have daylight savings time');
+    }
     equal(c.hours(), 5, 'adding months over DST difference should result in the same hour');
 });
 
@@ -366,8 +370,8 @@ test("isDST", 2, function() {
     // In the US 2011 March 13 is Daylight Savings Day
     var a = moment(new Date(2011, 2, 12, 0, 0, 0)),
         b = moment(new Date(2011, 2, 14, 0, 0, 0));
-    ok(!a.isDST(), '2011 March 12 is not DST');
-    ok(b.isDST(), '2011 March 14 is DST');
+    ok(!a.isDST(), 'March 12 2011 is not DST');
+    ok(b.isDST(), 'March 14 2011 is DST (Note: this unit test should fail if your timezone does not have Daylight Savings Time)');
 });
 
 test("zone", 2, function() {