ro week tests

diff --git a/lang/ro.js b/lang/ro.js
index 0856b395d499b046b87b85e2280415aa22757fef..7f7f23b6dbb09232089bc27f5445c43c7249a7b5 100644 (file)
--- a/lang/ro.js
+++ b/lang/ro.js
@@ -41,6 +41,10 @@
             },
             ordinal : function (number) {
                 return '';
+            },
+            week : {
+                dow : 1, // Monday is the first day of the week.
+                doy : 7  // The week that contains Jan 1st is the first week of the year.
             }
         };
 

diff --git a/test/lang/ro.js b/test/lang/ro.js
index 1773584e3395aa324a48b39715781b6b2e9a70b6..48a9c44a8563062ff9c50b2448301b4a759e25b4 100644 (file)
--- a/test/lang/ro.js
+++ b/test/lang/ro.js
@@ -6,9 +6,19 @@ var moment = require("../../moment");
      *************************************************/
 
 exports["lang:ro"] = {
+    setUp : function (cb) {
+        moment.lang('ro');
+        cb();
+    },
+
+    tearDown : function (cb) {
+        moment.lang('en');
+        cb();
+    },
+
     "parse" : function(test) {
         test.expect(96);
-        moment.lang('ro');
+
         var tests = 'Ianuarie Ian_Februarie Feb_Martie Mar_Aprilie Apr_Mai Mai_Iunie Iun_Iulie Iul_August Aug_Septembrie Sep_Octombrie Oct_Noiembrie Noi_Decembrie Dec'.split("_");
         var i;
         function equalTest(input, mmm, i) {
@@ -30,7 +40,7 @@ exports["lang:ro"] = {
 
     "format" : function(test) {
         test.expect(18);
-        moment.lang('ro');
+
         var a = [
                 ['dddd, MMMM Do YYYY, h:mm:ss A',  'Duminică, Februarie 14 2010, 3:25:50 PM'],
                 ['ddd, hA',                        'Dum, 3PM'],
@@ -39,7 +49,7 @@ exports["lang:ro"] = {
                 ['D Do DD',                        '14 14 14'],
                 ['d do dddd ddd dd',               '0 0 Duminică Dum Du'],
                 ['DDD DDDo DDDD',                  '45 45 045'],
-                ['w wo ww',                        '8 8 08'],
+                ['w wo ww',                        '7 7 07'],
                 ['h hh',                           '3 03'],
                 ['H HH',                           '15 15'],
                 ['m mm',                           '25 25'],
@@ -61,7 +71,7 @@ exports["lang:ro"] = {
 
     "format ordinal" : function(test) {
         test.expect(31);
-        moment.lang('ro');
+
         test.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1');
         test.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2');
         test.equal(moment([2011, 0, 3]).format('DDDo'), '3', '3');
@@ -101,7 +111,7 @@ exports["lang:ro"] = {
 
     "format month" : function(test) {
         test.expect(12);
-        moment.lang('ro');
+
         var expected = 'Ianuarie Ian_Februarie Feb_Martie Mar_Aprilie Apr_Mai Mai_Iunie Iun_Iulie Iul_August Aug_Septembrie Sep_Octombrie Oct_Noiembrie Noi_Decembrie Dec'.split("_");
         var i;
         for (i = 0; i < expected.length; i++) {
@@ -112,7 +122,7 @@ exports["lang:ro"] = {
 
     "format week" : function(test) {
         test.expect(7);
-        moment.lang('ro');
+
         var expected = 'Duminică Dum Du_Luni Lun Lu_Marţi Mar Ma_Miercuri Mie Mi_Joi Joi Jo_Vineri Vin Vi_Sâmbătă Sâm Sâ'.split("_");
         var i;
         for (i = 0; i < expected.length; i++) {
@@ -123,7 +133,7 @@ exports["lang:ro"] = {
 
     "from" : function(test) {
         test.expect(30);
-        moment.lang('ro');
+
         var start = moment([2007, 1, 28]);
         test.equal(start.from(moment([2007, 1, 28]).add({s:44}), true),  "câteva secunde", "44 secunde = câteva secunde");
         test.equal(start.from(moment([2007, 1, 28]).add({s:45}), true),  "un minut",       "45 secunde = un minut");
@@ -160,7 +170,6 @@ exports["lang:ro"] = {
 
     "suffix" : function(test) {
         test.expect(2);
-        moment.lang('ro');
         test.equal(moment(30000).from(0), "peste câteva secunde",   "prefix");
         test.equal(moment(0).from(30000), "câteva secunde în urmă", "suffix");
         test.done();
@@ -168,14 +177,12 @@ exports["lang:ro"] = {
 
     "now from now" : function(test) {
         test.expect(1);
-        moment.lang('ro');
         test.equal(moment().fromNow(), "câteva secunde în urmă",  "now from now should display as in the past");
         test.done();
     },
 
     "fromNow" : function(test) {
         test.expect(2);
-        moment.lang('ro');
         test.equal(moment().add({s:30}).fromNow(), "peste câteva secunde", "in a few seconds");
         test.equal(moment().add({d:5}).fromNow(), "peste 5 zile", "in 5 days");
         test.done();
@@ -183,7 +190,6 @@ exports["lang:ro"] = {
 
     "calendar day" : function(test) {
         test.expect(6);
-        moment.lang('ro');
 
         var a = moment().hours(2).minutes(0).seconds(0);
 
@@ -198,7 +204,6 @@ exports["lang:ro"] = {
 
     "calendar next week" : function(test) {
         test.expect(15);
-        moment.lang('ro');
 
         var i;
         var m;
@@ -216,7 +221,9 @@ exports["lang:ro"] = {
 
     "calendar last week" : function(test) {
         test.expect(15);
-        moment.lang('ro');
+
+        var i;
+        var m;
 
         for (i = 2; i < 7; i++) {
             m = moment().subtract({ d: i });
@@ -231,7 +238,6 @@ exports["lang:ro"] = {
 
     "calendar all else" : function(test) {
         test.expect(4);
-        moment.lang('ro');
         var weeksAgo = moment().subtract({ w: 1 });
         var weeksFromNow = moment().add({ w: 1 });
 
@@ -243,6 +249,111 @@ exports["lang:ro"] = {
 
         test.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  "2 weeks ago");
         test.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  "in 2 weeks");
-    test.done();
+
+        test.done();
+    },
+
+    // Monday 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, 26]).week(), 1, "Dec 26 2011 should be week 1");
+        test.equal(moment([2012,  0,  1]).week(), 1, "Jan  1 2012 should be week 1");
+        test.equal(moment([2012,  0,  2]).week(), 2, "Jan  2 2012 should be week 2");
+        test.equal(moment([2012,  0,  8]).week(), 2, "Jan  8 2012 should be week 2");
+        test.equal(moment([2012,  0,  9]).week(), 3, "Jan  9 2012 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting monday" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2007, 0, 1]).week(),  1, "Jan  1 2007 should be week 1");
+        test.equal(moment([2007, 0, 7]).week(),  1, "Jan  7 2007 should be week 1");
+        test.equal(moment([2007, 0, 8]).week(),  2, "Jan  8 2007 should be week 2");
+        test.equal(moment([2007, 0, 14]).week(), 2, "Jan 14 2007 should be week 2");
+        test.equal(moment([2007, 0, 15]).week(), 3, "Jan 15 2007 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting tuesday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2007, 11, 31]).week(), 1, "Dec 31 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,  6]).week(), 1, "Jan  6 2008 should be week 1");
+        test.equal(moment([2008,  0,  7]).week(), 2, "Jan  7 2008 should be week 2");
+        test.equal(moment([2008,  0, 13]).week(), 2, "Jan 13 2008 should be week 2");
+        test.equal(moment([2008,  0, 14]).week(), 3, "Jan 14 2008 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting wednesday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2002, 11, 30]).week(), 1, "Dec 30 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,  5]).week(), 1, "Jan  5 2003 should be week 1");
+        test.equal(moment([2003,  0,  6]).week(), 2, "Jan  6 2003 should be week 2");
+        test.equal(moment([2003,  0, 12]).week(), 2, "Jan 12 2003 should be week 2");
+        test.equal(moment([2003,  0, 13]).week(), 3, "Jan 13 2003 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting thursday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2008, 11, 29]).week(), 1, "Dec 29 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,  4]).week(), 1, "Jan  4 2009 should be week 1");
+        test.equal(moment([2009,  0,  5]).week(), 2, "Jan  5 2009 should be week 2");
+        test.equal(moment([2009,  0, 11]).week(), 2, "Jan 11 2009 should be week 2");
+        test.equal(moment([2009,  0, 12]).week(), 3, "Jan 12 2009 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting friday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2009, 11, 28]).week(), 1, "Dec 28 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,  3]).week(), 1, "Jan  3 2010 should be week 1");
+        test.equal(moment([2010,  0,  4]).week(), 2, "Jan  4 2010 should be week 2");
+        test.equal(moment([2010,  0, 10]).week(), 2, "Jan 10 2010 should be week 2");
+        test.equal(moment([2010,  0, 11]).week(), 3, "Jan 11 2010 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting saturday" : function(test) {
+        test.expect(6);
+
+        test.equal(moment([2010, 11, 27]).week(), 1, "Dec 27 2010 should be week 1");
+        test.equal(moment([2011,  0,  1]).week(), 1, "Jan  1 2011 should be week 1");
+        test.equal(moment([2011,  0,  2]).week(), 1, "Jan  2 2011 should be week 1");
+        test.equal(moment([2011,  0,  3]).week(), 2, "Jan  3 2011 should be week 2");
+        test.equal(moment([2011,  0,  9]).week(), 2, "Jan  9 2011 should be week 2");
+        test.equal(moment([2011,  0, 10]).week(), 3, "Jan 10 2011 should be week 3");
+
+        test.done();
+    },
+
+    "weeks year starting sunday formatted" : function(test) {
+        test.expect(5);
+
+        test.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1', "Dec 26 2011 should be week 1");
+        test.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1', "Jan  1 2012 should be week 1");
+        test.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2', "Jan  2 2012 should be week 2");
+        test.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2', "Jan  8 2012 should be week 2");
+        test.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3', "Jan  9 2012 should be week 3");
+
+        test.done();
     }
 };