Adding week tests for arabic

#527 #503

diff --git a/lang/ar-ma.js b/lang/ar-ma.js
index 705db6a70975ce7f555592d3fa555779b0287318..ee07211bdb13d5e598d2541260357901c2719083 100644 (file)
--- a/lang/ar-ma.js
+++ b/lang/ar-ma.js
@@ -5,7 +5,7 @@
 (function () {
     var lang = {
             months : "يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),
-            monthsShort : "يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"), 
+            monthsShort : "يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),
             weekdays : "الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),
             weekdaysShort : "احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت".split("_"),
             weekdaysMin : "ح_ن_ث_ر_خ_ج_س".split("_"),
@@ -41,6 +41,10 @@
             },
             ordinal : function (number) {
                 return '';
+            },
+            week : {
+                dow : 6, // Saturday is the first day of the week.
+                doy : 12  // The week that contains Jan 1st is the first week of the year.
             }
         };
 

diff --git a/lang/ar.js b/lang/ar.js
index 526ae1614d7dcd3678d1a67580a172de52be1bab..1bbce7c278fb1c876e59cd22a274619e67b2a1bf 100644 (file)
--- a/lang/ar.js
+++ b/lang/ar.js
@@ -4,7 +4,7 @@
 (function () {
     var lang = {
             months : "كانون الثاني_ﺶﺑﺎﻃ_آذار_نيسان_أيار_حزيران_تموز_آب_أيلول_تشرين الأول_تشرين الثاني_كانون الأول".split("_"),
-            monthsShort : "كانون الثاني_ﺶﺑﺎﻃ_آذار_نيسان_أيار_حزيران_تموز_آب_أيلول_تشرين الأول_تشرين الثاني_كانون الأول".split("_"), 
+            monthsShort : "كانون الثاني_ﺶﺑﺎﻃ_آذار_نيسان_أيار_حزيران_تموز_آب_أيلول_تشرين الأول_تشرين الثاني_كانون الأول".split("_"),
             weekdays : "الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),
             weekdaysShort : "احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت".split("_"),
             weekdaysMin : "ح_ن_ث_ر_خ_ج_س".split("_"),
@@ -40,6 +40,10 @@
             },
             ordinal : function (number) {
                 return '';
+            },
+            week : {
+                dow : 6, // Saturday is the first day of the week.
+                doy : 12  // The week that contains Jan 1st is the first week of the year.
             }
         };
 

diff --git a/lang/tzm-la.js b/lang/tzm-la.js
index 26f2c384d16b9f28e8570a8734e8588467b15983..17a573b8fb54efcda528aeceef494827218dc677 100644 (file)
--- a/lang/tzm-la.js
+++ b/lang/tzm-la.js
@@ -4,7 +4,7 @@
 (function () {
     var lang = {
             months : "innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir".split("_"),
-            monthsShort : "innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir".split("_"), 
+            monthsShort : "innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir".split("_"),
             weekdays : "asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"),
             weekdaysShort : "asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"),
             weekdaysMin : "asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"),
@@ -40,6 +40,10 @@
             },
             ordinal : function (number) {
                 return '';
+            },
+            week : {
+                dow : 6, // Saturday is the first day of the week.
+                doy : 12  // The week that contains Jan 1st is the first week of the year.
             }
         };
 

diff --git a/lang/tzm.js b/lang/tzm.js
index fd02c239ada02585cb5ad231f91754c1ef6fc0a2..83a40b0fafe9492c5cafb61a5edc5d2f36c4c18f 100644 (file)
--- a/lang/tzm.js
+++ b/lang/tzm.js
@@ -4,7 +4,7 @@
 (function () {
     var lang = {
             months : "ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ".split("_"),
-            monthsShort : "ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ".split("_"), 
+            monthsShort : "ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ".split("_"),
             weekdays : "ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),
             weekdaysShort : "ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),
             weekdaysMin : "ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),
@@ -40,6 +40,10 @@
             },
             ordinal : function (number) {
                 return '';
+            },
+            week : {
+                dow : 6, // Saturday is the first day of the week.
+                doy : 12  // The week that contains Jan 1st is the first week of the year.
             }
         };
 

diff --git a/test/lang/ar-ma.js b/test/lang/ar-ma.js
index e5b4f1a23bf89e43d508a6aaa968ccee6ce3497a..913749c2e30a813a2c8b03634ec54a354aa4f713 100644 (file)
--- a/test/lang/ar-ma.js
+++ b/test/lang/ar-ma.js
@@ -1,4 +1,4 @@
-// moment.js Moroccan arabic (ar-ma) tests 
+// moment.js Moroccan arabic (ar-ma) tests
 // author: Abdel Said : https://github.com/abdelsaid
 var moment = require("../../moment");
 
@@ -36,7 +36,7 @@ exports["lang:ar-ma"] = {
                 ['D Do DD',                            '14 14 14'],
                 ['d do dddd ddd dd',                   '0 0 الأحد احد ح'],
                 ['DDD DDDo DDDD',                      '45 45 045'],
-                ['w wo ww',                            '6 6 06'],
+                ['w wo ww',                            '8 8 08'],
                 ['h hh',                               '3 03'],
                 ['H HH',                               '15 15'],
                 ['m mm',                               '25 25'],
@@ -69,7 +69,7 @@ exports["lang:ar-ma"] = {
         test.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8');
         test.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9');
         test.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10');
-    
+
         test.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11');
         test.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12');
         test.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13');
@@ -80,7 +80,7 @@ exports["lang:ar-ma"] = {
         test.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18');
         test.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19');
         test.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20');
-    
+
         test.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21');
         test.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22');
         test.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23');
@@ -91,7 +91,7 @@ exports["lang:ar-ma"] = {
         test.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28');
         test.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29');
         test.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30');
-    
+
         test.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31');
         test.done();
     },
@@ -181,9 +181,9 @@ exports["lang:ar-ma"] = {
     "calendar day" : function(test) {
         test.expect(6);
         moment.lang('ar-ma');
-    
+
         var a = moment().hours(2).minutes(0).seconds(0);
-    
+
         test.equal(moment(a).calendar(),                     "اليوم على الساعة 02:00",     "today at the same time");
         test.equal(moment(a).add({ m: 25 }).calendar(),      "اليوم على الساعة 02:25",     "Now plus 25 min");
         test.equal(moment(a).add({ h: 1 }).calendar(),       "اليوم على الساعة 03:00",     "Now plus 1 hour");
@@ -196,10 +196,10 @@ exports["lang:ar-ma"] = {
     "calendar next week" : function(test) {
         test.expect(15);
         moment.lang('ar-ma');
-    
+
         var i;
         var m;
-    
+
         for (i = 2; i < 7; i++) {
             m = moment().add({ d: i });
             test.equal(m.calendar(),       m.format('dddd [على الساعة] LT'),  "Today + " + i + " days current time");
@@ -214,7 +214,7 @@ exports["lang:ar-ma"] = {
     "calendar last week" : function(test) {
         test.expect(15);
         moment.lang('ar-ma');
-    
+
         for (i = 2; i < 7; i++) {
             m = moment().subtract({ d: i });
             test.equal(m.calendar(),       m.format('dddd [على الساعة] LT'),  "Today - " + i + " days current time");
@@ -231,15 +231,118 @@ exports["lang:ar-ma"] = {
         moment.lang('ar-ma');
         var weeksAgo = moment().subtract({ w: 1 });
         var weeksFromNow = moment().add({ w: 1 });
-        
+
         test.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  "1 week ago");
         test.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  "in 1 week");
-    
+
         weeksAgo = moment().subtract({ w: 2 });
         weeksFromNow = moment().add({ w: 2 });
-        
+
         test.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  "2 weeks ago");
         test.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  "in 2 weeks");
-    test.done();
+        test.done();
+    },
+
+
+    // Saturday is the first day of the week.
+    // The week that contains Jan 1st is the first week of the year.
+
+    "weeks year starting sunday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2011, 11, 31]).week(), 1, "Dec 31 2011 should be week 1");
+        test.equal(moment([2012,  0,  6]).week(), 1, "Jan  6 2012 should be week 1");
+        test.equal(moment([2012,  0,  7]).week(), 2, "Jan  7 2012 should be week 2");
+        test.equal(moment([2012,  0, 13]).week(), 2, "Jan 13 2012 should be week 2");
+        test.equal(moment([2012,  0, 14]).week(), 3, "Jan 14 2012 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting monday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2006, 11, 30]).week(), 1, "Dec 30 2006 should be week 1");
+        test.equal(moment([2007,  0,  5]).week(), 1, "Jan  5 2007 should be week 1");
+        test.equal(moment([2007,  0,  6]).week(), 2, "Jan  6 2007 should be week 2");
+        test.equal(moment([2007,  0, 12]).week(), 2, "Jan 12 2007 should be week 2");
+        test.equal(moment([2007,  0, 13]).week(), 3, "Jan 13 2007 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting tuesday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2007, 11, 29]).week(), 1, "Dec 29 2007 should be week 1");
+        test.equal(moment([2008,  0,  1]).week(), 1, "Jan  1 2008 should be week 1");
+        test.equal(moment([2008,  0,  4]).week(), 1, "Jan  4 2008 should be week 1");
+        test.equal(moment([2008,  0,  5]).week(), 2, "Jan  5 2008 should be week 2");
+        test.equal(moment([2008,  0, 11]).week(), 2, "Jan 11 2008 should be week 2");
+        test.equal(moment([2008,  0, 12]).week(), 3, "Jan 12 2008 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting wednesday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2002, 11, 28]).week(), 1, "Dec 28 2002 should be week 1");
+        test.equal(moment([2003,  0,  1]).week(), 1, "Jan  1 2003 should be week 1");
+        test.equal(moment([2003,  0,  3]).week(), 1, "Jan  3 2003 should be week 1");
+        test.equal(moment([2003,  0,  4]).week(), 2, "Jan  4 2003 should be week 2");
+        test.equal(moment([2003,  0, 10]).week(), 2, "Jan 10 2003 should be week 2");
+        test.equal(moment([2003,  0, 11]).week(), 3, "Jan 11 2003 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting thursday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2008, 11, 27]).week(), 1, "Dec 27 2008 should be week 1");
+        test.equal(moment([2009,  0,  1]).week(), 1, "Jan  1 2009 should be week 1");
+        test.equal(moment([2009,  0,  2]).week(), 1, "Jan  2 2009 should be week 1");
+        test.equal(moment([2009,  0,  3]).week(), 2, "Jan  3 2009 should be week 2");
+        test.equal(moment([2009,  0,  9]).week(), 2, "Jan  9 2009 should be week 2");
+        test.equal(moment([2009,  0, 10]).week(), 3, "Jan 10 2009 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting friday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2009, 11, 26]).week(), 1, "Dec 26 2009 should be week 1");
+        test.equal(moment([2010,  0,  1]).week(), 1, "Jan  1 2010 should be week 1");
+        test.equal(moment([2010,  0,  2]).week(), 2, "Jan  2 2010 should be week 2");
+        test.equal(moment([2010,  0,  8]).week(), 2, "Jan  8 2010 should be week 2");
+        test.equal(moment([2010,  0,  9]).week(), 3, "Jan  9 2010 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting saturday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2011, 0,  1]).week(), 1, "Jan  1 2011 should be week 1");
+        test.equal(moment([2011, 0,  7]).week(), 1, "Jan  7 2011 should be week 1");
+        test.equal(moment([2011, 0,  8]).week(), 2, "Jan  8 2011 should be week 2");
+        test.equal(moment([2011, 0, 14]).week(), 2, "Jan 14 2011 should be week 2");
+        test.equal(moment([2011, 0, 15]).week(), 3, "Jan 15 2011 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting sunday formatted" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2011, 11, 31]).format('w ww wo'), '1 01 1', "Dec 31 2011 should be week 1");
+        test.equal(moment([2012,  0,  6]).format('w ww wo'), '1 01 1', "Jan  6 2012 should be week 1");
+        test.equal(moment([2012,  0,  7]).format('w ww wo'), '2 02 2', "Jan  7 2012 should be week 2");
+        test.equal(moment([2012,  0, 13]).format('w ww wo'), '2 02 2', "Jan 13 2012 should be week 2");
+        test.equal(moment([2012,  0, 14]).format('w ww wo'), '3 03 3', "Jan 14 2012 should be week 3");
+
+        test.done();
     }
 };

diff --git a/test/lang/ar.js b/test/lang/ar.js
index d2607d7a97d90d318bfca30eb25262386893e79d..890472dc35ccd7f727b4c0d9ddc186353c487c5d 100644 (file)
--- a/test/lang/ar.js
+++ b/test/lang/ar.js
@@ -1,4 +1,4 @@
-// moment.js arabic (ar) tests 
+// moment.js arabic (ar) tests
 // author: Abdel Said : https://github.com/abdelsaid
 var moment = require("../../moment");
 
@@ -36,7 +36,7 @@ exports["lang:ar"] = {
                 ['D Do DD',                            '14 14 14'],
                 ['d do dddd ddd dd',                   '0 0 الأحد احد ح'],
                 ['DDD DDDo DDDD',                      '45 45 045'],
-                ['w wo ww',                            '6 6 06'],
+                ['w wo ww',                            '8 8 08'],
                 ['h hh',                               '3 03'],
                 ['H HH',                               '15 15'],
                 ['m mm',                               '25 25'],
@@ -69,7 +69,7 @@ exports["lang:ar"] = {
         test.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8');
         test.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9');
         test.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10');
-    
+
         test.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11');
         test.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12');
         test.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13');
@@ -80,7 +80,7 @@ exports["lang:ar"] = {
         test.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18');
         test.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19');
         test.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20');
-    
+
         test.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21');
         test.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22');
         test.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23');
@@ -91,7 +91,7 @@ exports["lang:ar"] = {
         test.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28');
         test.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29');
         test.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30');
-    
+
         test.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31');
         test.done();
     },
@@ -181,9 +181,9 @@ exports["lang:ar"] = {
     "calendar day" : function(test) {
         test.expect(6);
         moment.lang('ar');
-    
+
         var a = moment().hours(2).minutes(0).seconds(0);
-    
+
         test.equal(moment(a).calendar(),                     "اليوم على الساعة 02:00",     "today at the same time");
         test.equal(moment(a).add({ m: 25 }).calendar(),      "اليوم على الساعة 02:25",     "Now plus 25 min");
         test.equal(moment(a).add({ h: 1 }).calendar(),       "اليوم على الساعة 03:00",     "Now plus 1 hour");
@@ -196,10 +196,10 @@ exports["lang:ar"] = {
     "calendar next week" : function(test) {
         test.expect(15);
         moment.lang('ar');
-    
+
         var i;
         var m;
-    
+
         for (i = 2; i < 7; i++) {
             m = moment().add({ d: i });
             test.equal(m.calendar(),       m.format('dddd [على الساعة] LT'),  "Today + " + i + " days current time");
@@ -214,7 +214,7 @@ exports["lang:ar"] = {
     "calendar last week" : function(test) {
         test.expect(15);
         moment.lang('ar');
-    
+
         for (i = 2; i < 7; i++) {
             m = moment().subtract({ d: i });
             test.equal(m.calendar(),       m.format('dddd [على الساعة] LT'),  "Today - " + i + " days current time");
@@ -231,15 +231,118 @@ exports["lang:ar"] = {
         moment.lang('ar');
         var weeksAgo = moment().subtract({ w: 1 });
         var weeksFromNow = moment().add({ w: 1 });
-        
+
         test.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  "1 week ago");
         test.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  "in 1 week");
-    
+
         weeksAgo = moment().subtract({ w: 2 });
         weeksFromNow = moment().add({ w: 2 });
-        
+
         test.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  "2 weeks ago");
         test.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  "in 2 weeks");
-    test.done();
+        test.done();
+    },
+
+
+    // Saturday is the first day of the week.
+    // The week that contains Jan 1st is the first week of the year.
+
+    "weeks year starting sunday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2011, 11, 31]).week(), 1, "Dec 31 2011 should be week 1");
+        test.equal(moment([2012,  0,  6]).week(), 1, "Jan  6 2012 should be week 1");
+        test.equal(moment([2012,  0,  7]).week(), 2, "Jan  7 2012 should be week 2");
+        test.equal(moment([2012,  0, 13]).week(), 2, "Jan 13 2012 should be week 2");
+        test.equal(moment([2012,  0, 14]).week(), 3, "Jan 14 2012 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting monday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2006, 11, 30]).week(), 1, "Dec 30 2006 should be week 1");
+        test.equal(moment([2007,  0,  5]).week(), 1, "Jan  5 2007 should be week 1");
+        test.equal(moment([2007,  0,  6]).week(), 2, "Jan  6 2007 should be week 2");
+        test.equal(moment([2007,  0, 12]).week(), 2, "Jan 12 2007 should be week 2");
+        test.equal(moment([2007,  0, 13]).week(), 3, "Jan 13 2007 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting tuesday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2007, 11, 29]).week(), 1, "Dec 29 2007 should be week 1");
+        test.equal(moment([2008,  0,  1]).week(), 1, "Jan  1 2008 should be week 1");
+        test.equal(moment([2008,  0,  4]).week(), 1, "Jan  4 2008 should be week 1");
+        test.equal(moment([2008,  0,  5]).week(), 2, "Jan  5 2008 should be week 2");
+        test.equal(moment([2008,  0, 11]).week(), 2, "Jan 11 2008 should be week 2");
+        test.equal(moment([2008,  0, 12]).week(), 3, "Jan 12 2008 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting wednesday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2002, 11, 28]).week(), 1, "Dec 28 2002 should be week 1");
+        test.equal(moment([2003,  0,  1]).week(), 1, "Jan  1 2003 should be week 1");
+        test.equal(moment([2003,  0,  3]).week(), 1, "Jan  3 2003 should be week 1");
+        test.equal(moment([2003,  0,  4]).week(), 2, "Jan  4 2003 should be week 2");
+        test.equal(moment([2003,  0, 10]).week(), 2, "Jan 10 2003 should be week 2");
+        test.equal(moment([2003,  0, 11]).week(), 3, "Jan 11 2003 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting thursday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2008, 11, 27]).week(), 1, "Dec 27 2008 should be week 1");
+        test.equal(moment([2009,  0,  1]).week(), 1, "Jan  1 2009 should be week 1");
+        test.equal(moment([2009,  0,  2]).week(), 1, "Jan  2 2009 should be week 1");
+        test.equal(moment([2009,  0,  3]).week(), 2, "Jan  3 2009 should be week 2");
+        test.equal(moment([2009,  0,  9]).week(), 2, "Jan  9 2009 should be week 2");
+        test.equal(moment([2009,  0, 10]).week(), 3, "Jan 10 2009 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting friday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2009, 11, 26]).week(), 1, "Dec 26 2009 should be week 1");
+        test.equal(moment([2010,  0,  1]).week(), 1, "Jan  1 2010 should be week 1");
+        test.equal(moment([2010,  0,  2]).week(), 2, "Jan  2 2010 should be week 2");
+        test.equal(moment([2010,  0,  8]).week(), 2, "Jan  8 2010 should be week 2");
+        test.equal(moment([2010,  0,  9]).week(), 3, "Jan  9 2010 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting saturday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2011, 0,  1]).week(), 1, "Jan  1 2011 should be week 1");
+        test.equal(moment([2011, 0,  7]).week(), 1, "Jan  7 2011 should be week 1");
+        test.equal(moment([2011, 0,  8]).week(), 2, "Jan  8 2011 should be week 2");
+        test.equal(moment([2011, 0, 14]).week(), 2, "Jan 14 2011 should be week 2");
+        test.equal(moment([2011, 0, 15]).week(), 3, "Jan 15 2011 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting sunday formatted" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2011, 11, 31]).format('w ww wo'), '1 01 1', "Dec 31 2011 should be week 1");
+        test.equal(moment([2012,  0,  6]).format('w ww wo'), '1 01 1', "Jan  6 2012 should be week 1");
+        test.equal(moment([2012,  0,  7]).format('w ww wo'), '2 02 2', "Jan  7 2012 should be week 2");
+        test.equal(moment([2012,  0, 13]).format('w ww wo'), '2 02 2', "Jan 13 2012 should be week 2");
+        test.equal(moment([2012,  0, 14]).format('w ww wo'), '3 03 3', "Jan 14 2012 should be week 3");
+
+        test.done();
     }
 };

diff --git a/test/lang/tzm-la.js b/test/lang/tzm-la.js
index c6b686caa29feace38cd2baf3d8c97dfd2faff37..4058cc62aad9983d2ff5ad1d5aa021d0e1056be6 100644 (file)
--- a/test/lang/tzm-la.js
+++ b/test/lang/tzm-la.js
@@ -1,4 +1,4 @@
-// moment.js Morocco Central Atlas Tamaziɣt in Latin (tzm-la) tests 
+// moment.js Morocco Central Atlas Tamaziɣt in Latin (tzm-la) tests
 // author : Abdel Said : https://github.com/abdelsaid
 var moment = require("../../moment");
 
@@ -37,7 +37,7 @@ exports["lang:tzm-la"] = {
                 ['D Do DD',                            '14 14 14'],
                 ['d do dddd ddd dd',                   '0 0 asamas asamas asamas'],
                 ['DDD DDDo DDDD',                      '45 45 045'],
-                ['w wo ww',                            '6 6 06'],
+                ['w wo ww',                            '8 8 08'],
                 ['h hh',                               '3 03'],
                 ['H HH',                               '15 15'],
                 ['m mm',                               '25 25'],
@@ -70,7 +70,7 @@ exports["lang:tzm-la"] = {
         test.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8');
         test.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9');
         test.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10');
-    
+
         test.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11');
         test.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12');
         test.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13');
@@ -81,7 +81,7 @@ exports["lang:tzm-la"] = {
         test.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18');
         test.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19');
         test.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20');
-    
+
         test.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21');
         test.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22');
         test.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23');
@@ -92,7 +92,7 @@ exports["lang:tzm-la"] = {
         test.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28');
         test.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29');
         test.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30');
-    
+
         test.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31');
         test.done();
     },
@@ -182,9 +182,9 @@ exports["lang:tzm-la"] = {
     "calendar day" : function(test) {
         test.expect(6);
         moment.lang('tzm-la');
-    
+
         var a = moment().hours(2).minutes(0).seconds(0);
-    
+
         test.equal(moment(a).calendar(),                     "asdkh g 02:00",     "today at the same time");
         test.equal(moment(a).add({ m: 25 }).calendar(),      "asdkh g 02:25",     "Now plus 25 min");
         test.equal(moment(a).add({ h: 1 }).calendar(),       "asdkh g 03:00",     "Now plus 1 hour");
@@ -197,10 +197,10 @@ exports["lang:tzm-la"] = {
     "calendar next week" : function(test) {
         test.expect(15);
         moment.lang('tzm-la');
-    
+
         var i;
         var m;
-    
+
         for (i = 2; i < 7; i++) {
             m = moment().add({ d: i });
             test.equal(m.calendar(),       m.format('dddd [g] LT'),  "Today + " + i + " days current time");
@@ -215,7 +215,7 @@ exports["lang:tzm-la"] = {
     "calendar last week" : function(test) {
         test.expect(15);
         moment.lang('tzm-la');
-    
+
         for (i = 2; i < 7; i++) {
             m = moment().subtract({ d: i });
             test.equal(m.calendar(),       m.format('dddd [g] LT'),  "Today - " + i + " days current time");
@@ -232,15 +232,118 @@ exports["lang:tzm-la"] = {
         moment.lang('tzm-la');
         var weeksAgo = moment().subtract({ w: 1 });
         var weeksFromNow = moment().add({ w: 1 });
-        
+
         test.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  "1 week ago");
         test.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  "in 1 week");
-    
+
         weeksAgo = moment().subtract({ w: 2 });
         weeksFromNow = moment().add({ w: 2 });
-        
+
         test.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  "2 weeks ago");
         test.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  "in 2 weeks");
-    test.done();
+        test.done();
+    },
+
+
+    // Saturday is the first day of the week.
+    // The week that contains Jan 1st is the first week of the year.
+
+    "weeks year starting sunday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2011, 11, 31]).week(), 1, "Dec 31 2011 should be week 1");
+        test.equal(moment([2012,  0,  6]).week(), 1, "Jan  6 2012 should be week 1");
+        test.equal(moment([2012,  0,  7]).week(), 2, "Jan  7 2012 should be week 2");
+        test.equal(moment([2012,  0, 13]).week(), 2, "Jan 13 2012 should be week 2");
+        test.equal(moment([2012,  0, 14]).week(), 3, "Jan 14 2012 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting monday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2006, 11, 30]).week(), 1, "Dec 30 2006 should be week 1");
+        test.equal(moment([2007,  0,  5]).week(), 1, "Jan  5 2007 should be week 1");
+        test.equal(moment([2007,  0,  6]).week(), 2, "Jan  6 2007 should be week 2");
+        test.equal(moment([2007,  0, 12]).week(), 2, "Jan 12 2007 should be week 2");
+        test.equal(moment([2007,  0, 13]).week(), 3, "Jan 13 2007 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting tuesday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2007, 11, 29]).week(), 1, "Dec 29 2007 should be week 1");
+        test.equal(moment([2008,  0,  1]).week(), 1, "Jan  1 2008 should be week 1");
+        test.equal(moment([2008,  0,  4]).week(), 1, "Jan  4 2008 should be week 1");
+        test.equal(moment([2008,  0,  5]).week(), 2, "Jan  5 2008 should be week 2");
+        test.equal(moment([2008,  0, 11]).week(), 2, "Jan 11 2008 should be week 2");
+        test.equal(moment([2008,  0, 12]).week(), 3, "Jan 12 2008 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting wednesday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2002, 11, 28]).week(), 1, "Dec 28 2002 should be week 1");
+        test.equal(moment([2003,  0,  1]).week(), 1, "Jan  1 2003 should be week 1");
+        test.equal(moment([2003,  0,  3]).week(), 1, "Jan  3 2003 should be week 1");
+        test.equal(moment([2003,  0,  4]).week(), 2, "Jan  4 2003 should be week 2");
+        test.equal(moment([2003,  0, 10]).week(), 2, "Jan 10 2003 should be week 2");
+        test.equal(moment([2003,  0, 11]).week(), 3, "Jan 11 2003 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting thursday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2008, 11, 27]).week(), 1, "Dec 27 2008 should be week 1");
+        test.equal(moment([2009,  0,  1]).week(), 1, "Jan  1 2009 should be week 1");
+        test.equal(moment([2009,  0,  2]).week(), 1, "Jan  2 2009 should be week 1");
+        test.equal(moment([2009,  0,  3]).week(), 2, "Jan  3 2009 should be week 2");
+        test.equal(moment([2009,  0,  9]).week(), 2, "Jan  9 2009 should be week 2");
+        test.equal(moment([2009,  0, 10]).week(), 3, "Jan 10 2009 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting friday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2009, 11, 26]).week(), 1, "Dec 26 2009 should be week 1");
+        test.equal(moment([2010,  0,  1]).week(), 1, "Jan  1 2010 should be week 1");
+        test.equal(moment([2010,  0,  2]).week(), 2, "Jan  2 2010 should be week 2");
+        test.equal(moment([2010,  0,  8]).week(), 2, "Jan  8 2010 should be week 2");
+        test.equal(moment([2010,  0,  9]).week(), 3, "Jan  9 2010 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting saturday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2011, 0,  1]).week(), 1, "Jan  1 2011 should be week 1");
+        test.equal(moment([2011, 0,  7]).week(), 1, "Jan  7 2011 should be week 1");
+        test.equal(moment([2011, 0,  8]).week(), 2, "Jan  8 2011 should be week 2");
+        test.equal(moment([2011, 0, 14]).week(), 2, "Jan 14 2011 should be week 2");
+        test.equal(moment([2011, 0, 15]).week(), 3, "Jan 15 2011 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting sunday formatted" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2011, 11, 31]).format('w ww wo'), '1 01 1', "Dec 31 2011 should be week 1");
+        test.equal(moment([2012,  0,  6]).format('w ww wo'), '1 01 1', "Jan  6 2012 should be week 1");
+        test.equal(moment([2012,  0,  7]).format('w ww wo'), '2 02 2', "Jan  7 2012 should be week 2");
+        test.equal(moment([2012,  0, 13]).format('w ww wo'), '2 02 2', "Jan 13 2012 should be week 2");
+        test.equal(moment([2012,  0, 14]).format('w ww wo'), '3 03 3', "Jan 14 2012 should be week 3");
+
+        test.done();
     }
 };

diff --git a/test/lang/tzm.js b/test/lang/tzm.js
index 1afef845efa704057e9dffdc5a63aa6ef40c8e54..5dc49d971565de7231fe738966c4964d8f5b62d1 100644 (file)
--- a/test/lang/tzm.js
+++ b/test/lang/tzm.js
@@ -1,4 +1,4 @@
-// moment.js Morocco Central Atlas Tamaziɣt (tzm) tests 
+// moment.js Morocco Central Atlas Tamaziɣt (tzm) tests
 // author : Abdel Said : https://github.com/abdelsaid
 var moment = require("../../moment");
 
@@ -37,7 +37,7 @@ exports["lang:tzm"] = {
                 ['D Do DD',                            '14 14 14'],
                 ['d do dddd ddd dd',                   '0 0 ⴰⵙⴰⵎⴰⵙ ⴰⵙⴰⵎⴰⵙ ⴰⵙⴰⵎⴰⵙ'],
                 ['DDD DDDo DDDD',                      '45 45 045'],
-                ['w wo ww',                            '6 6 06'],
+                ['w wo ww',                            '8 8 08'],
                 ['h hh',                               '3 03'],
                 ['H HH',                               '15 15'],
                 ['m mm',                               '25 25'],
@@ -70,7 +70,7 @@ exports["lang:tzm"] = {
         test.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8');
         test.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9');
         test.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10');
-    
+
         test.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11');
         test.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12');
         test.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13');
@@ -81,7 +81,7 @@ exports["lang:tzm"] = {
         test.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18');
         test.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19');
         test.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20');
-    
+
         test.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21');
         test.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22');
         test.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23');
@@ -92,7 +92,7 @@ exports["lang:tzm"] = {
         test.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28');
         test.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29');
         test.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30');
-    
+
         test.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31');
         test.done();
     },
@@ -182,9 +182,9 @@ exports["lang:tzm"] = {
     "calendar day" : function(test) {
         test.expect(6);
         moment.lang('tzm');
-    
+
         var a = moment().hours(2).minutes(0).seconds(0);
-    
+
         test.equal(moment(a).calendar(),                     "ⴰⵙⴷⵅ ⴴ 02:00",     "today at the same time");
         test.equal(moment(a).add({ m: 25 }).calendar(),      "ⴰⵙⴷⵅ ⴴ 02:25",     "Now plus 25 min");
         test.equal(moment(a).add({ h: 1 }).calendar(),       "ⴰⵙⴷⵅ ⴴ 03:00",     "Now plus 1 hour");
@@ -197,10 +197,10 @@ exports["lang:tzm"] = {
     "calendar next week" : function(test) {
         test.expect(15);
         moment.lang('tzm');
-    
+
         var i;
         var m;
-    
+
         for (i = 2; i < 7; i++) {
             m = moment().add({ d: i });
             test.equal(m.calendar(),       m.format('dddd [ⴴ] LT'),  "Today + " + i + " days current time");
@@ -215,7 +215,7 @@ exports["lang:tzm"] = {
     "calendar last week" : function(test) {
         test.expect(15);
         moment.lang('tzm');
-    
+
         for (i = 2; i < 7; i++) {
             m = moment().subtract({ d: i });
             test.equal(m.calendar(),       m.format('dddd [ⴴ] LT'),  "Today - " + i + " days current time");
@@ -232,16 +232,119 @@ exports["lang:tzm"] = {
         moment.lang('tzm');
         var weeksAgo = moment().subtract({ w: 1 });
         var weeksFromNow = moment().add({ w: 1 });
-        
+
         test.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  "1 week ago");
         test.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  "in 1 week");
-    
+
         weeksAgo = moment().subtract({ w: 2 });
         weeksFromNow = moment().add({ w: 2 });
-        
+
         test.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  "2 weeks ago");
         test.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  "in 2 weeks");
-    test.done();
+        test.done();
+    },
+
+
+    // Saturday is the first day of the week.
+    // The week that contains Jan 1st is the first week of the year.
+
+    "weeks year starting sunday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2011, 11, 31]).week(), 1, "Dec 31 2011 should be week 1");
+        test.equal(moment([2012,  0,  6]).week(), 1, "Jan  6 2012 should be week 1");
+        test.equal(moment([2012,  0,  7]).week(), 2, "Jan  7 2012 should be week 2");
+        test.equal(moment([2012,  0, 13]).week(), 2, "Jan 13 2012 should be week 2");
+        test.equal(moment([2012,  0, 14]).week(), 3, "Jan 14 2012 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting monday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2006, 11, 30]).week(), 1, "Dec 30 2006 should be week 1");
+        test.equal(moment([2007,  0,  5]).week(), 1, "Jan  5 2007 should be week 1");
+        test.equal(moment([2007,  0,  6]).week(), 2, "Jan  6 2007 should be week 2");
+        test.equal(moment([2007,  0, 12]).week(), 2, "Jan 12 2007 should be week 2");
+        test.equal(moment([2007,  0, 13]).week(), 3, "Jan 13 2007 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting tuesday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2007, 11, 29]).week(), 1, "Dec 29 2007 should be week 1");
+        test.equal(moment([2008,  0,  1]).week(), 1, "Jan  1 2008 should be week 1");
+        test.equal(moment([2008,  0,  4]).week(), 1, "Jan  4 2008 should be week 1");
+        test.equal(moment([2008,  0,  5]).week(), 2, "Jan  5 2008 should be week 2");
+        test.equal(moment([2008,  0, 11]).week(), 2, "Jan 11 2008 should be week 2");
+        test.equal(moment([2008,  0, 12]).week(), 3, "Jan 12 2008 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting wednesday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2002, 11, 28]).week(), 1, "Dec 28 2002 should be week 1");
+        test.equal(moment([2003,  0,  1]).week(), 1, "Jan  1 2003 should be week 1");
+        test.equal(moment([2003,  0,  3]).week(), 1, "Jan  3 2003 should be week 1");
+        test.equal(moment([2003,  0,  4]).week(), 2, "Jan  4 2003 should be week 2");
+        test.equal(moment([2003,  0, 10]).week(), 2, "Jan 10 2003 should be week 2");
+        test.equal(moment([2003,  0, 11]).week(), 3, "Jan 11 2003 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting thursday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2008, 11, 27]).week(), 1, "Dec 27 2008 should be week 1");
+        test.equal(moment([2009,  0,  1]).week(), 1, "Jan  1 2009 should be week 1");
+        test.equal(moment([2009,  0,  2]).week(), 1, "Jan  2 2009 should be week 1");
+        test.equal(moment([2009,  0,  3]).week(), 2, "Jan  3 2009 should be week 2");
+        test.equal(moment([2009,  0,  9]).week(), 2, "Jan  9 2009 should be week 2");
+        test.equal(moment([2009,  0, 10]).week(), 3, "Jan 10 2009 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting friday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2009, 11, 26]).week(), 1, "Dec 26 2009 should be week 1");
+        test.equal(moment([2010,  0,  1]).week(), 1, "Jan  1 2010 should be week 1");
+        test.equal(moment([2010,  0,  2]).week(), 2, "Jan  2 2010 should be week 2");
+        test.equal(moment([2010,  0,  8]).week(), 2, "Jan  8 2010 should be week 2");
+        test.equal(moment([2010,  0,  9]).week(), 3, "Jan  9 2010 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting saturday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2011, 0,  1]).week(), 1, "Jan  1 2011 should be week 1");
+        test.equal(moment([2011, 0,  7]).week(), 1, "Jan  7 2011 should be week 1");
+        test.equal(moment([2011, 0,  8]).week(), 2, "Jan  8 2011 should be week 2");
+        test.equal(moment([2011, 0, 14]).week(), 2, "Jan 14 2011 should be week 2");
+        test.equal(moment([2011, 0, 15]).week(), 3, "Jan 15 2011 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting sunday formatted" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2011, 11, 31]).format('w ww wo'), '1 01 1', "Dec 31 2011 should be week 1");
+        test.equal(moment([2012,  0,  6]).format('w ww wo'), '1 01 1', "Jan  6 2012 should be week 1");
+        test.equal(moment([2012,  0,  7]).format('w ww wo'), '2 02 2', "Jan  7 2012 should be week 2");
+        test.equal(moment([2012,  0, 13]).format('w ww wo'), '2 02 2', "Jan 13 2012 should be week 2");
+        test.equal(moment([2012,  0, 14]).format('w ww wo'), '3 03 3', "Jan 14 2012 should be week 3");
+
+        test.done();
     }
 };