From: Matt Johnson <mj1856@hotmail.com>
Date: Sat, 12 Mar 2016 08:00:02 +0000 (-0800)
Subject: Restore unit tests commented out in #1379
X-Git-Tag: 2.13.0~36^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46f5f5f24eb581ffb032eccba7f2a1047aa0fb74;p=thirdparty%2Fmoment.git

Restore unit tests commented out in #1379
---

diff --git a/src/test/moment/getters_setters.js b/src/test/moment/getters_setters.js
index 44598b0b5..195ba26f8 100644
--- a/src/test/moment/getters_setters.js
+++ b/src/test/moment/getters_setters.js
@@ -120,36 +120,30 @@ test('setter programmatic', function (assert) {
     assert.equal(a.month(), 3, 'month edge case');
 });
 
-// Disable this, until we weekYear setter is fixed.
-// https://github.com/moment/moment/issues/1379
-// test('setters programatic with weeks', function (assert) {
-//     var a = moment();
-//     a.set('weekYear', 2001);
-//     a.set('week', 49);
-//     a.set('day', 4);
-//     assert.equals(a.weekYear(), 2001);
-//     assert.equals(a.week(), 49);
-//     assert.equals(a.day(), 4);
-
-//     a.set('weekday', 1);
-//     assert.equals(a.weekday(), 1);
+test('setters programatic with weeks', function (assert) {
+    var a = moment();
+    a.set('weekYear', 2001);
+    a.set('week', 49);
+    a.set('day', 4);
 
-//     assert.done();
-//},
+    assert.equal(a.weekYear(), 2001, 'weekYear');
+    assert.equal(a.week(), 49, 'week');
+    assert.equal(a.day(), 4, 'day');
 
-// I think this suffers from the same issue as the non-iso version.
-// test('setters programatic with weeks ISO', function (assert) {
-//     var a = moment();
-//     a.set('isoWeekYear', 2001);
-//     a.set('isoWeek', 49);
-//     a.set('isoWeekday', 4);
+    a.set('weekday', 1);
+    assert.equal(a.weekday(), 1, 'weekday');
+});
 
-//     assert.equals(a.weekYear(), 2001);
-//     assert.equals(a.week(), 49);
-//     assert.equals(a.day(), 4);
+test('setters programatic with weeks ISO', function (assert) {
+    var a = moment();
+    a.set('isoWeekYear', 2001);
+    a.set('isoWeek', 49);
+    a.set('isoWeekday', 4);
 
-//     assert.done();
-//},
+    assert.equal(a.weekYear(), 2001, 'weekYear');
+    assert.equal(a.week(), 49, 'week');
+    assert.equal(a.day(), 4, 'day');
+});
 
 test('setters strings', function (assert) {
     var a = moment([2012]).locale('en');