From: Iskren Chernev Date: Wed, 7 May 2014 16:44:14 +0000 (-0700) Subject: Fix language tests X-Git-Tag: 2.8.0~29^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dd10e69ce54cc9aaee81a85435c2c4d5461eb9b;p=thirdparty%2Fmoment.git Fix language tests --- diff --git a/test/lang/ar-ma.js b/test/lang/ar-ma.js index 5536a303b..25d023803 100644 --- a/test/lang/ar-ma.js +++ b/test/lang/ar-ma.js @@ -17,7 +17,6 @@ exports["lang:ar-ma"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'يناير:يناير_فبراير:فبراير_مارس:مارس_أبريل:أبريل_ماي:ماي_يونيو:يونيو_يوليوز:يوليوز_غشت:غشت_شتنبر:شتنبر_أكتوبر:أكتوبر_نونبر:نونبر_دجنبر:دجنبر'.split("_"), i; function equalTest(input, mmm, i) { test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1)); @@ -37,7 +36,6 @@ exports["lang:ar-ma"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'الأحد, فبراير 14 2010, 3:25:50 pm'], ['ddd, hA', 'احد, 3PM'], @@ -71,7 +69,6 @@ exports["lang:ar-ma"] = { }, "format ordinal" : function (test) { - test.expect(31); 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'); @@ -110,7 +107,6 @@ exports["lang:ar-ma"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'يناير يناير_فبراير فبراير_مارس مارس_أبريل أبريل_ماي ماي_يونيو يونيو_يوليوز يوليوز_غشت غشت_شتنبر شتنبر_أكتوبر أكتوبر_نونبر نونبر_دجنبر دجنبر'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -119,7 +115,6 @@ exports["lang:ar-ma"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'الأحد احد ح_الإتنين اتنين ن_الثلاثاء ثلاثاء ث_الأربعاء اربعاء ر_الخميس خميس خ_الجمعة جمعة ج_السبت سبت س'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -128,7 +123,6 @@ exports["lang:ar-ma"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "ثوان", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "دقيقة", "45 seconds = a minute"); @@ -148,15 +142,13 @@ exports["lang:ar-ma"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 أيام", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "شهر", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "شهر", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "شهر", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "شهر", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 أشهر", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 أشهر", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 أشهر", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "شهر", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 أشهر", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 أشهر", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "سنة", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "سنة", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 سنوات", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "سنة", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 سنوات", "5 years = 5 years"); @@ -164,27 +156,23 @@ exports["lang:ar-ma"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "في ثوان", "prefix"); test.equal(moment(0).from(30000), "منذ ثوان", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "منذ ثوان", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "في ثوان", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "في 5 أيام", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -198,7 +186,6 @@ exports["lang:ar-ma"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -213,7 +200,6 @@ exports["lang:ar-ma"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -228,7 +214,6 @@ exports["lang:ar-ma"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -248,7 +233,6 @@ exports["lang:ar-ma"] = { // 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"); @@ -260,7 +244,6 @@ exports["lang:ar-ma"] = { }, "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"); @@ -272,7 +255,6 @@ exports["lang:ar-ma"] = { }, "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"); @@ -285,7 +267,6 @@ exports["lang:ar-ma"] = { }, "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"); @@ -298,7 +279,6 @@ exports["lang:ar-ma"] = { }, "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"); @@ -311,7 +291,6 @@ exports["lang:ar-ma"] = { }, "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"); @@ -323,7 +302,6 @@ exports["lang:ar-ma"] = { }, "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"); @@ -335,7 +313,6 @@ exports["lang:ar-ma"] = { }, "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"); diff --git a/test/lang/ar.js b/test/lang/ar.js index 09cb0a770..77fa3bb96 100644 --- a/test/lang/ar.js +++ b/test/lang/ar.js @@ -17,7 +17,6 @@ exports["lang:ar"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'يناير/ كانون الثاني:يناير/ كانون الثاني_فبراير/ شباط:فبراير/ شباط_مارس/ آذار:مارس/ آذار_أبريل/ نيسان:أبريل/ نيسان_مايو/ أيار:مايو/ أيار_يونيو/ حزيران:يونيو/ حزيران_يوليو/ تموز:يوليو/ تموز_أغسطس/ آب:أغسطس/ آب_سبتمبر/ أيلول:سبتمبر/ أيلول_أكتوبر/ تشرين الأول:أكتوبر/ تشرين الأول_نوفمبر/ تشرين الثاني:نوفمبر/ تشرين الثاني_ديسمبر/ كانون الأول:ديسمبر/ كانون الأول'.split("_"), i; function equalTest(input, mmm, i) { test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1) + ' instead is month ' + moment(input, mmm).month()); @@ -37,7 +36,6 @@ exports["lang:ar"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'الأحد، فبراير/ شباط ١٤ ٢٠١٠، ٣:٢٥:٥٠ م'], ['ddd, hA', 'أحد، ٣م'], @@ -71,7 +69,6 @@ exports["lang:ar"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '١', '1'); test.equal(moment([2011, 0, 2]).format('DDDo'), '٢', '2'); test.equal(moment([2011, 0, 3]).format('DDDo'), '٣', '3'); @@ -110,7 +107,6 @@ exports["lang:ar"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'يناير/ كانون الثاني يناير/ كانون الثاني_فبراير/ شباط فبراير/ شباط_مارس/ آذار مارس/ آذار_أبريل/ نيسان أبريل/ نيسان_مايو/ أيار مايو/ أيار_يونيو/ حزيران يونيو/ حزيران_يوليو/ تموز يوليو/ تموز_أغسطس/ آب أغسطس/ آب_سبتمبر/ أيلول سبتمبر/ أيلول_أكتوبر/ تشرين الأول أكتوبر/ تشرين الأول_نوفمبر/ تشرين الثاني نوفمبر/ تشرين الثاني_ديسمبر/ كانون الأول ديسمبر/ كانون الأول'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -120,7 +116,6 @@ exports["lang:ar"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'الأحد أحد ح_الإثنين إثنين ن_الثلاثاء ثلاثاء ث_الأربعاء أربعاء ر_الخميس خميس خ_الجمعة جمعة ج_السبت سبت س'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -130,7 +125,6 @@ exports["lang:ar"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "ثوان", "44 seconds = a few seconds"); @@ -151,15 +145,13 @@ exports["lang:ar"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "٢٥ أيام", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "شهر", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "شهر", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "شهر", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "شهر", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "٢ أشهر", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "٢ أشهر", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "٣ أشهر", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "شهر", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "٥ أشهر", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "١١ أشهر", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "سنة", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "سنة", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "٢ سنوات", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "سنة", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "٥ سنوات", "5 years = 5 years"); @@ -167,27 +159,23 @@ exports["lang:ar"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "في ثوان", "prefix"); test.equal(moment(0).from(30000), "منذ ثوان", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "منذ ثوان", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "في ثوان", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "في ٥ أيام", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -201,7 +189,6 @@ exports["lang:ar"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -216,7 +203,6 @@ exports["lang:ar"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -231,7 +217,6 @@ exports["lang:ar"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -252,7 +237,6 @@ exports["lang:ar"] = { // 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"); @@ -264,7 +248,6 @@ exports["lang:ar"] = { }, "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"); @@ -276,7 +259,6 @@ exports["lang:ar"] = { }, "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"); @@ -289,7 +271,6 @@ exports["lang:ar"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(10); 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"); @@ -307,7 +288,6 @@ exports["lang:ar"] = { }, "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"); @@ -320,7 +300,6 @@ exports["lang:ar"] = { }, "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"); @@ -332,7 +311,6 @@ exports["lang:ar"] = { }, "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"); @@ -344,7 +322,6 @@ exports["lang:ar"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2011, 11, 31]).format('w ww wo'), '١ ٠١ ١', "Dec 31 2011 should be week 1"); test.equal(moment([2012, 0, 6]).format('w ww wo'), '١ ٠١ ١', "Jan 6 2012 should be week 1"); diff --git a/test/lang/bg.js b/test/lang/bg.js index 33d35f929..addebcbe2 100644 --- a/test/lang/bg.js +++ b/test/lang/bg.js @@ -20,7 +20,6 @@ exports["lang:bg"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'януари янр_февруари фев_март мар_април апр_май май_юни юни_юли юли_август авг_септември сеп_октомври окт_ноември ное_декември дек'.split("_"), i; function equalTest(input, mmm, i) { test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1)); @@ -40,7 +39,6 @@ exports["lang:bg"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, H:mm:ss', 'неделя, февруари 14-ти 2010, 15:25:50'], ['ddd, hA', 'нед, 3PM'], @@ -74,7 +72,6 @@ exports["lang:bg"] = { }, "format ordinal" : function (test) { - test.expect(31); 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-ти'); @@ -113,7 +110,6 @@ exports["lang:bg"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'януари янр_февруари фев_март мар_април апр_май май_юни юни_юли юли_август авг_септември сеп_октомври окт_ноември ное_декември дек'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -122,7 +118,6 @@ exports["lang:bg"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'неделя нед нд_понеделник пон пн_вторник вто вт_сряда сря ср_четвъртък чет чт_петък пет пт_събота съб сб'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -131,7 +126,6 @@ exports["lang:bg"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "няколко секунди", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "минута", "45 seconds = a minute"); @@ -151,15 +145,13 @@ exports["lang:bg"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 дни", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "месец", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "месец", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "месец", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "месец", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 месеца", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 месеца", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 месеца", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "месец", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 месеца", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 месеца", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "година", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "година", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 години", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "година", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 години", "5 years = 5 years"); @@ -167,27 +159,23 @@ exports["lang:bg"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "след няколко секунди", "prefix"); test.equal(moment(0).from(30000), "преди няколко секунди", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "преди няколко секунди", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "след няколко секунди", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "след 5 дни", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -201,7 +189,6 @@ exports["lang:bg"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -216,7 +203,6 @@ exports["lang:bg"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -246,7 +232,6 @@ exports["lang:bg"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -265,7 +250,6 @@ exports["lang:bg"] = { // 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"); @@ -277,7 +261,6 @@ exports["lang:bg"] = { }, "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"); @@ -289,7 +272,6 @@ exports["lang:bg"] = { }, "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"); @@ -302,7 +284,6 @@ exports["lang:bg"] = { }, "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"); @@ -315,7 +296,6 @@ exports["lang:bg"] = { }, "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"); @@ -328,7 +308,6 @@ exports["lang:bg"] = { }, "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"); @@ -341,7 +320,6 @@ exports["lang:bg"] = { }, "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"); @@ -354,7 +332,6 @@ exports["lang:bg"] = { }, "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"); diff --git a/test/lang/br.js b/test/lang/br.js index f1350d386..e41bc47a9 100644 --- a/test/lang/br.js +++ b/test/lang/br.js @@ -20,7 +20,6 @@ exports["lang:br"] = { }, "parse" : function (test) { - test.expect(96); var tests = "Genver Gen_C'hwevrer C'hwe_Meurzh Meu_Ebrel Ebr_Mae Mae_Mezheven Eve_Gouere Gou_Eost Eos_Gwengolo Gwe_Here Her_Du Du_Kerzu Ker".split("_"), i; function equalTest(input, mmm, i) { test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1)); @@ -40,7 +39,6 @@ exports["lang:br"] = { }, "format" : function (test) { - test.expect(17); moment.lang('br'); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', "Sul, C'hwevrer 14vet 2010, 3:25:50 pm"], @@ -70,7 +68,6 @@ exports["lang:br"] = { }, "format ordinal" : function (test) { - test.expect(31); moment.lang('br'); test.equal(moment([2011, 0, 1]).format('DDDo'), '1añ', '1añ'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2vet', '2vet'); @@ -110,7 +107,6 @@ exports["lang:br"] = { }, "format month" : function (test) { - test.expect(12); moment.lang('br'); var expected = "Genver Gen_C'hwevrer C'hwe_Meurzh Meu_Ebrel Ebr_Mae Mae_Mezheven Eve_Gouere Gou_Eost Eos_Gwengolo Gwe_Here Her_Du Du_Kerzu Ker".split("_"), i; for (i = 0; i < expected.length; i++) { @@ -120,7 +116,6 @@ exports["lang:br"] = { }, "format week" : function (test) { - test.expect(7); moment.lang('br'); var expected = "Sul Sul Su_Lun Lun Lu_Meurzh Meu Me_Merc'her Mer Mer_Yaou Yao Ya_Gwener Gwe Gw_Sadorn Sad Sa".split("_"), i; for (i = 0; i < expected.length; i++) { @@ -130,7 +125,6 @@ exports["lang:br"] = { }, "from" : function (test) { - test.expect(30); moment.lang('br'); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "un nebeud segondennoù", "44 seconds = a few seconds"); @@ -151,15 +145,13 @@ exports["lang:br"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 devezh", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "ur miz", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "ur miz", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "ur miz", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "ur miz", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 viz", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 viz", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 miz", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "ur miz", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 miz", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 miz", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "ur bloaz", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "ur bloaz", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 vloaz", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "ur bloaz", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 bloaz", "5 years = 5 years"); @@ -167,7 +159,6 @@ exports["lang:br"] = { }, "suffix" : function (test) { - test.expect(2); moment.lang('br'); test.equal(moment(30000).from(0), "a-benn un nebeud segondennoù", "prefix"); test.equal(moment(0).from(30000), "un nebeud segondennoù 'zo", "suffix"); @@ -175,14 +166,12 @@ exports["lang:br"] = { }, "now from now" : function (test) { - test.expect(1); moment.lang('br'); test.equal(moment().fromNow(), "un nebeud segondennoù 'zo", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); moment.lang('br'); test.equal(moment().add({s: 30}).fromNow(), "a-benn un nebeud segondennoù", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "a-benn 5 devezh", "in 5 days"); @@ -190,7 +179,6 @@ exports["lang:br"] = { }, "calendar day" : function (test) { - test.expect(6); moment.lang('br'); var a = moment().hours(2).minutes(0).seconds(0); @@ -205,7 +193,6 @@ exports["lang:br"] = { }, "calendar next week" : function (test) { - test.expect(15); moment.lang('br'); var i, m; @@ -221,7 +208,6 @@ exports["lang:br"] = { }, "calendar last week" : function (test) { - test.expect(15); moment.lang('br'); var i, m; @@ -237,7 +223,6 @@ exports["lang:br"] = { }, "calendar all else" : function (test) { - test.expect(4); moment.lang('br'); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -254,7 +239,6 @@ exports["lang:br"] = { }, "special mutations for years": function (test) { - test.expect(12); moment.lang('br'); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "ur bloaz", "mutation 1 year"); diff --git a/test/lang/bs.js b/test/lang/bs.js index 4f1834b6c..19018d8b0 100644 --- a/test/lang/bs.js +++ b/test/lang/bs.js @@ -20,7 +20,6 @@ exports["lang:bs"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'januar jan._februar feb._mart mar._april apr._maj maj._juni jun._juli jul._avgust avg._septembar sep._oktobar okt._novembar nov._decembar dec.'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:bs"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, Do MMMM YYYY, h:mm:ss a', 'nedjelja, 14. februar 2010, 3:25:50 pm'], ['ddd, hA', 'ned., 3PM'], @@ -75,7 +73,6 @@ exports["lang:bs"] = { }, "format ordinal" : function (test) { - test.expect(31); 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.'); @@ -114,7 +111,6 @@ exports["lang:bs"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'januar jan._februar feb._mart mar._april apr._maj maj._juni jun._juli jul._avgust avg._septembar sep._oktobar okt._novembar nov._decembar dec.'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -123,7 +119,6 @@ exports["lang:bs"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'nedjelja ned. ne_ponedjeljak pon. po_utorak uto. ut_srijeda sri. sr_četvrtak čet. če_petak pet. pe_subota sub. su'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -132,7 +127,6 @@ exports["lang:bs"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "par sekundi", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "jedna minuta", "45 seconds = a minute"); @@ -152,15 +146,13 @@ exports["lang:bs"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dana", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "mjesec", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "mjesec", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "mjesec", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "mjesec", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 mjeseca", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 mjeseca", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 mjeseca", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "mjesec", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 mjeseci", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 mjeseci", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "godinu", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "godinu", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 godine", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "godinu", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 godina", "5 years = 5 years"); @@ -168,27 +160,23 @@ exports["lang:bs"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "za par sekundi", "prefix"); test.equal(moment(0).from(30000), "prije par sekundi", "prefix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "prije par sekundi", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "za par sekundi", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "za 5 dana", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -202,7 +190,6 @@ exports["lang:bs"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; @@ -234,7 +221,6 @@ exports["lang:bs"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -265,7 +251,6 @@ exports["lang:bs"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -286,7 +271,6 @@ exports["lang:bs"] = { // 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"); @@ -298,7 +282,6 @@ exports["lang:bs"] = { }, "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"); @@ -310,7 +293,6 @@ exports["lang:bs"] = { }, "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"); @@ -323,7 +305,6 @@ exports["lang:bs"] = { }, "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"); @@ -336,7 +317,6 @@ exports["lang:bs"] = { }, "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"); @@ -349,7 +329,6 @@ exports["lang:bs"] = { }, "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"); @@ -362,7 +341,6 @@ exports["lang:bs"] = { }, "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"); @@ -375,7 +353,6 @@ exports["lang:bs"] = { }, "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"); diff --git a/test/lang/ca.js b/test/lang/ca.js index d17f38dd7..03c95fa23 100644 --- a/test/lang/ca.js +++ b/test/lang/ca.js @@ -20,7 +20,6 @@ exports["lang:ca"] = { }, "parse" : function (test) { - test.expect(96); var tests = "gener gen._febrer febr._març mar._abril abr._maig mai._juny jun._juliol jul._agost ag._setembre set._octubre oct._novembre nov._desembre des.".split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:ca"] = { }, "format ordinal" : function (test) { - test.expect(31); 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º'); @@ -80,7 +78,6 @@ exports["lang:ca"] = { }, "format month" : function (test) { - test.expect(12); var expected = "gener gen._febrer febr._març mar._abril abr._maig mai._juny jun._juliol jul._agost ag._setembre set._octubre oct._novembre nov._desembre des.".split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -89,7 +86,6 @@ exports["lang:ca"] = { }, "format week" : function (test) { - test.expect(7); var expected = "diumenge dg. Dg_dilluns dl. Dl_dimarts dt. Dt_dimecres dc. Dc_dijous dj. Dj_divendres dv. Dv_dissabte ds. Ds".split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -98,7 +94,6 @@ exports["lang:ca"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "uns segons", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "un minut", "45 seconds = a minute"); @@ -118,15 +113,13 @@ exports["lang:ca"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dies", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "un mes", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "un mes", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "un mes", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "un mes", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 mesos", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 mesos", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 mesos", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "un mes", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 mesos", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 mesos", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "un any", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "un any", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 anys", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "un any", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 anys", "5 years = 5 years"); @@ -134,27 +127,23 @@ exports["lang:ca"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "en uns segons", "prefix"); test.equal(moment(0).from(30000), "fa uns segons", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "fa uns segons", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "en uns segons", "en uns segons"); test.equal(moment().add({d: 5}).fromNow(), "en 5 dies", "en 5 dies"); test.done(); }, "calendar day" : function (test) { - test.expect(7); var a = moment().hours(2).minutes(0).seconds(0); @@ -169,7 +158,6 @@ exports["lang:ca"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -184,7 +172,6 @@ exports["lang:ca"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -199,7 +186,6 @@ exports["lang:ca"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -219,7 +205,6 @@ exports["lang:ca"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -231,7 +216,6 @@ exports["lang:ca"] = { }, "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"); @@ -243,7 +227,6 @@ exports["lang:ca"] = { }, "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"); @@ -256,7 +239,6 @@ exports["lang:ca"] = { }, "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"); @@ -269,7 +251,6 @@ exports["lang:ca"] = { }, "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"); @@ -282,7 +263,6 @@ exports["lang:ca"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -295,7 +275,6 @@ exports["lang:ca"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -308,7 +287,6 @@ exports["lang:ca"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52º', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1º', "Jan 2 2012 should be week 1"); diff --git a/test/lang/cs.js b/test/lang/cs.js index 06d853e89..0640afd91 100644 --- a/test/lang/cs.js +++ b/test/lang/cs.js @@ -20,7 +20,6 @@ exports["lang:cs"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'leden led_únor úno_březen bře_duben dub_květen kvě_červen čvn_červenec čvc_srpen srp_září zář_říjen říj_listopad lis_prosinec pro'.split("_"), i; function equalTest(input, mmm, monthIndex) { test.equal(moment(input, mmm).month(), monthIndex, input + ' should be month ' + (monthIndex + 1)); @@ -40,7 +39,6 @@ exports["lang:cs"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss', 'neděle, únor 14. 2010, 3:25:50'], ['ddd, h', 'ne, 3'], @@ -74,7 +72,6 @@ exports["lang:cs"] = { }, "format ordinal" : function (test) { - test.expect(31); 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.'); @@ -113,7 +110,6 @@ exports["lang:cs"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'leden led_únor úno_březen bře_duben dub_květen kvě_červen čvn_červenec čvc_srpen srp_září zář_říjen říj_listopad lis_prosinec pro'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -122,7 +118,6 @@ exports["lang:cs"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'neděle ne ne_pondělí po po_úterý út út_středa st st_čtvrtek čt čt_pátek pá pá_sobota so so'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -131,7 +126,6 @@ exports["lang:cs"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "pár sekund", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "minuta", "45 seconds = a minute"); @@ -151,15 +145,13 @@ exports["lang:cs"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dní", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "měsíc", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "měsíc", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "měsíc", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "měsíc", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 měsíce", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 měsíce", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 měsíce", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "měsíc", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 měsíců", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 měsíců", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "rok", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "rok", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 roky", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "rok", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 let", "5 years = 5 years"); @@ -167,20 +159,17 @@ exports["lang:cs"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "za pár sekund", "prefix"); test.equal(moment(0).from(30000), "před pár sekundami", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "před pár sekundami", "now from now should display as in the past"); test.done(); }, "fromNow (future)" : function (test) { - test.expect(16); test.equal(moment().add({s: 30}).fromNow(), "za pár sekund", "in a few seconds"); test.equal(moment().add({m: 1}).fromNow(), "za minutu", "in a minute"); test.equal(moment().add({m: 3}).fromNow(), "za 3 minuty", "in 3 minutes"); @@ -201,7 +190,6 @@ exports["lang:cs"] = { }, "fromNow (past)" : function (test) { - test.expect(16); test.equal(moment().subtract({s: 30}).fromNow(), "před pár sekundami", "a few seconds ago"); test.equal(moment().subtract({m: 1}).fromNow(), "před minutou", "a minute ago"); test.equal(moment().subtract({m: 3}).fromNow(), "před 3 minutami", "3 minutes ago"); @@ -222,7 +210,6 @@ exports["lang:cs"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -236,7 +223,6 @@ exports["lang:cs"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m, nextDay; for (i = 2; i < 7; i++) { @@ -275,7 +261,6 @@ exports["lang:cs"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m, lastDay; for (i = 2; i < 7; i++) { @@ -314,7 +299,6 @@ exports["lang:cs"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -330,7 +314,6 @@ exports["lang:cs"] = { }, "humanize duration" : function (test) { - test.expect(4); test.equal(moment.duration(1, "minutes").humanize(), "minuta", "a minute (future)"); test.equal(moment.duration(1, "minutes").humanize(true), "za minutu", "in a minute"); test.equal(moment.duration(-1, "minutes").humanize(), "minuta", "a minute (past)"); @@ -342,7 +325,6 @@ exports["lang:cs"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -354,7 +336,6 @@ exports["lang:cs"] = { }, "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"); @@ -366,7 +347,6 @@ exports["lang:cs"] = { }, "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"); @@ -379,7 +359,6 @@ exports["lang:cs"] = { }, "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"); @@ -392,7 +371,6 @@ exports["lang:cs"] = { }, "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"); @@ -405,7 +383,6 @@ exports["lang:cs"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -418,7 +395,6 @@ exports["lang:cs"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -431,7 +407,6 @@ exports["lang:cs"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52.', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1.', "Jan 2 2012 should be week 1"); diff --git a/test/lang/cv.js b/test/lang/cv.js index 7dfff781d..4d398b792 100644 --- a/test/lang/cv.js +++ b/test/lang/cv.js @@ -20,7 +20,6 @@ exports["lang:cv"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'кăрлач кăр_нарăс нар_пуш пуш_ака ака_май май_çĕртме çĕр_утă утă_çурла çур_авăн ав_юпа юпа_чӳк чӳк_раштав раш'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:cv"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'вырсарникун, нарăс 14-мĕш 2010, 3:25:50 pm'], @@ -76,7 +74,6 @@ exports["lang:cv"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1-мĕш', '1-мĕш'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2-мĕш', '2-мĕш'); @@ -116,7 +113,6 @@ exports["lang:cv"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'кăрлач кăр_нарăс нар_пуш пуш_ака ака_май май_çĕртме çĕр_утă утă_çурла çур_авăн ав_юпа юпа_чӳк чӳк_раштав раш'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -126,7 +122,6 @@ exports["lang:cv"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'вырсарникун выр вр_тунтикун тун тн_ытларикун ытл ыт_юнкун юн юн_кĕçнерникун кĕç кç_эрнекун эрн эр_шăматкун шăм шм'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -136,7 +131,6 @@ exports["lang:cv"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "пĕр-ик çеккунт", "44 sekunder = a few seconds"); @@ -157,15 +151,13 @@ exports["lang:cv"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 кун", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "пĕр уйăх", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "пĕр уйăх", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "пĕр уйăх", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "пĕр уйăх", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 уйăх", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 уйăх", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 уйăх", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "пĕр уйăх", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 уйăх", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 уйăх", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "пĕр çул", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "пĕр çул", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 çул", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "пĕр çул", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 çул", "5 years = 5 years"); @@ -173,20 +165,17 @@ exports["lang:cv"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "пĕр-ик çеккунтран", "prefix"); test.equal(moment(0).from(30000), "пĕр-ик çеккунт каялла", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "пĕр-ик çеккунт каялла", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(4); test.equal(moment().add({s: 30}).fromNow(), "пĕр-ик çеккунтран", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "5 кунран", "in 5 days"); test.equal(moment().add({h: 2}).fromNow(), "2 сехетрен", "in 2 hours, the right suffix!"); @@ -195,7 +184,6 @@ exports["lang:cv"] = { }, "calendar day" : function (test) { - test.expect(6); 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"); @@ -207,7 +195,6 @@ exports["lang:cv"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; @@ -223,7 +210,6 @@ exports["lang:cv"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -239,7 +225,6 @@ exports["lang:cv"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -258,7 +243,6 @@ exports["lang:cv"] = { // 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"); @@ -270,7 +254,6 @@ exports["lang:cv"] = { }, "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"); @@ -282,7 +265,6 @@ exports["lang:cv"] = { }, "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"); @@ -295,7 +277,6 @@ exports["lang:cv"] = { }, "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"); @@ -308,7 +289,6 @@ exports["lang:cv"] = { }, "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"); @@ -321,7 +301,6 @@ exports["lang:cv"] = { }, "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"); @@ -334,7 +313,6 @@ exports["lang:cv"] = { }, "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"); @@ -347,7 +325,6 @@ exports["lang:cv"] = { }, "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"); diff --git a/test/lang/cy.js b/test/lang/cy.js index 56f1fbde1..2048869f0 100644 --- a/test/lang/cy.js +++ b/test/lang/cy.js @@ -20,7 +20,6 @@ exports["lang:cy"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'Ionawr Ion_Chwefror Chwe_Mawrth Maw_Ebrill Ebr_Mai Mai_Mehefin Meh_Gorffennaf Gor_Awst Aws_Medi Med_Hydref Hyd_Tachwedd Tach_Rhagfyr Rhag'.split("_"), i; @@ -42,7 +41,6 @@ exports["lang:cy"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'Dydd Sul, Chwefror 14eg 2010, 3:25:50 pm'], @@ -77,7 +75,6 @@ exports["lang:cy"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1af', '1af'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2il', '2il'); @@ -117,7 +114,6 @@ exports["lang:cy"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'Ionawr Ion_Chwefror Chwe_Mawrth Maw_Ebrill Ebr_Mai Mai_Mehefin Meh_Gorffennaf Gor_Awst Aws_Medi Med_Hydref Hyd_Tachwedd Tach_Rhagfyr Rhag'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -127,7 +123,6 @@ exports["lang:cy"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'Dydd Sul Sul Su_Dydd Llun Llun Ll_Dydd Mawrth Maw Ma_Dydd Mercher Mer Me_Dydd Iau Iau Ia_Dydd Gwener Gwe Gw_Dydd Sadwrn Sad Sa'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -137,7 +132,6 @@ exports["lang:cy"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "ychydig eiliadau", "44 seconds = a few seconds"); @@ -158,15 +152,13 @@ exports["lang:cy"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 diwrnod", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "mis", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "mis", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "mis", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "mis", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 mis", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 mis", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 mis", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "mis", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 mis", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 mis", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "blwyddyn", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "blwyddyn", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 flynedd", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "blwyddyn", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 flynedd", "5 years = 5 years"); @@ -174,7 +166,6 @@ exports["lang:cy"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "mewn ychydig eiliadau", "prefix"); test.equal(moment(0).from(30000), "ychydig eiliadau yn ôl", "suffix"); @@ -182,7 +173,6 @@ exports["lang:cy"] = { }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "mewn ychydig eiliadau", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "mewn 5 diwrnod", "in 5 days"); @@ -190,7 +180,6 @@ exports["lang:cy"] = { }, "same day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -204,7 +193,6 @@ exports["lang:cy"] = { }, "same next week" : function (test) { - test.expect(15); var i, m; @@ -220,7 +208,6 @@ exports["lang:cy"] = { }, "same last week" : function (test) { - test.expect(15); var i, m; @@ -236,7 +223,6 @@ exports["lang:cy"] = { }, "same all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -255,7 +241,6 @@ exports["lang:cy"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -267,7 +252,6 @@ exports["lang:cy"] = { }, "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"); @@ -279,7 +263,6 @@ exports["lang:cy"] = { }, "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"); @@ -292,7 +275,6 @@ exports["lang:cy"] = { }, "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"); @@ -305,7 +287,6 @@ exports["lang:cy"] = { }, "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"); @@ -318,7 +299,6 @@ exports["lang:cy"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -331,7 +311,6 @@ exports["lang:cy"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -344,7 +323,6 @@ exports["lang:cy"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52ain', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1af', "Jan 2 2012 should be week 1"); diff --git a/test/lang/da.js b/test/lang/da.js index 2e504ed95..d0832aa28 100644 --- a/test/lang/da.js +++ b/test/lang/da.js @@ -20,7 +20,6 @@ exports["lang:da"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'januar jan_februar feb_marts mar_april apr_maj maj_juni jun_juli jul_august aug_september sep_oktober okt_november nov_december dec'.split("_"), i; function equalTest(input, mmm, i) { test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1)); @@ -40,7 +39,6 @@ exports["lang:da"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd [den] Do MMMM YYYY, h:mm:ss a', 'søndag den 14. februar 2010, 3:25:50 pm'], ['ddd hA', 'søn 3PM'], @@ -74,7 +72,6 @@ exports["lang:da"] = { }, "format ordinal" : function (test) { - test.expect(31); 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.'); @@ -113,7 +110,6 @@ exports["lang:da"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'januar jan_februar feb_marts mar_april apr_maj maj_juni jun_juli jul_august aug_september sep_oktober okt_november nov_december dec'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -122,7 +118,6 @@ exports["lang:da"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'søndag søn sø_mandag man ma_tirsdag tir ti_onsdag ons on_torsdag tor to_fredag fre fr_lørdag lør lø'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -131,7 +126,6 @@ exports["lang:da"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "få sekunder", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "et minut", "45 seconds = a minute"); @@ -151,15 +145,13 @@ exports["lang:da"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dage", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "en måned", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "en måned", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "en måned", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "en måned", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 måneder", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 måneder", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 måneder", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "en måned", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 måneder", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 måneder", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "et år", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "et år", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 år", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "et år", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 år", "5 years = 5 years"); @@ -167,20 +159,17 @@ exports["lang:da"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "om få sekunder", "prefix"); test.equal(moment(0).from(30000), "få sekunder siden", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "få sekunder siden", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "om få sekunder", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "om 5 dage", "in 5 days"); test.done(); @@ -190,7 +179,6 @@ exports["lang:da"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -202,7 +190,6 @@ exports["lang:da"] = { }, "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"); @@ -214,7 +201,6 @@ exports["lang:da"] = { }, "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"); @@ -227,7 +213,6 @@ exports["lang:da"] = { }, "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"); @@ -240,7 +225,6 @@ exports["lang:da"] = { }, "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"); @@ -253,7 +237,6 @@ exports["lang:da"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -266,7 +249,6 @@ exports["lang:da"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -279,7 +261,6 @@ exports["lang:da"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52.', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1.', "Jan 2 2012 should be week 1"); diff --git a/test/lang/de.js b/test/lang/de.js index a478186b7..a669c8ac9 100644 --- a/test/lang/de.js +++ b/test/lang/de.js @@ -20,7 +20,6 @@ exports["lang:de"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'Januar Jan._Februar Febr._März Mrz._April Apr._Mai Mai_Juni Jun._Juli Jul._August Aug._September Sept._Oktober Okt._November Nov._Dezember Dez.'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:de"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, Do MMMM YYYY, h:mm:ss a', 'Sonntag, 14. Februar 2010, 3:25:50 pm'], @@ -76,7 +74,6 @@ exports["lang:de"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.'); @@ -116,7 +113,6 @@ exports["lang:de"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'Januar Jan._Februar Febr._März Mrz._April Apr._Mai Mai_Juni Jun._Juli Jul._August Aug._September Sept._Oktober Okt._November Nov._Dezember Dez.'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -126,7 +122,6 @@ exports["lang:de"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'Sonntag So. So_Montag Mo. Mo_Dienstag Di. Di_Mittwoch Mi. Mi_Donnerstag Do. Do_Freitag Fr. Fr_Samstag Sa. Sa'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -136,7 +131,6 @@ exports["lang:de"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "ein paar Sekunden", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "eine Minute", "45 seconds = a minute"); @@ -156,15 +150,13 @@ exports["lang:de"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 Tage", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "ein Monat", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "ein Monat", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "ein Monat", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "ein Monat", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 Monate", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 Monate", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 Monate", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "ein Monat", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 Monate", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 Monate", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "ein Jahr", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "ein Jahr", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 Jahre", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "ein Jahr", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 Jahre", "5 years = 5 years"); @@ -172,21 +164,18 @@ exports["lang:de"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "in ein paar Sekunden", "prefix"); test.equal(moment(0).from(30000), "vor ein paar Sekunden", "suffix"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "in ein paar Sekunden", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "in 5 Tagen", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -200,7 +189,6 @@ exports["lang:de"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -215,7 +203,6 @@ exports["lang:de"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -230,7 +217,6 @@ exports["lang:de"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -251,7 +237,6 @@ exports["lang:de"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -263,7 +248,6 @@ exports["lang:de"] = { }, "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"); @@ -275,7 +259,6 @@ exports["lang:de"] = { }, "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"); @@ -288,7 +271,6 @@ exports["lang:de"] = { }, "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"); @@ -301,7 +283,6 @@ exports["lang:de"] = { }, "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"); @@ -314,7 +295,6 @@ exports["lang:de"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -327,7 +307,6 @@ exports["lang:de"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -340,7 +319,6 @@ exports["lang:de"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52.', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1.', "Jan 2 2012 should be week 1"); diff --git a/test/lang/el.js b/test/lang/el.js index 88552c125..46ddd0569 100644 --- a/test/lang/el.js +++ b/test/lang/el.js @@ -20,7 +20,6 @@ exports["lang:el"] = { }, "parse" : function (test) { - test.expect(96); var i, tests = 'Ιανουάριος Ιαν_Φεβρουάριος Φεβ_Μάρτιος Μαρ_Απρίλιος Απρ_Μάιος Μαϊ_Ιούνιος Ιουν_Ιούλιος Ιουλ_Αύγουστος Αυγ_Σεπτέμβριος Σεπ_Οκτώβριος Οκτ_Νοέμβριος Νοε_Δεκέμβριος Δεκ'.split("_"); @@ -45,7 +44,6 @@ exports["lang:el"] = { }, "format" : function (test) { - test.expect(24); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'Κυριακή, Φεβρουάριος 14η 2010, 3:25:50 μμ'], @@ -84,7 +82,6 @@ exports["lang:el"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1η', '1η'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2η', '2η'); @@ -124,7 +121,6 @@ exports["lang:el"] = { }, "format month" : function (test) { - test.expect(12); var i, expected = 'Ιανουάριος Ιαν_Φεβρουάριος Φεβ_Μάρτιος Μαρ_Απρίλιος Απρ_Μάιος Μαϊ_Ιούνιος Ιουν_Ιούλιος Ιουλ_Αύγουστος Αυγ_Σεπτέμβριος Σεπ_Οκτώβριος Οκτ_Νοέμβριος Νοε_Δεκέμβριος Δεκ'.split("_"); @@ -136,7 +132,6 @@ exports["lang:el"] = { }, "format week" : function (test) { - test.expect(7); var i, expected = 'Κυριακή Κυρ Κυ_Δευτέρα Δευ Δε_Τρίτη Τρι Τρ_Τετάρτη Τετ Τε_Πέμπτη Πεμ Πε_Παρασκευή Παρ Πα_Σάββατο Σαβ Σα'.split("_"); @@ -149,7 +144,6 @@ exports["lang:el"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); @@ -171,15 +165,13 @@ exports["lang:el"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 μέρες", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "ένας μήνας", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "ένας μήνας", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "ένας μήνας", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "ένας μήνας", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 μήνες", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 μήνες", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 μήνες", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "ένας μήνας", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 μήνες", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 μήνες", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "ένας χρόνος", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "ένας χρόνος", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 χρόνια", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "ένας χρόνος", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 χρόνια", "5 years = 5 years"); @@ -188,7 +180,6 @@ exports["lang:el"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "σε δευτερόλεπτα", "prefix"); test.equal(moment(0).from(30000), "δευτερόλεπτα πριν", "suffix"); @@ -197,7 +188,6 @@ exports["lang:el"] = { }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "δευτερόλεπτα πριν", "now from now should display as in the past"); @@ -205,7 +195,6 @@ exports["lang:el"] = { }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "σε δευτερόλεπτα", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "σε 5 μέρες", "in 5 days"); @@ -214,7 +203,6 @@ exports["lang:el"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -229,7 +217,6 @@ exports["lang:el"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -244,7 +231,6 @@ exports["lang:el"] = { }, "calendar last week" : function (test) { - test.expect(20); var i, m; for (i = 2; i < 7; i++) { @@ -262,7 +248,6 @@ exports["lang:el"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -283,7 +268,6 @@ exports["lang:el"] = { // The week that contains Jan 4st is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 7]).week(), 1, "Jan 7 2012 should be week 1"); @@ -295,7 +279,6 @@ exports["lang:el"] = { }, "weeks year starting monday" : function (test) { - test.expect(6); test.equal(moment([2006, 11, 31]).week(), 52, "Dec 31 2006 should be week 52"); test.equal(moment([2007, 0, 1]).week(), 1, "Jan 1 2007 should be week 1"); @@ -308,7 +291,6 @@ exports["lang:el"] = { }, "weeks year starting tuesday" : function (test) { - test.expect(6); test.equal(moment([2007, 11, 30]).week(), 52, "Dec 30 2007 should be week 52"); test.equal(moment([2008, 0, 1]).week(), 1, "Jan 1 2008 should be week 1"); @@ -321,7 +303,6 @@ exports["lang:el"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(6); test.equal(moment([2002, 11, 29]).week(), 52, "Dec 29 2002 should be week 52"); test.equal(moment([2003, 0, 1]).week(), 1, "Jan 1 2003 should be week 1"); @@ -334,7 +315,6 @@ exports["lang:el"] = { }, "weeks year starting thursday" : function (test) { - test.expect(6); test.equal(moment([2008, 11, 28]).week(), 52, "Dec 28 2008 should be week 52"); test.equal(moment([2009, 0, 1]).week(), 1, "Jan 1 2009 should be week 1"); @@ -347,7 +327,6 @@ exports["lang:el"] = { }, "weeks year starting friday" : function (test) { - test.expect(7); test.equal(moment([2009, 11, 27]).week(), 52, "Dec 27 2009 should be week 52"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -361,7 +340,6 @@ exports["lang:el"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 26]).week(), 51, "Dec 26 2010 should be week 51"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -374,7 +352,6 @@ exports["lang:el"] = { }, "weeks year starting sunday format" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52η', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 7]).format('w ww wo'), '1 01 1η', "Jan 7 2012 should be week 1"); diff --git a/test/lang/en-au.js b/test/lang/en-au.js index 954f72b9a..a130f99e2 100644 --- a/test/lang/en-au.js +++ b/test/lang/en-au.js @@ -20,7 +20,6 @@ exports["lang:en-au"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split("_"), i; function equalTest(input, mmm, i) { test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1)); @@ -40,7 +39,6 @@ exports["lang:en-au"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'Sunday, February 14th 2010, 3:25:50 pm'], ['ddd, hA', 'Sun, 3PM'], @@ -74,7 +72,6 @@ exports["lang:en-au"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1st', '1st'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2nd', '2nd'); test.equal(moment([2011, 0, 3]).format('DDDo'), '3rd', '3rd'); @@ -113,7 +110,6 @@ exports["lang:en-au"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -122,7 +118,6 @@ exports["lang:en-au"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'Sunday Sun Su_Monday Mon Mo_Tuesday Tue Tu_Wednesday Wed We_Thursday Thu Th_Friday Fri Fr_Saturday Sat Sa'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -131,7 +126,6 @@ exports["lang:en-au"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "a few seconds", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "a minute", "45 seconds = a minute"); @@ -151,15 +145,13 @@ exports["lang:en-au"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 days", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "a month", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "a month", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "a month", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "a month", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 months", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 months", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 months", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "a month", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 months", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 months", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "a year", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "a year", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 years", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "a year", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 years", "5 years = 5 years"); @@ -167,27 +159,23 @@ exports["lang:en-au"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "in a few seconds", "prefix"); test.equal(moment(0).from(30000), "a few seconds ago", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "a few seconds ago", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "in a few seconds", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "in 5 days", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -201,7 +189,6 @@ exports["lang:en-au"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -216,7 +203,6 @@ exports["lang:en-au"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -232,7 +218,6 @@ exports["lang:en-au"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -253,7 +238,6 @@ exports["lang:en-au"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -265,7 +249,6 @@ exports["lang:en-au"] = { }, "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"); @@ -277,7 +260,6 @@ exports["lang:en-au"] = { }, "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"); @@ -290,7 +272,6 @@ exports["lang:en-au"] = { }, "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"); @@ -303,7 +284,6 @@ exports["lang:en-au"] = { }, "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"); @@ -316,7 +296,6 @@ exports["lang:en-au"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -329,7 +308,6 @@ exports["lang:en-au"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -342,7 +320,6 @@ exports["lang:en-au"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52nd', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1st', "Jan 2 2012 should be week 1"); diff --git a/test/lang/en-ca.js b/test/lang/en-ca.js index 623eb0916..2093948f0 100644 --- a/test/lang/en-ca.js +++ b/test/lang/en-ca.js @@ -19,7 +19,6 @@ exports["lang:en-ca"] = { }, "parse" : function (test) { - test.expect(96); var i, tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split("_"); @@ -44,7 +43,6 @@ exports["lang:en-ca"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'Sunday, February 14th 2010, 3:25:50 pm'], @@ -81,7 +79,6 @@ exports["lang:en-ca"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1st', '1st'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2nd', '2nd'); @@ -122,7 +119,6 @@ exports["lang:en-ca"] = { }, "format month" : function (test) { - test.expect(12); var i, expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split("_"); @@ -135,7 +131,6 @@ exports["lang:en-ca"] = { }, "format week" : function (test) { - test.expect(7); var i, expected = 'Sunday Sun Su_Monday Mon Mo_Tuesday Tue Tu_Wednesday Wed We_Thursday Thu Th_Friday Fri Fr_Saturday Sat Sa'.split("_"); @@ -148,7 +143,6 @@ exports["lang:en-ca"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "a few seconds", "44 seconds = a few seconds"); @@ -169,15 +163,13 @@ exports["lang:en-ca"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 days", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "a month", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "a month", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "a month", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "a month", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 months", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 months", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 months", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "a month", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 months", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 months", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "a year", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "a year", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 years", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "a year", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 years", "5 years = 5 years"); @@ -186,7 +178,6 @@ exports["lang:en-ca"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "in a few seconds", "prefix"); test.equal(moment(0).from(30000), "a few seconds ago", "suffix"); @@ -195,7 +186,6 @@ exports["lang:en-ca"] = { }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "a few seconds ago", "now from now should display as in the past"); @@ -203,7 +193,6 @@ exports["lang:en-ca"] = { }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "in a few seconds", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "in 5 days", "in 5 days"); @@ -212,7 +201,6 @@ exports["lang:en-ca"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -226,7 +214,6 @@ exports["lang:en-ca"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; @@ -242,7 +229,6 @@ exports["lang:en-ca"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -258,7 +244,6 @@ exports["lang:en-ca"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -279,7 +264,6 @@ exports["lang:en-ca"] = { // 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([2012, 0, 1]).week(), 1, "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).week(), 1, "Jan 7 2012 should be week 1"); @@ -291,7 +275,6 @@ exports["lang:en-ca"] = { }, "weeks year starting monday" : function (test) { - test.expect(6); test.equal(moment([2006, 11, 31]).week(), 1, "Dec 31 2006 should be week 1"); test.equal(moment([2007, 0, 1]).week(), 1, "Jan 1 2007 should be week 1"); @@ -304,7 +287,6 @@ exports["lang:en-ca"] = { }, "weeks year starting tuesday" : function (test) { - test.expect(6); test.equal(moment([2007, 11, 29]).week(), 52, "Dec 29 2007 should be week 52"); test.equal(moment([2008, 0, 1]).week(), 1, "Jan 1 2008 should be week 1"); @@ -317,7 +299,6 @@ exports["lang:en-ca"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(6); test.equal(moment([2002, 11, 29]).week(), 1, "Dec 29 2002 should be week 1"); test.equal(moment([2003, 0, 1]).week(), 1, "Jan 1 2003 should be week 1"); @@ -330,7 +311,6 @@ exports["lang:en-ca"] = { }, "weeks year starting thursday" : function (test) { - test.expect(6); test.equal(moment([2008, 11, 28]).week(), 1, "Dec 28 2008 should be week 1"); test.equal(moment([2009, 0, 1]).week(), 1, "Jan 1 2009 should be week 1"); @@ -343,7 +323,6 @@ exports["lang:en-ca"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 27]).week(), 1, "Dec 27 2009 should be week 1"); test.equal(moment([2010, 0, 1]).week(), 1, "Jan 1 2010 should be week 1"); @@ -356,7 +335,6 @@ exports["lang:en-ca"] = { }, "weeks year starting saturday" : function (test) { - test.expect(5); test.equal(moment([2010, 11, 26]).week(), 1, "Dec 26 2010 should be week 1"); test.equal(moment([2011, 0, 1]).week(), 1, "Jan 1 2011 should be week 1"); @@ -368,7 +346,6 @@ exports["lang:en-ca"] = { }, "weeks year starting sunday format" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '1 01 1st', "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).format('w ww wo'), '1 01 1st', "Jan 7 2012 should be week 1"); diff --git a/test/lang/en-gb.js b/test/lang/en-gb.js index e283e3aee..4b9a2b53b 100644 --- a/test/lang/en-gb.js +++ b/test/lang/en-gb.js @@ -20,7 +20,6 @@ exports["lang:en-gb"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split("_"), i; function equalTest(input, mmm, i) { test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1)); @@ -40,7 +39,6 @@ exports["lang:en-gb"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'Sunday, February 14th 2010, 3:25:50 pm'], ['ddd, hA', 'Sun, 3PM'], @@ -74,7 +72,6 @@ exports["lang:en-gb"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1st', '1st'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2nd', '2nd'); test.equal(moment([2011, 0, 3]).format('DDDo'), '3rd', '3rd'); @@ -113,7 +110,6 @@ exports["lang:en-gb"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -122,7 +118,6 @@ exports["lang:en-gb"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'Sunday Sun Su_Monday Mon Mo_Tuesday Tue Tu_Wednesday Wed We_Thursday Thu Th_Friday Fri Fr_Saturday Sat Sa'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -131,7 +126,6 @@ exports["lang:en-gb"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "a few seconds", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "a minute", "45 seconds = a minute"); @@ -151,15 +145,13 @@ exports["lang:en-gb"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 days", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "a month", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "a month", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "a month", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "a month", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 months", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 months", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 months", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "a month", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 months", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 months", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "a year", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "a year", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 years", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "a year", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 years", "5 years = 5 years"); @@ -167,27 +159,23 @@ exports["lang:en-gb"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "in a few seconds", "prefix"); test.equal(moment(0).from(30000), "a few seconds ago", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "a few seconds ago", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "in a few seconds", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "in 5 days", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -201,7 +189,6 @@ exports["lang:en-gb"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -216,7 +203,6 @@ exports["lang:en-gb"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -232,7 +218,6 @@ exports["lang:en-gb"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -253,7 +238,6 @@ exports["lang:en-gb"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -265,7 +249,6 @@ exports["lang:en-gb"] = { }, "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"); @@ -277,7 +260,6 @@ exports["lang:en-gb"] = { }, "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"); @@ -290,7 +272,6 @@ exports["lang:en-gb"] = { }, "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"); @@ -303,7 +284,6 @@ exports["lang:en-gb"] = { }, "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"); @@ -316,7 +296,6 @@ exports["lang:en-gb"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -329,7 +308,6 @@ exports["lang:en-gb"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -342,7 +320,6 @@ exports["lang:en-gb"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52nd', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1st', "Jan 2 2012 should be week 1"); diff --git a/test/lang/en.js b/test/lang/en.js index 85c4f8c82..8be2301d7 100644 --- a/test/lang/en.js +++ b/test/lang/en.js @@ -20,7 +20,6 @@ exports["lang:en"] = { }, "parse" : function (test) { - test.expect(96); var i, tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split("_"); @@ -45,7 +44,6 @@ exports["lang:en"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'Sunday, February 14th 2010, 3:25:50 pm'], @@ -82,7 +80,6 @@ exports["lang:en"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1st', '1st'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2nd', '2nd'); @@ -122,7 +119,6 @@ exports["lang:en"] = { }, "format month" : function (test) { - test.expect(12); var i, expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split("_"); @@ -134,7 +130,6 @@ exports["lang:en"] = { }, "format week" : function (test) { - test.expect(7); var i, expected = 'Sunday Sun Su_Monday Mon Mo_Tuesday Tue Tu_Wednesday Wed We_Thursday Thu Th_Friday Fri Fr_Saturday Sat Sa'.split("_"); @@ -147,7 +142,6 @@ exports["lang:en"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); @@ -169,15 +163,13 @@ exports["lang:en"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 days", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "a month", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "a month", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "a month", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "a month", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 months", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 months", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 months", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "a month", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 months", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 months", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "a year", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "a year", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 years", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "a year", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 years", "5 years = 5 years"); @@ -186,7 +178,6 @@ exports["lang:en"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "in a few seconds", "prefix"); test.equal(moment(0).from(30000), "a few seconds ago", "suffix"); @@ -195,7 +186,6 @@ exports["lang:en"] = { }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "a few seconds ago", "now from now should display as in the past"); @@ -203,7 +193,6 @@ exports["lang:en"] = { }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "in a few seconds", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "in 5 days", "in 5 days"); @@ -212,7 +201,6 @@ exports["lang:en"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -227,7 +215,6 @@ exports["lang:en"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; @@ -243,7 +230,6 @@ exports["lang:en"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -259,7 +245,6 @@ exports["lang:en"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -280,7 +265,6 @@ exports["lang:en"] = { // 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([2012, 0, 1]).week(), 1, "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).week(), 1, "Jan 7 2012 should be week 1"); @@ -292,7 +276,6 @@ exports["lang:en"] = { }, "weeks year starting monday" : function (test) { - test.expect(6); test.equal(moment([2006, 11, 31]).week(), 1, "Dec 31 2006 should be week 1"); test.equal(moment([2007, 0, 1]).week(), 1, "Jan 1 2007 should be week 1"); @@ -305,7 +288,6 @@ exports["lang:en"] = { }, "weeks year starting tuesday" : function (test) { - test.expect(6); test.equal(moment([2007, 11, 29]).week(), 52, "Dec 29 2007 should be week 52"); test.equal(moment([2008, 0, 1]).week(), 1, "Jan 1 2008 should be week 1"); @@ -318,7 +300,6 @@ exports["lang:en"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(6); test.equal(moment([2002, 11, 29]).week(), 1, "Dec 29 2002 should be week 1"); test.equal(moment([2003, 0, 1]).week(), 1, "Jan 1 2003 should be week 1"); @@ -331,7 +312,6 @@ exports["lang:en"] = { }, "weeks year starting thursday" : function (test) { - test.expect(6); test.equal(moment([2008, 11, 28]).week(), 1, "Dec 28 2008 should be week 1"); test.equal(moment([2009, 0, 1]).week(), 1, "Jan 1 2009 should be week 1"); @@ -344,7 +324,6 @@ exports["lang:en"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 27]).week(), 1, "Dec 27 2009 should be week 1"); test.equal(moment([2010, 0, 1]).week(), 1, "Jan 1 2010 should be week 1"); @@ -357,7 +336,6 @@ exports["lang:en"] = { }, "weeks year starting saturday" : function (test) { - test.expect(5); test.equal(moment([2010, 11, 26]).week(), 1, "Dec 26 2010 should be week 1"); test.equal(moment([2011, 0, 1]).week(), 1, "Jan 1 2011 should be week 1"); @@ -369,7 +347,6 @@ exports["lang:en"] = { }, "weeks year starting sunday format" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '1 01 1st', "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).format('w ww wo'), '1 01 1st', "Jan 7 2012 should be week 1"); diff --git a/test/lang/eo.js b/test/lang/eo.js index 828f97413..b5d43014d 100644 --- a/test/lang/eo.js +++ b/test/lang/eo.js @@ -20,7 +20,6 @@ exports["lang:eo"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'januaro jan_februaro feb_marto mar_aprilo apr_majo maj_junio jun_julio jul_aŭgusto aŭg_septembro sep_oktobro okt_novembro nov_decembro dec'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:eo"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'Dimanĉo, februaro 14a 2010, 3:25:50 p.t.m.'], @@ -76,7 +74,6 @@ exports["lang:eo"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1a', '1a'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2a', '2a'); @@ -116,7 +113,6 @@ exports["lang:eo"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'januaro jan_februaro feb_marto mar_aprilo apr_majo maj_junio jun_julio jul_aŭgusto aŭg_septembro sep_oktobro okt_novembro nov_decembro dec'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -126,7 +122,6 @@ exports["lang:eo"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'Dimanĉo Dim Di_Lundo Lun Lu_Mardo Mard Ma_Merkredo Merk Me_Ĵaŭdo Ĵaŭ Ĵa_Vendredo Ven Ve_Sabato Sab Sa'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -136,7 +131,6 @@ exports["lang:eo"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "sekundoj", "44 seconds = a few seconds"); @@ -157,15 +151,13 @@ exports["lang:eo"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 tagoj", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "monato", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "monato", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "monato", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "monato", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 monatoj", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 monatoj", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 monatoj", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "monato", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 monatoj", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 monatoj", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "jaro", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "jaro", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 jaroj", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "jaro", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 jaroj", "5 years = 5 years"); @@ -173,27 +165,23 @@ exports["lang:eo"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "je sekundoj", "je prefix"); test.equal(moment(0).from(30000), "antaŭ sekundoj", "antaŭ prefix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "antaŭ sekundoj", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "je sekundoj", "je sekundoj"); test.equal(moment().add({d: 5}).fromNow(), "je 5 tagoj", "je 5 tagoj"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -207,7 +195,6 @@ exports["lang:eo"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; @@ -223,7 +210,6 @@ exports["lang:eo"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -239,7 +225,6 @@ exports["lang:eo"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -260,7 +245,6 @@ exports["lang:eo"] = { // 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"); @@ -272,7 +256,6 @@ exports["lang:eo"] = { }, "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"); @@ -284,7 +267,6 @@ exports["lang:eo"] = { }, "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"); @@ -297,7 +279,6 @@ exports["lang:eo"] = { }, "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"); @@ -310,7 +291,6 @@ exports["lang:eo"] = { }, "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"); @@ -323,7 +303,6 @@ exports["lang:eo"] = { }, "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"); @@ -336,7 +315,6 @@ exports["lang:eo"] = { }, "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"); @@ -349,7 +327,6 @@ exports["lang:eo"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1a', "Dec 26 2011 should be week 1"); test.equal(moment([2012, 0, 1]).format('w ww wo'), '1 01 1a', "Jan 1 2012 should be week 1"); diff --git a/test/lang/es.js b/test/lang/es.js index 042335c19..955ec62cb 100644 --- a/test/lang/es.js +++ b/test/lang/es.js @@ -20,7 +20,6 @@ exports["lang:es"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'enero ene._febrero feb._marzo mar._abril abr._mayo may._junio jun._julio jul._agosto ago._septiembre sep._octubre oct._noviembre nov._diciembre dic.'.split("_"), i; function equalTest(input, mmm, i) { test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1)); @@ -40,7 +39,6 @@ exports["lang:es"] = { }, "format" : function (test) { - test.expect(23); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'domingo, febrero 14º 2010, 3:25:50 pm'], ['ddd, hA', 'dom., 3PM'], @@ -75,7 +73,6 @@ exports["lang:es"] = { }, "format ordinal" : function (test) { - test.expect(31); 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º'); @@ -114,7 +111,6 @@ exports["lang:es"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'enero ene._febrero feb._marzo mar._abril abr._mayo may._junio jun._julio jul._agosto ago._septiembre sep._octubre oct._noviembre nov._diciembre dic.'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -123,7 +119,6 @@ exports["lang:es"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'domingo dom. Do_lunes lun. Lu_martes mar. Ma_miércoles mié. Mi_jueves jue. Ju_viernes vie. Vi_sábado sáb. Sá'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -132,7 +127,6 @@ exports["lang:es"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "unos segundos", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "un minuto", "45 seconds = a minute"); @@ -152,15 +146,13 @@ exports["lang:es"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 días", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "un mes", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "un mes", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "un mes", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "un mes", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 meses", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 meses", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 meses", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "un mes", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 meses", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 meses", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "un año", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "un año", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 años", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "un año", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 años", "5 years = 5 years"); @@ -168,27 +160,23 @@ exports["lang:es"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "en unos segundos", "prefix"); test.equal(moment(0).from(30000), "hace unos segundos", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "hace unos segundos", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "en unos segundos", "en unos segundos"); test.equal(moment().add({d: 5}).fromNow(), "en 5 días", "en 5 días"); test.done(); }, "calendar day" : function (test) { - test.expect(7); var a = moment().hours(2).minutes(0).seconds(0); @@ -203,7 +191,6 @@ exports["lang:es"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; @@ -219,7 +206,6 @@ exports["lang:es"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -235,7 +221,6 @@ exports["lang:es"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -256,7 +241,6 @@ exports["lang:es"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -268,7 +252,6 @@ exports["lang:es"] = { }, "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"); @@ -280,7 +263,6 @@ exports["lang:es"] = { }, "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"); @@ -293,7 +275,6 @@ exports["lang:es"] = { }, "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"); @@ -306,7 +287,6 @@ exports["lang:es"] = { }, "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"); @@ -319,7 +299,6 @@ exports["lang:es"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -332,7 +311,6 @@ exports["lang:es"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -345,7 +323,6 @@ exports["lang:es"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52º', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1º', "Jan 2 2012 should be week 1"); diff --git a/test/lang/et.js b/test/lang/et.js index b2cc646e9..caf417474 100644 --- a/test/lang/et.js +++ b/test/lang/et.js @@ -20,7 +20,6 @@ exports["lang:et"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'jaanuar jaan_veebruar veebr_märts märts_aprill apr_mai mai_juuni juuni_juuli juuli_august aug_september sept_oktoober okt_november nov_detsember dets'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:et"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, Do MMMM YYYY, H:mm:ss', 'pühapäev, 14. veebruar 2010, 15:25:50'], @@ -76,7 +74,6 @@ exports["lang:et"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.'); @@ -116,7 +113,6 @@ exports["lang:et"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'jaanuar jaan_veebruar veebr_märts märts_aprill apr_mai mai_juuni juuni_juuli juuli_august aug_september sept_oktoober okt_november nov_detsember dets'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -126,7 +122,6 @@ exports["lang:et"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'pühapäev P P_esmaspäev E E_teisipäev T T_kolmapäev K K_neljapäev N N_reede R R_laupäev L L'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -136,7 +131,6 @@ exports["lang:et"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "paar sekundit", "44 seconds = paar sekundit"); @@ -157,15 +151,13 @@ exports["lang:et"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 päeva", "25 days = 25 päeva"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "üks kuu", "26 days = üks kuu"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "üks kuu", "30 days = üks kuu"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "üks kuu", "45 days = üks kuu"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "üks kuu", "43 days = üks kuu"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 kuud", "46 days = 2 kuud"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 kuud", "75 days = 2 kuud"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 kuud", "76 days = 3 kuud"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "üks kuu", "1 month = üks kuu"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 kuud", "5 months = 5 kuud"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 kuud", "344 days = 11 kuud"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "üks aasta", "345 days = üks aasta"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "üks aasta", "547 days = üks aasta"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 aastat", "548 days = 2 aastat"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "üks aasta", "1 year = üks aasta"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 aastat", "5 years = 5 aastat"); @@ -173,7 +165,6 @@ exports["lang:et"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "mõne sekundi pärast", "prefix"); test.equal(moment(0).from(30000), "mõni sekund tagasi", "suffix"); @@ -181,14 +172,12 @@ exports["lang:et"] = { }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "mõni sekund tagasi", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(18); test.equal(moment().add({s: 30}).fromNow(), "mõne sekundi pärast", "in a few seconds"); test.equal(moment().subtract({s: 30}).fromNow(), "mõni sekund tagasi", "a few seconds ago"); @@ -220,7 +209,6 @@ exports["lang:et"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -234,7 +222,6 @@ exports["lang:et"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -249,7 +236,6 @@ exports["lang:et"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -264,7 +250,6 @@ exports["lang:et"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -285,7 +270,6 @@ exports["lang:et"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -297,7 +281,6 @@ exports["lang:et"] = { }, "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"); @@ -309,7 +292,6 @@ exports["lang:et"] = { }, "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"); @@ -322,7 +304,6 @@ exports["lang:et"] = { }, "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"); @@ -335,7 +316,6 @@ exports["lang:et"] = { }, "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"); @@ -348,7 +328,6 @@ exports["lang:et"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -361,7 +340,6 @@ exports["lang:et"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -374,7 +352,6 @@ exports["lang:et"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52.', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1.', "Jan 2 2012 should be week 1"); diff --git a/test/lang/eu.js b/test/lang/eu.js index d47f66707..9ad6dad25 100644 --- a/test/lang/eu.js +++ b/test/lang/eu.js @@ -20,7 +20,6 @@ exports["lang:eu"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'urtarrila urt._otsaila ots._martxoa mar._apirila api._maiatza mai._ekaina eka._uztaila uzt._abuztua abu._iraila ira._urria urr._azaroa aza._abendua abe.'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:eu"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'igandea, otsaila 14. 2010, 3:25:50 pm'], @@ -76,7 +74,6 @@ exports["lang:eu"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.'); @@ -116,7 +113,6 @@ exports["lang:eu"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'urtarrila urt._otsaila ots._martxoa mar._apirila api._maiatza mai._ekaina eka._uztaila uzt._abuztua abu._iraila ira._urria urr._azaroa aza._abendua abe.'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -126,7 +122,6 @@ exports["lang:eu"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'igandea ig. ig_astelehena al. al_asteartea ar. ar_asteazkena az. az_osteguna og. og_ostirala ol. ol_larunbata lr. lr'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -136,7 +131,6 @@ exports["lang:eu"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "segundo batzuk", "44 seconds = a few seconds"); @@ -157,15 +151,13 @@ exports["lang:eu"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 egun", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "hilabete bat", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "hilabete bat", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "hilabete bat", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "hilabete bat", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 hilabete", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 hilabete", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 hilabete", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "hilabete bat", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 hilabete", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 hilabete", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "urte bat", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "urte bat", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 urte", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "urte bat", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 urte", "5 years = 5 years"); @@ -173,27 +165,23 @@ exports["lang:eu"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "segundo batzuk barru", "prefix"); test.equal(moment(0).from(30000), "duela segundo batzuk", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "duela segundo batzuk", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "segundo batzuk barru", "in seconds"); test.equal(moment().add({d: 5}).fromNow(), "5 egun barru", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -207,7 +195,6 @@ exports["lang:eu"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -222,7 +209,6 @@ exports["lang:eu"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -237,7 +223,6 @@ exports["lang:eu"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -257,7 +242,6 @@ exports["lang:eu"] = { // 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"); @@ -269,7 +253,6 @@ exports["lang:eu"] = { }, "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"); @@ -281,7 +264,6 @@ exports["lang:eu"] = { }, "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"); @@ -294,7 +276,6 @@ exports["lang:eu"] = { }, "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"); @@ -307,7 +288,6 @@ exports["lang:eu"] = { }, "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"); @@ -320,7 +300,6 @@ exports["lang:eu"] = { }, "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"); @@ -333,7 +312,6 @@ exports["lang:eu"] = { }, "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"); @@ -346,7 +324,6 @@ exports["lang:eu"] = { }, "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"); diff --git a/test/lang/fa.js b/test/lang/fa.js index 0086e77d0..cf96fb472 100644 --- a/test/lang/fa.js +++ b/test/lang/fa.js @@ -17,7 +17,6 @@ exports["lang:fa"] = { }, "parse" : function (test) { - test.expect(24); var tests = 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split("_"), i; function equalTest(input, mmm, i) { test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1) + ' instead is month ' + moment(input, mmm).month()); @@ -30,7 +29,6 @@ exports["lang:fa"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'یک\u200cشنبه، فوریه ۱۴م ۲۰۱۰، ۳:۲۵:۵۰ بعد از ظهر'], ['ddd, hA', 'یک\u200cشنبه، ۳بعد از ظهر'], @@ -64,7 +62,6 @@ exports["lang:fa"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '۱م', '1'); test.equal(moment([2011, 0, 2]).format('DDDo'), '۲م', '2'); test.equal(moment([2011, 0, 3]).format('DDDo'), '۳م', '3'); @@ -103,7 +100,6 @@ exports["lang:fa"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'ژانویه ژانویه_فوریه فوریه_مارس مارس_آوریل آوریل_مه مه_ژوئن ژوئن_ژوئیه ژوئیه_اوت اوت_سپتامبر سپتامبر_اکتبر اکتبر_نوامبر نوامبر_دسامبر دسامبر'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -112,7 +108,6 @@ exports["lang:fa"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'یک\u200cشنبه یک\u200cشنبه ی_دوشنبه دوشنبه د_سه\u200cشنبه سه\u200cشنبه س_چهارشنبه چهارشنبه چ_پنج\u200cشنبه پنج\u200cشنبه پ_جمعه جمعه ج_شنبه شنبه ش'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -121,7 +116,6 @@ exports["lang:fa"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "چندین ثانیه", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "یک دقیقه", "45 seconds = a minute"); @@ -141,15 +135,13 @@ exports["lang:fa"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "۲۵ روز", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "یک ماه", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "یک ماه", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "یک ماه", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "یک ماه", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "۲ ماه", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "۲ ماه", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "۳ ماه", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "یک ماه", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "۵ ماه", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "۱۱ ماه", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "یک سال", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "یک سال", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "۲ سال", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "یک سال", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "۵ سال", "5 years = 5 years"); @@ -157,27 +149,23 @@ exports["lang:fa"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "در چندین ثانیه", "prefix"); test.equal(moment(0).from(30000), "چندین ثانیه پیش", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "چندین ثانیه پیش", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "در چندین ثانیه", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "در ۵ روز", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -191,7 +179,6 @@ exports["lang:fa"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -206,7 +193,6 @@ exports["lang:fa"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -221,7 +207,6 @@ exports["lang:fa"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -241,7 +226,6 @@ exports["lang:fa"] = { // 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"); @@ -253,7 +237,6 @@ exports["lang:fa"] = { }, "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"); @@ -265,7 +248,6 @@ exports["lang:fa"] = { }, "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"); @@ -278,7 +260,6 @@ exports["lang:fa"] = { }, "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"); @@ -291,7 +272,6 @@ exports["lang:fa"] = { }, "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"); @@ -304,7 +284,6 @@ exports["lang:fa"] = { }, "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"); @@ -316,7 +295,6 @@ exports["lang:fa"] = { }, "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"); @@ -328,7 +306,6 @@ exports["lang:fa"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2011, 11, 31]).format('w ww wo'), '۱ ۰۱ ۱م', "Dec 31 2011 should be week 1"); test.equal(moment([2012, 0, 6]).format('w ww wo'), '۱ ۰۱ ۱م', "Jan 6 2012 should be week 1"); diff --git a/test/lang/fi.js b/test/lang/fi.js index 98febccec..1fe57af36 100644 --- a/test/lang/fi.js +++ b/test/lang/fi.js @@ -20,7 +20,6 @@ exports["lang:fi"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'tammikuu tammi_helmikuu helmi_maaliskuu maalis_huhtikuu huhti_toukokuu touko_kesäkuu kesä_heinäkuu heinä_elokuu elo_syyskuu syys_lokakuu loka_marraskuu marras_joulukuu joulu'.split("_"), i; function equalTest(input, mmm, i) { test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1)); @@ -40,7 +39,6 @@ exports["lang:fi"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'sunnuntai, helmikuu 14. 2010, 3:25:50 pm'], ['ddd, hA', 'su, 3PM'], @@ -74,7 +72,6 @@ exports["lang:fi"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1st'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2nd'); test.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3rd'); @@ -113,7 +110,6 @@ exports["lang:fi"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'tammikuu tammi_helmikuu helmi_maaliskuu maalis_huhtikuu huhti_toukokuu touko_kesäkuu kesä_heinäkuu heinä_elokuu elo_syyskuu syys_lokakuu loka_marraskuu marras_joulukuu joulu'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -122,7 +118,6 @@ exports["lang:fi"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'sunnuntai su su_maanantai ma ma_tiistai ti ti_keskiviikko ke ke_torstai to to_perjantai pe pe_lauantai la la'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -131,7 +126,6 @@ exports["lang:fi"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "muutama sekunti", "44 seconds = few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "minuutti", "45 seconds = a minute"); @@ -151,15 +145,13 @@ exports["lang:fi"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 päivää", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "kuukausi", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "kuukausi", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "kuukausi", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "kuukausi", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "kaksi kuukautta", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "kaksi kuukautta", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "kolme kuukautta", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "kuukausi", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "viisi kuukautta", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 kuukautta", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "vuosi", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "vuosi", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "kaksi vuotta", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "vuosi", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "viisi vuotta", "5 years = 5 years"); @@ -167,27 +159,23 @@ exports["lang:fi"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "muutaman sekunnin päästä", "prefix"); test.equal(moment(0).from(30000), "muutama sekunti sitten", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "muutama sekunti sitten", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "muutaman sekunnin päästä", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "viiden päivän päästä", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -201,7 +189,6 @@ exports["lang:fi"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; @@ -217,7 +204,6 @@ exports["lang:fi"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -232,7 +218,6 @@ exports["lang:fi"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -252,7 +237,6 @@ exports["lang:fi"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -264,7 +248,6 @@ exports["lang:fi"] = { }, "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"); @@ -276,7 +259,6 @@ exports["lang:fi"] = { }, "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"); @@ -289,7 +271,6 @@ exports["lang:fi"] = { }, "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"); @@ -302,7 +283,6 @@ exports["lang:fi"] = { }, "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"); @@ -315,7 +295,6 @@ exports["lang:fi"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -328,7 +307,6 @@ exports["lang:fi"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -341,7 +319,6 @@ exports["lang:fi"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52.', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1.', "Jan 2 2012 should be week 1"); diff --git a/test/lang/fo.js b/test/lang/fo.js index db53caa64..36d0b323a 100644 --- a/test/lang/fo.js +++ b/test/lang/fo.js @@ -20,7 +20,6 @@ exports["lang:fo"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'januar jan_februar feb_mars mar_apríl apr_mai mai_juni jun_juli jul_august aug_september sep_oktober okt_november nov_desember des'.split("_"), i; function equalTest(input, mmm, i) { test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1)); @@ -40,7 +39,6 @@ exports["lang:fo"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd [tann] Do MMMM YYYY, h:mm:ss a', 'sunnudagur tann 14. februar 2010, 3:25:50 pm'], ['ddd hA', 'sun 3PM'], @@ -74,7 +72,6 @@ exports["lang:fo"] = { }, "format ordinal" : function (test) { - test.expect(31); 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.'); @@ -113,7 +110,6 @@ exports["lang:fo"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'januar jan_februar feb_mars mar_apríl apr_mai mai_juni jun_juli jul_august aug_september sep_oktober okt_november nov_desember des'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -122,7 +118,6 @@ exports["lang:fo"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'sunnudagur sun su_mánadagur mán má_týsdagur týs tý_mikudagur mik mi_hósdagur hós hó_fríggjadagur frí fr_leygardagur ley le'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -131,7 +126,6 @@ exports["lang:fo"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "fá sekund", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "ein minutt", "45 seconds = a minute"); @@ -151,15 +145,13 @@ exports["lang:fo"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dagar", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "ein mánaði", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "ein mánaði", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "ein mánaði", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "ein mánaði", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 mánaðir", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 mánaðir", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 mánaðir", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "ein mánaði", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 mánaðir", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 mánaðir", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "eitt ár", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "eitt ár", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 ár", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "eitt ár", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 ár", "5 years = 5 years"); @@ -167,20 +159,17 @@ exports["lang:fo"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "um fá sekund", "prefix"); test.equal(moment(0).from(30000), "fá sekund síðani", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "fá sekund síðani", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "um fá sekund", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "um 5 dagar", "in 5 days"); test.done(); @@ -190,7 +179,6 @@ exports["lang:fo"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -202,7 +190,6 @@ exports["lang:fo"] = { }, "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"); @@ -214,7 +201,6 @@ exports["lang:fo"] = { }, "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"); @@ -227,7 +213,6 @@ exports["lang:fo"] = { }, "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"); @@ -240,7 +225,6 @@ exports["lang:fo"] = { }, "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"); @@ -253,7 +237,6 @@ exports["lang:fo"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -266,7 +249,6 @@ exports["lang:fo"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -279,7 +261,6 @@ exports["lang:fo"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52.', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1.', "Jan 2 2012 should be week 1"); diff --git a/test/lang/fr-ca.js b/test/lang/fr-ca.js index dd3545edf..f7b4fa780 100644 --- a/test/lang/fr-ca.js +++ b/test/lang/fr-ca.js @@ -19,7 +19,6 @@ exports["lang:fr-ca"] = { }, "parse" : function (test) { - test.expect(96); var i, tests = 'janvier janv._février févr._mars mars_avril avr._mai mai_juin juin_juillet juil._août août_septembre sept._octobre oct._novembre nov._décembre déc.'.split("_"); @@ -44,7 +43,6 @@ exports["lang:fr-ca"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'dimanche, février 14 2010, 3:25:50 pm'], @@ -81,7 +79,6 @@ exports["lang:fr-ca"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1er', '1er'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2'); @@ -122,7 +119,6 @@ exports["lang:fr-ca"] = { }, "format month" : function (test) { - test.expect(12); var i, expected = 'janvier janv._février févr._mars mars_avril avr._mai mai_juin juin_juillet juil._août août_septembre sept._octobre oct._novembre nov._décembre déc.'.split("_"); @@ -135,7 +131,6 @@ exports["lang:fr-ca"] = { }, "format week" : function (test) { - test.expect(7); var i, expected = 'dimanche dim. Di_lundi lun. Lu_mardi mar. Ma_mercredi mer. Me_jeudi jeu. Je_vendredi ven. Ve_samedi sam. Sa'.split("_"); @@ -148,7 +143,6 @@ exports["lang:fr-ca"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); @@ -170,15 +164,13 @@ exports["lang:fr-ca"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 jours", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "un mois", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "un mois", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "un mois", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "un mois", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 mois", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 mois", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 mois", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "un mois", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 mois", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 mois", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "un an", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "un an", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 ans", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "un an", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 ans", "5 years = 5 years"); @@ -187,7 +179,6 @@ exports["lang:fr-ca"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "dans quelques secondes", "prefix"); test.equal(moment(0).from(30000), "il y a quelques secondes", "suffix"); @@ -196,7 +187,6 @@ exports["lang:fr-ca"] = { }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "dans quelques secondes", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "dans 5 jours", "in 5 days"); @@ -205,7 +195,6 @@ exports["lang:fr-ca"] = { }, "same day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -219,7 +208,6 @@ exports["lang:fr-ca"] = { }, "same next week" : function (test) { - test.expect(15); var i, m; @@ -235,7 +223,6 @@ exports["lang:fr-ca"] = { }, "same last week" : function (test) { - test.expect(15); var i, m; @@ -251,7 +238,6 @@ exports["lang:fr-ca"] = { }, "same all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -272,7 +258,6 @@ exports["lang:fr-ca"] = { // 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([2012, 0, 1]).week(), 1, "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).week(), 1, "Jan 7 2012 should be week 1"); @@ -284,7 +269,6 @@ exports["lang:fr-ca"] = { }, "weeks year starting monday" : function (test) { - test.expect(6); test.equal(moment([2006, 11, 31]).week(), 1, "Dec 31 2006 should be week 1"); test.equal(moment([2007, 0, 1]).week(), 1, "Jan 1 2007 should be week 1"); @@ -297,7 +281,6 @@ exports["lang:fr-ca"] = { }, "weeks year starting tuesday" : function (test) { - test.expect(6); test.equal(moment([2007, 11, 29]).week(), 52, "Dec 29 2007 should be week 52"); test.equal(moment([2008, 0, 1]).week(), 1, "Jan 1 2008 should be week 1"); @@ -310,7 +293,6 @@ exports["lang:fr-ca"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(6); test.equal(moment([2002, 11, 29]).week(), 1, "Dec 29 2002 should be week 1"); test.equal(moment([2003, 0, 1]).week(), 1, "Jan 1 2003 should be week 1"); @@ -323,7 +305,6 @@ exports["lang:fr-ca"] = { }, "weeks year starting thursday" : function (test) { - test.expect(6); test.equal(moment([2008, 11, 28]).week(), 1, "Dec 28 2008 should be week 1"); test.equal(moment([2009, 0, 1]).week(), 1, "Jan 1 2009 should be week 1"); @@ -336,7 +317,6 @@ exports["lang:fr-ca"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 27]).week(), 1, "Dec 27 2009 should be week 1"); test.equal(moment([2010, 0, 1]).week(), 1, "Jan 1 2010 should be week 1"); @@ -349,7 +329,6 @@ exports["lang:fr-ca"] = { }, "weeks year starting saturday" : function (test) { - test.expect(5); test.equal(moment([2010, 11, 26]).week(), 1, "Dec 26 2010 should be week 1"); test.equal(moment([2011, 0, 1]).week(), 1, "Jan 1 2011 should be week 1"); @@ -361,7 +340,6 @@ exports["lang:fr-ca"] = { }, "weeks year starting sunday format" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '1 01 1er', "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).format('w ww wo'), '1 01 1er', "Jan 7 2012 should be week 1"); diff --git a/test/lang/fr.js b/test/lang/fr.js index 80b7dea24..754d0bc63 100644 --- a/test/lang/fr.js +++ b/test/lang/fr.js @@ -20,7 +20,6 @@ exports["lang:fr"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'janvier janv._février févr._mars mars_avril avr._mai mai_juin juin_juillet juil._août août_septembre sept._octobre oct._novembre nov._décembre déc.'.split("_"), i; @@ -42,7 +41,6 @@ exports["lang:fr"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'dimanche, février 14 2010, 3:25:50 pm'], @@ -77,7 +75,6 @@ exports["lang:fr"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1er', '1er'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2'); @@ -117,7 +114,6 @@ exports["lang:fr"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'janvier janv._février févr._mars mars_avril avr._mai mai_juin juin_juillet juil._août août_septembre sept._octobre oct._novembre nov._décembre déc.'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -127,7 +123,6 @@ exports["lang:fr"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'dimanche dim. Di_lundi lun. Lu_mardi mar. Ma_mercredi mer. Me_jeudi jeu. Je_vendredi ven. Ve_samedi sam. Sa'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -137,7 +132,6 @@ exports["lang:fr"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "quelques secondes", "44 seconds = a few seconds"); @@ -158,15 +152,13 @@ exports["lang:fr"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 jours", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "un mois", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "un mois", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "un mois", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "un mois", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 mois", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 mois", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 mois", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "un mois", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 mois", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 mois", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "un an", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "un an", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 ans", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "un an", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 ans", "5 years = 5 years"); @@ -174,7 +166,6 @@ exports["lang:fr"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "dans quelques secondes", "prefix"); test.equal(moment(0).from(30000), "il y a quelques secondes", "suffix"); @@ -182,7 +173,6 @@ exports["lang:fr"] = { }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "dans quelques secondes", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "dans 5 jours", "in 5 days"); @@ -190,7 +180,6 @@ exports["lang:fr"] = { }, "same day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -204,7 +193,6 @@ exports["lang:fr"] = { }, "same next week" : function (test) { - test.expect(15); var i, m; @@ -220,7 +208,6 @@ exports["lang:fr"] = { }, "same last week" : function (test) { - test.expect(15); var i, m; @@ -236,7 +223,6 @@ exports["lang:fr"] = { }, "same all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -255,7 +241,6 @@ exports["lang:fr"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -267,7 +252,6 @@ exports["lang:fr"] = { }, "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"); @@ -279,7 +263,6 @@ exports["lang:fr"] = { }, "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"); @@ -292,7 +275,6 @@ exports["lang:fr"] = { }, "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"); @@ -305,7 +287,6 @@ exports["lang:fr"] = { }, "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"); @@ -318,7 +299,6 @@ exports["lang:fr"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -331,7 +311,6 @@ exports["lang:fr"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -344,7 +323,6 @@ exports["lang:fr"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1er', "Jan 2 2012 should be week 1"); diff --git a/test/lang/gl.js b/test/lang/gl.js index 54c20616e..1df38913f 100644 --- a/test/lang/gl.js +++ b/test/lang/gl.js @@ -20,7 +20,6 @@ exports["lang:gl"] = { }, "parse" : function (test) { - test.expect(96); var tests = "Xaneiro Xan._Febreiro Feb._Marzo Mar._Abril Abr._Maio Mai._Xuño Xuñ._Xullo Xul._Agosto Ago._Setembro Set._Outubro Out._Novembro Nov._Decembro Dec.".split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:gl"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1º', '1º'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2º', '2º'); @@ -81,7 +79,6 @@ exports["lang:gl"] = { }, "format month" : function (test) { - test.expect(12); var expected = "Xaneiro Xan._Febreiro Feb._Marzo Mar._Abril Abr._Maio Mai._Xuño Xuñ._Xullo Xul._Agosto Ago._Setembro Set._Outubro Out._Novembro Nov._Decembro Dec.".split("_"), i; for (i = 0; i < expected.length; i++) { @@ -91,7 +88,6 @@ exports["lang:gl"] = { }, "format week" : function (test) { - test.expect(7); var expected = "Domingo Dom. Do_Luns Lun. Lu_Martes Mar. Ma_Mércores Mér. Mé_Xoves Xov. Xo_Venres Ven. Ve_Sábado Sáb. Sá".split("_"), i; @@ -102,7 +98,6 @@ exports["lang:gl"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); @@ -124,15 +119,13 @@ exports["lang:gl"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 días", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "un mes", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "un mes", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "un mes", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "un mes", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 meses", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 meses", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 meses", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "un mes", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 meses", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 meses", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "un ano", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "un ano", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 anos", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "un ano", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 anos", "5 years = 5 years"); @@ -140,7 +133,6 @@ exports["lang:gl"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "nuns segundos", "prefix"); test.equal(moment(0).from(30000), "hai uns segundos", "suffix"); @@ -148,20 +140,17 @@ exports["lang:gl"] = { }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "hai uns segundos", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "nuns segundos", "en unos segundos"); test.equal(moment().add({d: 5}).fromNow(), "en 5 días", "en 5 días"); test.done(); }, "calendar day" : function (test) { - test.expect(7); var a = moment().hours(2).minutes(0).seconds(0); @@ -176,7 +165,6 @@ exports["lang:gl"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; @@ -192,7 +180,6 @@ exports["lang:gl"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -207,7 +194,6 @@ exports["lang:gl"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -224,7 +210,6 @@ exports["lang:gl"] = { }, "regression tests" : function (test) { - test.expect(1); var lastWeek = moment().subtract({ d: 4 }).hours(1); test.equal(lastWeek.calendar(), lastWeek.format('[o] dddd [pasado a] LT'), "1 o'clock bug"); @@ -236,7 +221,6 @@ exports["lang:gl"] = { // 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"); @@ -248,7 +232,6 @@ exports["lang:gl"] = { }, "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"); @@ -260,7 +243,6 @@ exports["lang:gl"] = { }, "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"); @@ -273,7 +255,6 @@ exports["lang:gl"] = { }, "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"); @@ -286,7 +267,6 @@ exports["lang:gl"] = { }, "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"); @@ -299,7 +279,6 @@ exports["lang:gl"] = { }, "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"); @@ -312,7 +291,6 @@ exports["lang:gl"] = { }, "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"); @@ -325,7 +303,6 @@ exports["lang:gl"] = { }, "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"); diff --git a/test/lang/he.js b/test/lang/he.js index 6c04f08e5..16e1ac6b1 100644 --- a/test/lang/he.js +++ b/test/lang/he.js @@ -20,7 +20,6 @@ exports["lang:he"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'ינואר ינו׳_פברואר פבר׳_מרץ מרץ_אפריל אפר׳_מאי מאי_יוני יוני_יולי יולי_אוגוסט אוג׳_ספטמבר ספט׳_אוקטובר אוק׳_נובמבר נוב׳_דצמבר דצמ׳'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:he"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'ראשון, פברואר 14 2010, 3:25:50 pm'], @@ -76,7 +74,6 @@ exports["lang:he"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'ינואר ינו׳_פברואר פבר׳_מרץ מרץ_אפריל אפר׳_מאי מאי_יוני יוני_יולי יולי_אוגוסט אוג׳_ספטמבר ספט׳_אוקטובר אוק׳_נובמבר נוב׳_דצמבר דצמ׳'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -85,7 +82,6 @@ exports["lang:he"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'ראשון א׳ א|שני ב׳ ב|שלישי ג׳ ג|רביעי ד׳ ד|חמישי ה׳ ה|שישי ו׳ ו|שבת ש׳ ש'.split("|"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -94,7 +90,6 @@ exports["lang:he"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "מספר שניות", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "דקה", "45 seconds = a minute"); @@ -114,15 +109,13 @@ exports["lang:he"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 ימים", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "חודש", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "חודש", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "חודש", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "חודש", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "חודשיים", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "חודשיים", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 חודשים", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "חודש", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 חודשים", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 חודשים", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "שנה", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "שנה", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "שנתיים", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "שנה", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 שנים", "5 years = 5 years"); @@ -130,27 +123,23 @@ exports["lang:he"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "בעוד מספר שניות", "prefix"); test.equal(moment(0).from(30000), "לפני מספר שניות", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "לפני מספר שניות", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "בעוד מספר שניות", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "בעוד 5 ימים", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -164,7 +153,6 @@ exports["lang:he"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -179,7 +167,6 @@ exports["lang:he"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -194,7 +181,6 @@ exports["lang:he"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -215,7 +201,6 @@ exports["lang:he"] = { // 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([2012, 0, 1]).week(), 1, "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).week(), 1, "Jan 7 2012 should be week 1"); @@ -227,7 +212,6 @@ exports["lang:he"] = { }, "weeks year starting monday" : function (test) { - test.expect(6); test.equal(moment([2006, 11, 31]).week(), 1, "Dec 31 2006 should be week 1"); test.equal(moment([2007, 0, 1]).week(), 1, "Jan 1 2007 should be week 1"); @@ -240,7 +224,6 @@ exports["lang:he"] = { }, "weeks year starting tuesday" : function (test) { - test.expect(6); test.equal(moment([2007, 11, 29]).week(), 52, "Dec 29 2007 should be week 52"); test.equal(moment([2008, 0, 1]).week(), 1, "Jan 1 2008 should be week 1"); @@ -253,7 +236,6 @@ exports["lang:he"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(6); test.equal(moment([2002, 11, 29]).week(), 1, "Dec 29 2002 should be week 1"); test.equal(moment([2003, 0, 1]).week(), 1, "Jan 1 2003 should be week 1"); @@ -266,7 +248,6 @@ exports["lang:he"] = { }, "weeks year starting thursday" : function (test) { - test.expect(6); test.equal(moment([2008, 11, 28]).week(), 1, "Dec 28 2008 should be week 1"); test.equal(moment([2009, 0, 1]).week(), 1, "Jan 1 2009 should be week 1"); @@ -279,7 +260,6 @@ exports["lang:he"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 27]).week(), 1, "Dec 27 2009 should be week 1"); test.equal(moment([2010, 0, 1]).week(), 1, "Jan 1 2010 should be week 1"); @@ -292,7 +272,6 @@ exports["lang:he"] = { }, "weeks year starting saturday" : function (test) { - test.expect(5); test.equal(moment([2010, 11, 26]).week(), 1, "Dec 26 2010 should be week 1"); test.equal(moment([2011, 0, 1]).week(), 1, "Jan 1 2011 should be week 1"); @@ -304,7 +283,6 @@ exports["lang:he"] = { }, "weeks year starting sunday format" : function (test) { - test.expect(5); 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, 7]).format('w ww wo'), '1 01 1', "Jan 7 2012 should be week 1"); diff --git a/test/lang/hi.js b/test/lang/hi.js index 90c179779..f075a4385 100644 --- a/test/lang/hi.js +++ b/test/lang/hi.js @@ -20,7 +20,6 @@ exports["lang:hi"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'जनवरी जन._फ़रवरी फ़र._मार्च मार्च_अप्रैल अप्रै._मई मई_जून जून_जुलाई जुल._अगस्त अग._सितम्बर सित._अक्टूबर अक्टू._नवम्बर नव._दिसम्बर दिस.'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:hi"] = { }, "format" : function (test) { - test.expect(21); var a = [ ['dddd, Do MMMM YYYY, a h:mm:ss बजे', 'रविवार, १४ फ़रवरी २०१०, दोपहर ३:२५:५० बजे'], @@ -75,7 +73,6 @@ exports["lang:hi"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '१', '१'); test.equal(moment([2011, 0, 2]).format('DDDo'), '२', '२'); @@ -115,7 +112,6 @@ exports["lang:hi"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'जनवरी जन._फ़रवरी फ़र._मार्च मार्च_अप्रैल अप्रै._मई मई_जून जून_जुलाई जुल._अगस्त अग._सितम्बर सित._अक्टूबर अक्टू._नवम्बर नव._दिसम्बर दिस.'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -125,7 +121,6 @@ exports["lang:hi"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'रविवार रवि र_सोमवार सोम सो_मंगलवार मंगल मं_बुधवार बुध बु_गुरूवार गुरू गु_शुक्रवार शुक्र शु_शनिवार शनि श'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -135,7 +130,6 @@ exports["lang:hi"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "कुछ ही क्षण", "44 seconds = a few seconds"); @@ -156,15 +150,13 @@ exports["lang:hi"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "२५ दिन", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "एक महीने", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "एक महीने", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "एक महीने", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "एक महीने", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "२ महीने", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "२ महीने", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "३ महीने", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "एक महीने", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "५ महीने", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "११ महीने", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "एक वर्ष", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "एक वर्ष", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "२ वर्ष", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "एक वर्ष", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "५ वर्ष", "5 years = 5 years"); @@ -172,27 +164,23 @@ exports["lang:hi"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "कुछ ही क्षण में", "prefix"); test.equal(moment(0).from(30000), "कुछ ही क्षण पहले", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "कुछ ही क्षण पहले", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "कुछ ही क्षण में", "कुछ ही क्षण में"); test.equal(moment().add({d: 5}).fromNow(), "५ दिन में", "५ दिन में"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -206,7 +194,6 @@ exports["lang:hi"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -221,7 +208,6 @@ exports["lang:hi"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -237,7 +223,6 @@ exports["lang:hi"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -254,7 +239,6 @@ exports["lang:hi"] = { }, "meridiem" : function (test) { - test.expect(12); test.equal(moment([2011, 2, 23, 2, 30]).format('a'), "रात", "before dawn"); test.equal(moment([2011, 2, 23, 9, 30]).format('a'), "सुबह", "morning"); @@ -277,7 +261,6 @@ exports["lang:hi"] = { // 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([2012, 0, 1]).week(), 1, "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).week(), 1, "Jan 7 2012 should be week 1"); @@ -289,7 +272,6 @@ exports["lang:hi"] = { }, "weeks year starting monday" : function (test) { - test.expect(6); test.equal(moment([2006, 11, 31]).week(), 1, "Dec 31 2006 should be week 1"); test.equal(moment([2007, 0, 1]).week(), 1, "Jan 1 2007 should be week 1"); @@ -302,7 +284,6 @@ exports["lang:hi"] = { }, "weeks year starting tuesday" : function (test) { - test.expect(6); test.equal(moment([2007, 11, 29]).week(), 52, "Dec 29 2007 should be week 52"); test.equal(moment([2008, 0, 1]).week(), 1, "Jan 1 2008 should be week 1"); @@ -315,7 +296,6 @@ exports["lang:hi"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(6); test.equal(moment([2002, 11, 29]).week(), 1, "Dec 29 2002 should be week 1"); test.equal(moment([2003, 0, 1]).week(), 1, "Jan 1 2003 should be week 1"); @@ -328,7 +308,6 @@ exports["lang:hi"] = { }, "weeks year starting thursday" : function (test) { - test.expect(6); test.equal(moment([2008, 11, 28]).week(), 1, "Dec 28 2008 should be week 1"); test.equal(moment([2009, 0, 1]).week(), 1, "Jan 1 2009 should be week 1"); @@ -341,7 +320,6 @@ exports["lang:hi"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 27]).week(), 1, "Dec 27 2009 should be week 1"); test.equal(moment([2010, 0, 1]).week(), 1, "Jan 1 2010 should be week 1"); @@ -354,7 +332,6 @@ exports["lang:hi"] = { }, "weeks year starting saturday" : function (test) { - test.expect(5); test.equal(moment([2010, 11, 26]).week(), 1, "Dec 26 2010 should be week 1"); test.equal(moment([2011, 0, 1]).week(), 1, "Jan 1 2011 should be week 1"); @@ -366,8 +343,6 @@ exports["lang:hi"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '१ ०१ १', "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).format('w ww wo'), '१ ०१ १', "Jan 7 2012 should be week 1"); diff --git a/test/lang/hr.js b/test/lang/hr.js index 0f0ea3e58..e004912e5 100644 --- a/test/lang/hr.js +++ b/test/lang/hr.js @@ -20,7 +20,6 @@ exports["lang:hr"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'sječanj sje._veljača vel._ožujak ožu._travanj tra._svibanj svi._lipanj lip._srpanj srp._kolovoz kol._rujan ruj._listopad lis._studeni stu._prosinac pro.'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:hr"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, Do MMMM YYYY, h:mm:ss a', 'nedjelja, 14. veljača 2010, 3:25:50 pm'], ['ddd, hA', 'ned., 3PM'], @@ -75,7 +73,6 @@ exports["lang:hr"] = { }, "format ordinal" : function (test) { - test.expect(31); 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.'); @@ -114,7 +111,6 @@ exports["lang:hr"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'sječanj sje._veljača vel._ožujak ožu._travanj tra._svibanj svi._lipanj lip._srpanj srp._kolovoz kol._rujan ruj._listopad lis._studeni stu._prosinac pro.'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -123,7 +119,6 @@ exports["lang:hr"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'nedjelja ned. ne_ponedjeljak pon. po_utorak uto. ut_srijeda sri. sr_četvrtak čet. če_petak pet. pe_subota sub. su'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -132,7 +127,6 @@ exports["lang:hr"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "par sekundi", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "jedna minuta", "45 seconds = a minute"); @@ -152,15 +146,13 @@ exports["lang:hr"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dana", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "mjesec", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "mjesec", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "mjesec", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "mjesec", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 mjeseca", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 mjeseca", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 mjeseca", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "mjesec", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 mjeseci", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 mjeseci", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "godinu", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "godinu", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 godine", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "godinu", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 godina", "5 years = 5 years"); @@ -168,27 +160,23 @@ exports["lang:hr"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "za par sekundi", "prefix"); test.equal(moment(0).from(30000), "prije par sekundi", "prefix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "prije par sekundi", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "za par sekundi", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "za 5 dana", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -202,7 +190,6 @@ exports["lang:hr"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; @@ -234,7 +221,6 @@ exports["lang:hr"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -265,7 +251,6 @@ exports["lang:hr"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -286,7 +271,6 @@ exports["lang:hr"] = { // 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"); @@ -298,7 +282,6 @@ exports["lang:hr"] = { }, "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"); @@ -310,7 +293,6 @@ exports["lang:hr"] = { }, "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"); @@ -323,7 +305,6 @@ exports["lang:hr"] = { }, "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"); @@ -336,7 +317,6 @@ exports["lang:hr"] = { }, "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"); @@ -349,7 +329,6 @@ exports["lang:hr"] = { }, "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"); @@ -362,7 +341,6 @@ exports["lang:hr"] = { }, "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"); @@ -375,7 +353,6 @@ exports["lang:hr"] = { }, "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"); diff --git a/test/lang/hu.js b/test/lang/hu.js index 42211a4d5..ce6b0f85c 100644 --- a/test/lang/hu.js +++ b/test/lang/hu.js @@ -19,7 +19,6 @@ exports["lang:hu"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'január jan_február feb_március márc_április ápr_május máj_június jún_július júl_augusztus aug_szeptember szept_október okt_november nov_december dec'.split("_"), i; @@ -41,7 +40,6 @@ exports["lang:hu"] = { }, "format" : function (test) { - test.expect(20); var a = [ ['dddd, MMMM Do YYYY, HH:mm:ss', 'vasárnap, február 14. 2010, 15:25:50'], @@ -74,7 +72,6 @@ exports["lang:hu"] = { }, "meridiem" : function (test) { - test.expect(8); test.equal(moment([2011, 2, 23, 0, 0]).format('a'), "de", "am"); test.equal(moment([2011, 2, 23, 11, 59]).format('a'), "de", "am"); @@ -90,7 +87,6 @@ exports["lang:hu"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.'); @@ -130,7 +126,6 @@ exports["lang:hu"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'január jan_február feb_március márc_április ápr_május máj_június jún_július júl_augusztus aug_szeptember szept_október okt_november nov_december dec'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -140,7 +135,6 @@ exports["lang:hu"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'vasárnap vas_hétfő hét_kedd kedd_szerda sze_csütörtök csüt_péntek pén_szombat szo'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -150,7 +144,6 @@ exports["lang:hu"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "néhány másodperc", "44 másodperc = néhány másodperc"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "egy perc", "45 másodperc = egy perc"); @@ -170,15 +163,13 @@ exports["lang:hu"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 nap", "25 nap = 25 nap"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "egy hónap", "26 nap = egy hónap"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "egy hónap", "30 nap = egy hónap"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "egy hónap", "45 nap = egy hónap"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "egy hónap", "45 nap = egy hónap"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 hónap", "46 nap = 2 hónap"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 hónap", "75 nap = 2 hónap"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 hónap", "76 nap = 3 hónap"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "egy hónap", "1 hónap = egy hónap"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 hónap", "5 hónap = 5 hónap"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 hónap", "344 nap = 11 hónap"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "egy év", "345 nap = egy év"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "egy év", "547 nap = egy év"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 év", "548 nap = 2 év"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "egy év", "1 év = egy év"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 év", "5 év = 5 év"); @@ -186,27 +177,23 @@ exports["lang:hu"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "néhány másodperc múlva", "prefix"); test.equal(moment(0).from(30000), "néhány másodperce", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "néhány másodperce", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "néhány másodperc múlva", "néhány másodperc múlva"); test.equal(moment().add({d: 5}).fromNow(), "5 nap múlva", "5 nap múlva"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -220,7 +207,6 @@ exports["lang:hu"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m, days = 'vasárnap_hétfőn_kedden_szerdán_csütörtökön_pénteken_szombaton'.split('_'); for (i = 2; i < 7; i++) { @@ -236,7 +222,6 @@ exports["lang:hu"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m, days = 'vasárnap_hétfőn_kedden_szerdán_csütörtökön_pénteken_szombaton'.split('_'); @@ -253,7 +238,6 @@ exports["lang:hu"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -273,7 +257,6 @@ exports["lang:hu"] = { // 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"); @@ -285,7 +268,6 @@ exports["lang:hu"] = { }, "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"); @@ -297,7 +279,6 @@ exports["lang:hu"] = { }, "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"); @@ -310,7 +291,6 @@ exports["lang:hu"] = { }, "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"); @@ -323,7 +303,6 @@ exports["lang:hu"] = { }, "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"); @@ -336,7 +315,6 @@ exports["lang:hu"] = { }, "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"); @@ -349,7 +327,6 @@ exports["lang:hu"] = { }, "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"); @@ -362,7 +339,6 @@ exports["lang:hu"] = { }, "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"); diff --git a/test/lang/hy-am.js b/test/lang/hy-am.js index 3871bcfe8..2921503cd 100644 --- a/test/lang/hy-am.js +++ b/test/lang/hy-am.js @@ -20,7 +20,6 @@ exports["lang:hy-am"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'հունվար հնվ_փետրվար փտր_մարտ մրտ_ապրիլ ապր_մայիս մյս_հունիս հնս_հուլիս հլս_օգոստոս օգս_սեպտեմբեր սպտ_հոկտեմբեր հկտ_նոյեմբեր նմբ_դեկտեմբեր դկտ'.split("_"), i; function equalTest(input, mmm, i) { @@ -46,7 +45,6 @@ exports["lang:hy-am"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, Do MMMM YYYY, HH:mm:ss', 'կիրակի, 14 փետրվարի 2010, 15:25:50'], @@ -81,7 +79,6 @@ exports["lang:hy-am"] = { }, "format meridiem" : function (test) { - test.expect(8); test.equal(moment([2012, 11, 28, 0, 0]).format("A"), "գիշերվա", "night"); test.equal(moment([2012, 11, 28, 3, 59]).format("A"), "գիշերվա", "night"); @@ -96,7 +93,6 @@ exports["lang:hy-am"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1-ին', '1-ին'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2-րդ', '2-րդ'); @@ -136,7 +132,6 @@ exports["lang:hy-am"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'հունվար հնվ_փետրվար փտր_մարտ մրտ_ապրիլ ապր_մայիս մյս_հունիս հնս_հուլիս հլս_օգոստոս օգս_սեպտեմբեր սպտ_հոկտեմբեր հկտ_նոյեմբեր նմբ_դեկտեմբեր դկտ'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -146,7 +141,6 @@ exports["lang:hy-am"] = { }, "format month case" : function (test) { - test.expect(24); var months = { 'nominative': 'հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր'.split('_'), @@ -160,7 +154,6 @@ exports["lang:hy-am"] = { }, "format month short case" : function (test) { - test.expect(24); var monthsShort = { 'nominative': 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_'), @@ -174,7 +167,6 @@ exports["lang:hy-am"] = { }, "format month case with escaped symbols" : function (test) { - test.expect(48); var months = { 'nominative': 'հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր'.split('_'), @@ -190,7 +182,6 @@ exports["lang:hy-am"] = { }, "format month short case with escaped symbols" : function (test) { - test.expect(48); var monthsShort = { 'nominative': 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_'), @@ -206,7 +197,6 @@ exports["lang:hy-am"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'կիրակի կրկ կրկ_երկուշաբթի երկ երկ_երեքշաբթի երք երք_չորեքշաբթի չրք չրք_հինգշաբթի հնգ հնգ_ուրբաթ ուրբ ուրբ_շաբաթ շբթ շբթ'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -216,7 +206,6 @@ exports["lang:hy-am"] = { }, "from" : function (test) { - test.expect(32); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "մի քանի վայրկյան", "44 seconds = seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "րոպե", "45 seconds = a minute"); @@ -238,15 +227,13 @@ exports["lang:hy-am"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 օր", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "ամիս", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "ամիս", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "ամիս", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "ամիս", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 ամիս", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 ամիս", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 ամիս", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "ամիս", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 ամիս", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 ամիս", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "տարի", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "տարի", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 տարի", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "տարի", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 տարի", "5 years = 5 years"); @@ -254,21 +241,18 @@ exports["lang:hy-am"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "մի քանի վայրկյան հետո", "prefix"); test.equal(moment(0).from(30000), "մի քանի վայրկյան առաջ", "suffix"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "մի քանի վայրկյան հետո", "in seconds"); test.equal(moment().add({d: 5}).fromNow(), "5 օր հետո", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -282,7 +266,6 @@ exports["lang:hy-am"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; function makeFormat(d) { @@ -301,7 +284,6 @@ exports["lang:hy-am"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -321,7 +303,6 @@ exports["lang:hy-am"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -342,7 +323,6 @@ exports["lang:hy-am"] = { // 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"); @@ -354,7 +334,6 @@ exports["lang:hy-am"] = { }, "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"); @@ -366,7 +345,6 @@ exports["lang:hy-am"] = { }, "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"); @@ -379,7 +357,6 @@ exports["lang:hy-am"] = { }, "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"); @@ -392,7 +369,6 @@ exports["lang:hy-am"] = { }, "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"); @@ -405,7 +381,6 @@ exports["lang:hy-am"] = { }, "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"); @@ -418,7 +393,6 @@ exports["lang:hy-am"] = { }, "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"); @@ -431,7 +405,6 @@ exports["lang:hy-am"] = { }, "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"); diff --git a/test/lang/id.js b/test/lang/id.js index 4ed3d9b9c..b1c8d329c 100644 --- a/test/lang/id.js +++ b/test/lang/id.js @@ -20,7 +20,6 @@ exports["lang:id"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'Januari Jan_Februari Feb_Maret Mar_April Apr_Mei Mei_Juni Jun_Juli Jul_Agustus Ags_September Sep_Oktober Okt_November Nov_Desember Des'.split("_"), i; function equalTest(input, mmm, i) { test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1)); @@ -40,7 +39,6 @@ exports["lang:id"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'Minggu, Februari 14 2010, 3:25:50 sore'], ['ddd, hA', 'Min, 3sore'], @@ -74,7 +72,6 @@ exports["lang:id"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'Januari Jan_Februari Feb_Maret Mar_April Apr_Mei Mei_Juni Jun_Juli Jul_Agustus Ags_September Sep_Oktober Okt_November Nov_Desember Des'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -83,7 +80,6 @@ exports["lang:id"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'Minggu Min Mg_Senin Sen Sn_Selasa Sel Sl_Rabu Rab Rb_Kamis Kam Km_Jumat Jum Jm_Sabtu Sab Sb'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -92,7 +88,6 @@ exports["lang:id"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "beberapa detik", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "semenit", "45 seconds = a minute"); @@ -112,15 +107,13 @@ exports["lang:id"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 hari", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "sebulan", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "sebulan", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "sebulan", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "sebulan", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 bulan", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 bulan", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 bulan", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "sebulan", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 bulan", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 bulan", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "setahun", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "setahun", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 tahun", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "setahun", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 tahun", "5 years = 5 years"); @@ -128,27 +121,23 @@ exports["lang:id"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "dalam beberapa detik", "prefix"); test.equal(moment(0).from(30000), "beberapa detik yang lalu", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "beberapa detik yang lalu", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "dalam beberapa detik", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "dalam 5 hari", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -162,7 +151,6 @@ exports["lang:id"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -177,7 +165,6 @@ exports["lang:id"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -192,7 +179,6 @@ exports["lang:id"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -212,7 +198,6 @@ exports["lang:id"] = { // 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"); @@ -224,7 +209,6 @@ exports["lang:id"] = { }, "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"); @@ -236,7 +220,6 @@ exports["lang:id"] = { }, "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"); @@ -249,7 +232,6 @@ exports["lang:id"] = { }, "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"); @@ -262,7 +244,6 @@ exports["lang:id"] = { }, "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"); @@ -275,7 +256,6 @@ exports["lang:id"] = { }, "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"); @@ -288,7 +268,6 @@ exports["lang:id"] = { }, "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"); @@ -301,7 +280,6 @@ exports["lang:id"] = { }, "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"); diff --git a/test/lang/is.js b/test/lang/is.js index 57adf39db..a2f6854fe 100644 --- a/test/lang/is.js +++ b/test/lang/is.js @@ -20,7 +20,6 @@ exports["lang:is"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'janúar jan_febrúar feb_mars mar_apríl apr_maí maí_júní jún_júlí júl_ágúst ágú_september sep_október okt_nóvember nóv_desember des'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:is"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, Do MMMM YYYY, h:mm:ss a', 'sunnudagur, 14. febrúar 2010, 3:25:50 pm'], @@ -76,7 +74,6 @@ exports["lang:is"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.'); @@ -116,7 +113,6 @@ exports["lang:is"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'janúar jan_febrúar feb_mars mar_apríl apr_maí maí_júní jún_júlí júl_ágúst ágú_september sep_október okt_nóvember nóv_desember des'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -126,7 +122,6 @@ exports["lang:is"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'sunnudagur sun Su_mánudagur mán Má_þriðjudagur þri Þr_miðvikudagur mið Mi_fimmtudagur fim Fi_föstudagur fös Fö_laugardagur lau La'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -136,7 +131,6 @@ exports["lang:is"] = { }, "from" : function (test) { - test.expect(34); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "nokkrar sekúndur", "44 seconds = a few seconds"); @@ -160,15 +154,13 @@ exports["lang:is"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 21}), true), "21 dagur", "21 days = 21 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "mánuður", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "mánuður", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "mánuður", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "mánuður", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 mánuðir", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 mánuðir", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 mánuðir", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "mánuður", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 mánuðir", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 mánuðir", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "ár", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "ár", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 ár", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "ár", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 ár", "5 years = 5 years"); @@ -177,7 +169,6 @@ exports["lang:is"] = { }, "suffix" : function (test) { - test.expect(3); test.equal(moment(30000).from(0), "eftir nokkrar sekúndur", "prefix"); test.equal(moment(0).from(30000), "fyrir nokkrum sekúndum síðan", "suffix"); test.equal(moment().subtract({m: 1}).fromNow(), "fyrir mínútu síðan", "a minute ago"); @@ -185,13 +176,11 @@ exports["lang:is"] = { }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "fyrir nokkrum sekúndum síðan", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(3); test.equal(moment().add({s: 30}).fromNow(), "eftir nokkrar sekúndur", "in a few seconds"); test.equal(moment().add({m: 1}).fromNow(), "eftir mínútu", "in a minute"); test.equal(moment().add({d: 5}).fromNow(), "eftir 5 daga", "in 5 days"); @@ -199,7 +188,6 @@ exports["lang:is"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -213,7 +201,6 @@ exports["lang:is"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -228,7 +215,6 @@ exports["lang:is"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -244,7 +230,6 @@ exports["lang:is"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -265,7 +250,6 @@ exports["lang:is"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -277,7 +261,6 @@ exports["lang:is"] = { }, "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"); @@ -289,7 +272,6 @@ exports["lang:is"] = { }, "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"); @@ -302,7 +284,6 @@ exports["lang:is"] = { }, "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"); @@ -315,7 +296,6 @@ exports["lang:is"] = { }, "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"); @@ -328,7 +308,6 @@ exports["lang:is"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -341,7 +320,6 @@ exports["lang:is"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -354,7 +332,6 @@ exports["lang:is"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52.', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1.', "Jan 2 2012 should be week 1"); diff --git a/test/lang/it.js b/test/lang/it.js index b76e04a3e..471acfd22 100644 --- a/test/lang/it.js +++ b/test/lang/it.js @@ -20,7 +20,6 @@ exports["lang:it"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'gennaio gen_febbraio feb_marzo mar_aprile apr_maggio mag_giugno giu_luglio lug_agosto ago_settembre set_ottobre ott_novembre nov_dicembre dic'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:it"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'Domenica, febbraio 14º 2010, 3:25:50 pm'], @@ -76,7 +74,6 @@ exports["lang:it"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1º', '1º'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2º', '2º'); @@ -116,7 +113,6 @@ exports["lang:it"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'gennaio gen_febbraio feb_marzo mar_aprile apr_maggio mag_giugno giu_luglio lug_agosto ago_settembre set_ottobre ott_novembre nov_dicembre dic'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -126,7 +122,6 @@ exports["lang:it"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'Domenica Dom D_Lunedì Lun L_Martedì Mar Ma_Mercoledì Mer Me_Giovedì Gio G_Venerdì Ven V_Sabato Sab S'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -136,7 +131,6 @@ exports["lang:it"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "alcuni secondi", "44 seconds = seconds"); @@ -157,15 +151,13 @@ exports["lang:it"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 giorni", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "un mese", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "un mese", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "un mese", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "un mese", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 mesi", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 mesi", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 mesi", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "un mese", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 mesi", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 mesi", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "un anno", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "un anno", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 anni", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "un anno", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 anni", "5 years = 5 years"); @@ -173,7 +165,6 @@ exports["lang:it"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "in alcuni secondi", "prefix"); test.equal(moment(0).from(30000), "alcuni secondi fa", "suffix"); @@ -181,7 +172,6 @@ exports["lang:it"] = { }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "in alcuni secondi", "in seconds"); test.equal(moment().add({d: 5}).fromNow(), "tra 5 giorni", "in 5 days"); @@ -189,7 +179,6 @@ exports["lang:it"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -203,7 +192,6 @@ exports["lang:it"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -218,7 +206,6 @@ exports["lang:it"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -233,7 +220,6 @@ exports["lang:it"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -253,7 +239,6 @@ exports["lang:it"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -265,7 +250,6 @@ exports["lang:it"] = { }, "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"); @@ -277,7 +261,6 @@ exports["lang:it"] = { }, "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"); @@ -290,7 +273,6 @@ exports["lang:it"] = { }, "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"); @@ -303,7 +285,6 @@ exports["lang:it"] = { }, "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"); @@ -316,7 +297,6 @@ exports["lang:it"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -329,7 +309,6 @@ exports["lang:it"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -342,7 +321,6 @@ exports["lang:it"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52º', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1º', "Jan 2 2012 should be week 1"); diff --git a/test/lang/ja.js b/test/lang/ja.js index 849d63aac..49139b587 100644 --- a/test/lang/ja.js +++ b/test/lang/ja.js @@ -20,7 +20,6 @@ exports["lang:ja"] = { }, "parse" : function (test) { - test.expect(96); var tests = '1月 1月_2月 2月_3月 3月_4月 4月_5月 5月_6月 6月_7月 7月_8月 8月_9月 9月_10月 10月_11月 11月_12月 12月'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:ja"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, a h:mm:ss', '日曜日, 2月 14 2010, 午後 3:25:50'], @@ -76,7 +74,6 @@ exports["lang:ja"] = { }, "format month" : function (test) { - test.expect(12); var expected = '1月 1月_2月 2月_3月 3月_4月 4月_5月 5月_6月 6月_7月 7月_8月 8月_9月 9月_10月 10月_11月 11月_12月 12月'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -86,7 +83,6 @@ exports["lang:ja"] = { }, "format week" : function (test) { - test.expect(7); var expected = '日曜日 日 日_月曜日 月 月_火曜日 火 火_水曜日 水 水_木曜日 木 木_金曜日 金 金_土曜日 土 土'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -96,7 +92,6 @@ exports["lang:ja"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "数秒", "44 seconds = a few seconds"); @@ -117,15 +112,13 @@ exports["lang:ja"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25日", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "1ヶ月", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "1ヶ月", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "1ヶ月", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "1ヶ月", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2ヶ月", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2ヶ月", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3ヶ月", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "1ヶ月", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5ヶ月", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11ヶ月", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "1年", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "1年", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2年", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "1年", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5年", "5 years = 5 years"); @@ -133,27 +126,23 @@ exports["lang:ja"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "数秒後", "prefix"); test.equal(moment(0).from(30000), "数秒前", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "数秒前", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "数秒後", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "5日後", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -167,7 +156,6 @@ exports["lang:ja"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -182,7 +170,6 @@ exports["lang:ja"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -197,7 +184,6 @@ exports["lang:ja"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -217,7 +203,6 @@ exports["lang:ja"] = { // 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([2012, 0, 1]).week(), 1, "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).week(), 1, "Jan 7 2012 should be week 1"); @@ -229,7 +214,6 @@ exports["lang:ja"] = { }, "weeks year starting monday" : function (test) { - test.expect(6); test.equal(moment([2006, 11, 31]).week(), 1, "Dec 31 2006 should be week 1"); test.equal(moment([2007, 0, 1]).week(), 1, "Jan 1 2007 should be week 1"); @@ -242,7 +226,6 @@ exports["lang:ja"] = { }, "weeks year starting tuesday" : function (test) { - test.expect(6); test.equal(moment([2007, 11, 29]).week(), 52, "Dec 29 2007 should be week 52"); test.equal(moment([2008, 0, 1]).week(), 1, "Jan 1 2008 should be week 1"); @@ -255,7 +238,6 @@ exports["lang:ja"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(6); test.equal(moment([2002, 11, 29]).week(), 1, "Dec 29 2002 should be week 1"); test.equal(moment([2003, 0, 1]).week(), 1, "Jan 1 2003 should be week 1"); @@ -268,7 +250,6 @@ exports["lang:ja"] = { }, "weeks year starting thursday" : function (test) { - test.expect(6); test.equal(moment([2008, 11, 28]).week(), 1, "Dec 28 2008 should be week 1"); test.equal(moment([2009, 0, 1]).week(), 1, "Jan 1 2009 should be week 1"); @@ -281,7 +262,6 @@ exports["lang:ja"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 27]).week(), 1, "Dec 27 2009 should be week 1"); test.equal(moment([2010, 0, 1]).week(), 1, "Jan 1 2010 should be week 1"); @@ -294,7 +274,6 @@ exports["lang:ja"] = { }, "weeks year starting saturday" : function (test) { - test.expect(5); test.equal(moment([2010, 11, 26]).week(), 1, "Dec 26 2010 should be week 1"); test.equal(moment([2011, 0, 1]).week(), 1, "Jan 1 2011 should be week 1"); @@ -306,7 +285,6 @@ exports["lang:ja"] = { }, "weeks year starting sunday format" : function (test) { - test.expect(5); 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, 7]).format('w ww wo'), '1 01 1', "Jan 7 2012 should be week 1"); diff --git a/test/lang/ka.js b/test/lang/ka.js index d383004ae..5ba855381 100644 --- a/test/lang/ka.js +++ b/test/lang/ka.js @@ -19,7 +19,6 @@ exports["lang:ka"] = { }, "parse" : function (test) { - test.expect(96); var i, tests = 'იანვარი იან_თებერვალი თებ_მარტი მარ_აპრილი აპრ_მაისი მაი_ივნისი ივნ_ივლისი ივლ_აგვისტო აგვ_სექტემბერი სექ_ოქტომბერი ოქტ_ნოემბერი ნოე_დეკემბერი დეკ'.split("_"); @@ -44,7 +43,6 @@ exports["lang:ka"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'კვირა, თებერვალი მე-14 2010, 3:25:50 pm'], @@ -81,7 +79,6 @@ exports["lang:ka"] = { }, "format ordinal" : function (test) { - test.expect(35); test.equal(moment([2011, 0, 1]).format('DDDo'), '1-ლი', '1-ლი'); test.equal(moment([2011, 0, 2]).format('DDDo'), 'მე-2', 'მე-2'); @@ -125,7 +122,6 @@ exports["lang:ka"] = { }, "format month" : function (test) { - test.expect(12); var i, expected = 'იანვარი იან_თებერვალი თებ_მარტი მარ_აპრილი აპრ_მაისი მაი_ივნისი ივნ_ივლისი ივლ_აგვისტო აგვ_სექტემბერი სექ_ოქტომბერი ოქტ_ნოემბერი ნოე_დეკემბერი დეკ'.split("_"); @@ -137,7 +133,6 @@ exports["lang:ka"] = { }, "format week" : function (test) { - test.expect(7); var i, expected = 'კვირა კვი კვ_ორშაბათი ორშ ორ_სამშაბათი სამ სა_ოთხშაბათი ოთხ ოთ_ხუთშაბათი ხუთ ხუ_პარასკევი პარ პა_შაბათი შაბ შა'.split("_"); @@ -150,7 +145,6 @@ exports["lang:ka"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); @@ -172,15 +166,13 @@ exports["lang:ka"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 დღე", "25 დღე = 25 დღე"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "თვე", "26 დღე = თვე"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "თვე", "30 დღე = თვე"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "თვე", "45 დღე = თვე"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "თვე", "45 დღე = თვე"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 თვე", "46 დღე = 2 თვე"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 თვე", "75 დღე = 2 თვე"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 თვე", "76 დღე = 3 თვე"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "თვე", "1 თვე = თვე"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 თვე", "5 თვე = 5 თვე"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 თვე", "344 დღე = 11 თვე"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "წელი", "345 დღე = წელი"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "წელი", "547 დღე = წელი"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 წელი", "548 დღე = 2 წელი"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "წელი", "1 წელი = წელი"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 წელი", "5 წელი = 5 წელი"); @@ -189,7 +181,6 @@ exports["lang:ka"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "რამდენიმე წამში", "ში სუფიქსი"); test.equal(moment(0).from(30000), "რამდენიმე წამის წინ", "წინ სუფიქსი"); @@ -198,7 +189,6 @@ exports["lang:ka"] = { }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "რამდენიმე წამის წინ", "უნდა აჩვენოს როგორც წარსული"); @@ -206,7 +196,6 @@ exports["lang:ka"] = { }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "რამდენიმე წამში", "რამდენიმე წამში"); test.equal(moment().add({d: 5}).fromNow(), "5 დღეში", "5 დღეში"); @@ -215,7 +204,6 @@ exports["lang:ka"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -230,7 +218,6 @@ exports["lang:ka"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -245,7 +232,6 @@ exports["lang:ka"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -260,7 +246,6 @@ exports["lang:ka"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -278,7 +263,6 @@ exports["lang:ka"] = { }, "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2011, 11, 26]).week(), 1, "დეკ 26 2011 უნდა იყოს კვირა 1"); test.equal(moment([2012, 0, 1]).week(), 1, "იან 1 2012 უნდა იყოს კვირა 1"); @@ -290,7 +274,6 @@ exports["lang:ka"] = { }, "weeks year starting monday" : function (test) { - test.expect(5); test.equal(moment([2007, 0, 1]).week(), 1, "იან 1 2007 უნდა იყოს კვირა 1"); test.equal(moment([2007, 0, 7]).week(), 1, "იან 7 2007 უნდა იყოს კვირა 1"); @@ -302,7 +285,6 @@ exports["lang:ka"] = { }, "weeks year starting tuesday" : function (test) { - test.expect(6); test.equal(moment([2007, 11, 31]).week(), 1, "დეკ 31 2007 უნდა იყოს კვირა 1"); test.equal(moment([2008, 0, 1]).week(), 1, "იან 1 2008 უნდა იყოს კვირა 1"); @@ -315,7 +297,6 @@ exports["lang:ka"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(6); test.equal(moment([2002, 11, 30]).week(), 1, "დეკ 30 2002 უნდა იყოს კვირა 1"); test.equal(moment([2003, 0, 1]).week(), 1, "იან 1 2003 უნდა იყოს კვირა 1"); @@ -328,7 +309,6 @@ exports["lang:ka"] = { }, "weeks year starting thursday" : function (test) { - test.expect(6); test.equal(moment([2008, 11, 29]).week(), 1, "დეკ 29 2008 უნდა იყოს კვირა 1"); test.equal(moment([2009, 0, 1]).week(), 1, "იან 1 2009 უნდა იყოს კვირა 1"); @@ -341,7 +321,6 @@ exports["lang:ka"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 1, "დეკ 28 2009 უნდა იყოს კვირა 1"); test.equal(moment([2010, 0, 1]).week(), 1, "იან 1 2010 უნდა იყოს კვირა 1"); @@ -354,7 +333,6 @@ exports["lang:ka"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 1, "დეკ 27 2010 უნდა იყოს კვირა 1"); test.equal(moment([2011, 0, 1]).week(), 1, "იან 1 2011 უნდა იყოს კვირა 1"); @@ -367,7 +345,6 @@ exports["lang:ka"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1-ლი', "დეკ 26 2011 უნდა იყოს კვირა 1"); test.equal(moment([2012, 0, 1]).format('w ww wo'), '1 01 1-ლი', "იან 1 2012 უნდა იყოს კვირა 1"); diff --git a/test/lang/km.js b/test/lang/km.js index bfeec84e6..3b09774d2 100644 --- a/test/lang/km.js +++ b/test/lang/km.js @@ -17,7 +17,6 @@ exports["lang:km"] = { }, "parse": function (test) { - test.expect(96); var tests = 'មករា មករា_កុម្ភៈ កុម្ភៈ_មិនា មិនា_មេសា មេសា_ឧសភា ឧសភា_មិថុនា មិថុនា_កក្កដា កក្កដា_សីហា សីហា_កញ្ញា កញ្ញា_តុលា តុលា_វិច្ឆិកា វិច្ឆិកា_ធ្នូ ធ្នូ'.split("_"), i; @@ -39,7 +38,6 @@ exports["lang:km"] = { }, "format": function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'អាទិត្យ, កុម្ភៈ 14 2010, 3:25:50 pm'], ['ddd, hA', 'អាទិត្យ, 3PM'], @@ -73,7 +71,6 @@ exports["lang:km"] = { }, "format ordinal": function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1st'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2nd'); test.equal(moment([2011, 0, 3]).format('DDDo'), '3', '3rd'); @@ -95,7 +92,7 @@ exports["lang:km"] = { test.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18th'); test.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19th'); test.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20th'); - + test.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21st'); test.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22nd'); test.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23rd'); @@ -106,13 +103,12 @@ exports["lang:km"] = { test.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28th'); test.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29th'); test.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30th'); - + test.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31st'); test.done(); }, "format month": function (test) { - test.expect(12); var expected = 'មករា មករា_កុម្ភៈ កុម្ភៈ_មិនា មិនា_មេសា មេសា_ឧសភា ឧសភា_មិថុនា មិថុនា_កក្កដា កក្កដា_សីហា សីហា_កញ្ញា កញ្ញា_តុលា តុលា_វិច្ឆិកា វិច្ឆិកា_ធ្នូ ធ្នូ'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -122,7 +118,6 @@ exports["lang:km"] = { }, "format week": function (test) { - test.expect(7); var expected = 'អាទិត្យ អាទិត្យ អាទិត្យ_ច័ន្ទ ច័ន្ទ ច័ន្ទ_អង្គារ អង្គារ អង្គារ_ពុធ ពុធ ពុធ_ព្រហស្បតិ៍ ព្រហស្បតិ៍ ព្រហស្បតិ៍_សុក្រ សុក្រ សុក្រ_សៅរ៍ សៅរ៍ សៅរ៍'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -132,116 +127,50 @@ exports["lang:km"] = { }, "from": function (test) { - test.expect(30); var start = moment([2007, 1, 28]); - test.equal(start.from(moment([2007, 1, 28]).add({ - s: 44 - }), true), "ប៉ុន្មានវិនាទី", "44 seconds = ប៉ុន្មានវិនាទី"); - test.equal(start.from(moment([2007, 1, 28]).add({ - s: 45 - }), true), "មួយនាទី", "45 seconds = មួយនាទី"); - test.equal(start.from(moment([2007, 1, 28]).add({ - s: 89 - }), true), "មួយនាទី", "89 seconds = មួយនាទី"); - test.equal(start.from(moment([2007, 1, 28]).add({ - s: 90 - }), true), "2 នាទី", "90 seconds = 2 នាទី"); - test.equal(start.from(moment([2007, 1, 28]).add({ - m: 44 - }), true), "44 នាទី", "44 minutes = 44 នាទី"); - test.equal(start.from(moment([2007, 1, 28]).add({ - m: 45 - }), true), "មួយម៉ោង", "45 minutes = មួយម៉ោង"); - test.equal(start.from(moment([2007, 1, 28]).add({ - m: 89 - }), true), "មួយម៉ោង", "89 minutes = មួយម៉ោង"); - test.equal(start.from(moment([2007, 1, 28]).add({ - m: 90 - }), true), "2 ម៉ោង", "90 minutes = 2 ម៉ោង"); - test.equal(start.from(moment([2007, 1, 28]).add({ - h: 5 - }), true), "5 ម៉ោង", "5 hours = 5 ម៉ោង"); - test.equal(start.from(moment([2007, 1, 28]).add({ - h: 21 - }), true), "21 ម៉ោង", "21 hours = 21 ម៉ោង"); - test.equal(start.from(moment([2007, 1, 28]).add({ - h: 22 - }), true), "មួយថ្ងៃ", "22 hours = មួយថ្ងៃ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - h: 35 - }), true), "មួយថ្ងៃ", "35 hours = មួយថ្ងៃ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - h: 36 - }), true), "2 ថ្ងៃ", "36 hours = 2 ថ្ងៃ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - d: 1 - }), true), "មួយថ្ងៃ", "1 day = មួយថ្ងៃ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - d: 5 - }), true), "5 ថ្ងៃ", "5 days = 5 ថ្ងៃ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - d: 25 - }), true), "25 ថ្ងៃ", "25 days = 25 ថ្ងៃ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - d: 26 - }), true), "មួយខែ", "26 days = មួយខែ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - d: 30 - }), true), "មួយខែ", "30 days = មួយខែ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - d: 45 - }), true), "មួយខែ", "45 days = មួយខែ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - d: 46 - }), true), "2 ខែ", "46 days = 2 ខែ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - d: 74 - }), true), "2 ខែ", "75 days = 2 ខែ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - d: 76 - }), true), "3 ខែ", "76 days = 3 ខែ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - M: 1 - }), true), "មួយខែ", "1 month = មួយខែ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - M: 5 - }), true), "5 ខែ", "5 months = 5 ខែ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - d: 344 - }), true), "11 ខែ", "344 days = 11 ខែ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - d: 345 - }), true), "មួយឆ្នាំ", "345 days = មួយឆ្នាំ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - d: 547 - }), true), "មួយឆ្នាំ", "547 days = មួយឆ្នាំ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - d: 548 - }), true), "2 ឆ្នាំ", "548 days = 2 ឆ្នាំ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - y: 1 - }), true), "មួយឆ្នាំ", "1 year = មួយឆ្នាំ"); - test.equal(start.from(moment([2007, 1, 28]).add({ - y: 5 - }), true), "5 ឆ្នាំ", "5 years = 5 ឆ្នាំ"); + test.equal(start.from(moment([2007, 1, 28]).add({ s: 44 }), true), "ប៉ុន្មានវិនាទី", "44 seconds = ប៉ុន្មានវិនាទី"); + test.equal(start.from(moment([2007, 1, 28]).add({ s: 45 }), true), "មួយនាទី", "45 seconds = មួយនាទី"); + test.equal(start.from(moment([2007, 1, 28]).add({ s: 89 }), true), "មួយនាទី", "89 seconds = មួយនាទី"); + test.equal(start.from(moment([2007, 1, 28]).add({ s: 90 }), true), "2 នាទី", "90 seconds = 2 នាទី"); + test.equal(start.from(moment([2007, 1, 28]).add({ m: 44 }), true), "44 នាទី", "44 minutes = 44 នាទី"); + test.equal(start.from(moment([2007, 1, 28]).add({ m: 45 }), true), "មួយម៉ោង", "45 minutes = មួយម៉ោង"); + test.equal(start.from(moment([2007, 1, 28]).add({ m: 89 }), true), "មួយម៉ោង", "89 minutes = មួយម៉ោង"); + test.equal(start.from(moment([2007, 1, 28]).add({ m: 90 }), true), "2 ម៉ោង", "90 minutes = 2 ម៉ោង"); + test.equal(start.from(moment([2007, 1, 28]).add({ h: 5 }), true), "5 ម៉ោង", "5 hours = 5 ម៉ោង"); + test.equal(start.from(moment([2007, 1, 28]).add({ h: 21 }), true), "21 ម៉ោង", "21 hours = 21 ម៉ោង"); + test.equal(start.from(moment([2007, 1, 28]).add({ h: 22 }), true), "មួយថ្ងៃ", "22 hours = មួយថ្ងៃ"); + test.equal(start.from(moment([2007, 1, 28]).add({ h: 35 }), true), "មួយថ្ងៃ", "35 hours = មួយថ្ងៃ"); + test.equal(start.from(moment([2007, 1, 28]).add({ h: 36 }), true), "2 ថ្ងៃ", "36 hours = 2 ថ្ងៃ"); + test.equal(start.from(moment([2007, 1, 28]).add({ d: 1 }), true), "មួយថ្ងៃ", "1 day = មួយថ្ងៃ"); + test.equal(start.from(moment([2007, 1, 28]).add({ d: 5 }), true), "5 ថ្ងៃ", "5 days = 5 ថ្ងៃ"); + test.equal(start.from(moment([2007, 1, 28]).add({ d: 25 }), true), "25 ថ្ងៃ", "25 days = 25 ថ្ងៃ"); + test.equal(start.from(moment([2007, 1, 28]).add({ d: 26 }), true), "មួយខែ", "26 days = មួយខែ"); + test.equal(start.from(moment([2007, 1, 28]).add({ d: 30 }), true), "មួយខែ", "30 days = មួយខែ"); + test.equal(start.from(moment([2007, 1, 28]).add({ d: 43 }), true), "មួយខែ", "43 days = មួយខែ"); + test.equal(start.from(moment([2007, 1, 28]).add({ d: 46 }), true), "2 ខែ", "46 days = 2 ខែ"); + test.equal(start.from(moment([2007, 1, 28]).add({ d: 74 }), true), "2 ខែ", "75 days = 2 ខែ"); + test.equal(start.from(moment([2007, 1, 28]).add({ d: 76 }), true), "3 ខែ", "76 days = 3 ខែ"); + test.equal(start.from(moment([2007, 1, 28]).add({ M: 1 }), true), "មួយខែ", "1 month = មួយខែ"); + test.equal(start.from(moment([2007, 1, 28]).add({ M: 5 }), true), "5 ខែ", "5 months = 5 ខែ"); + test.equal(start.from(moment([2007, 1, 28]).add({ d: 345 }), true), "មួយឆ្នាំ", "345 days = មួយឆ្នាំ"); + test.equal(start.from(moment([2007, 1, 28]).add({ d: 548 }), true), "2 ឆ្នាំ", "548 days = 2 ឆ្នាំ"); + test.equal(start.from(moment([2007, 1, 28]).add({ y: 1 }), true), "មួយឆ្នាំ", "1 year = មួយឆ្នាំ"); + test.equal(start.from(moment([2007, 1, 28]).add({ y: 5 }), true), "5 ឆ្នាំ", "5 years = 5 ឆ្នាំ"); test.done(); }, "suffix": function (test) { - test.expect(2); test.equal(moment(30000).from(0), "ប៉ុន្មានវិនាទីទៀត", "prefix"); test.equal(moment(0).from(30000), "ប៉ុន្មានវិនាទីមុន", "suffix"); test.done(); }, "now from now": function (test) { - test.expect(1); test.equal(moment().fromNow(), "ប៉ុន្មានវិនាទីមុន", "now from now should display as in the past"); test.done(); }, "fromNow": function (test) { - test.expect(2); test.equal(moment().add({ s: 30 }).fromNow(), "ប៉ុន្មានវិនាទីទៀត", "in a few seconds"); @@ -252,7 +181,6 @@ exports["lang:km"] = { }, "calendar day": function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -276,7 +204,6 @@ exports["lang:km"] = { }, "calendar next week": function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -293,7 +220,6 @@ exports["lang:km"] = { }, "calendar last week": function (test) { - test.expect(15); var i, m; @@ -311,7 +237,6 @@ exports["lang:km"] = { }, "calendar all else": function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 @@ -340,7 +265,6 @@ exports["lang:km"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday": function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -352,7 +276,6 @@ exports["lang:km"] = { }, "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"); @@ -364,7 +287,6 @@ exports["lang:km"] = { }, "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"); @@ -377,7 +299,6 @@ exports["lang:km"] = { }, "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"); @@ -390,7 +311,6 @@ exports["lang:km"] = { }, "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"); @@ -403,7 +323,6 @@ exports["lang:km"] = { }, "weeks year starting friday": function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -416,7 +335,6 @@ exports["lang:km"] = { }, "weeks year starting saturday": function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -429,7 +347,6 @@ exports["lang:km"] = { }, "weeks year starting sunday formatted": function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1', "Jan 2 2012 should be week 1"); diff --git a/test/lang/ko.js b/test/lang/ko.js index 7bad59f69..f59613d45 100644 --- a/test/lang/ko.js +++ b/test/lang/ko.js @@ -20,7 +20,6 @@ exports["lang:kr"] = { }, "parse" : function (test) { - test.expect(96); var tests = '1월 1월_2월 2월_3월 3월_4월 4월_5월 5월_6월 6월_7월 7월_8월 8월_9월 9월_10월 10월_11월 11월_12월 12월'.split("_"), i; function equalTest(input, mmm, i) { @@ -63,7 +62,6 @@ exports["lang:kr"] = { expected : "16" }], i, l, it, actual; - test.expect(elements.length); for (i = 0, l = elements.length; i < l; ++i) { it = elements[i]; @@ -80,7 +78,6 @@ exports["lang:kr"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['YYYY년 MMMM Do dddd a h:mm:ss', '2010년 2월 14일 일요일 오후 3:25:50'], @@ -115,7 +112,6 @@ exports["lang:kr"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1일', '1일'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2일', '2일'); @@ -155,7 +151,6 @@ exports["lang:kr"] = { }, "format month" : function (test) { - test.expect(12); var expected = '1월 1월_2월 2월_3월 3월_4월 4월_5월 5월_6월 6월_7월 7월_8월 8월_9월 9월_10월 10월_11월 11월_12월 12월'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -165,7 +160,6 @@ exports["lang:kr"] = { }, "format week" : function (test) { - test.expect(7); var expected = '일요일 일 일_월요일 월 월_화요일 화 화_수요일 수 수_목요일 목 목_금요일 금 금_토요일 토 토'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -175,7 +169,6 @@ exports["lang:kr"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "몇초", "44초 = 몇초"); @@ -196,15 +189,13 @@ exports["lang:kr"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25일", "25일 = 25일"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "한달", "26일 = 한달"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "한달", "30일 = 한달"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "한달", "45일 = 한달"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "한달", "45일 = 한달"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2달", "46일 = 2달"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2달", "75일 = 2달"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3달", "76일 = 3달"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "한달", "1달 = 한달"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5달", "5달 = 5달"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11달", "344일 = 11달"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "일년", "345일 = 일년"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "일년", "547일 = 일년"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2년", "548일 = 2년"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "일년", "일년 = 일년"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5년", "5년 = 5년"); @@ -212,7 +203,6 @@ exports["lang:kr"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "몇초 후", "prefix"); test.equal(moment(0).from(30000), "몇초 전", "suffix"); @@ -221,7 +211,6 @@ exports["lang:kr"] = { }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "몇초 전", "now from now should display as in the past"); @@ -229,7 +218,6 @@ exports["lang:kr"] = { }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "몇초 후", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "5일 후", "in 5 days"); @@ -238,7 +226,6 @@ exports["lang:kr"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -253,7 +240,6 @@ exports["lang:kr"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -268,7 +254,6 @@ exports["lang:kr"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -283,7 +268,6 @@ exports["lang:kr"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -304,7 +288,6 @@ exports["lang:kr"] = { // 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([2012, 0, 1]).week(), 1, "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).week(), 1, "Jan 7 2012 should be week 1"); @@ -316,7 +299,6 @@ exports["lang:kr"] = { }, "weeks year starting monday" : function (test) { - test.expect(6); test.equal(moment([2006, 11, 31]).week(), 1, "Dec 31 2006 should be week 1"); test.equal(moment([2007, 0, 1]).week(), 1, "Jan 1 2007 should be week 1"); @@ -329,7 +311,6 @@ exports["lang:kr"] = { }, "weeks year starting tuesday" : function (test) { - test.expect(6); test.equal(moment([2007, 11, 29]).week(), 52, "Dec 29 2007 should be week 52"); test.equal(moment([2008, 0, 1]).week(), 1, "Jan 1 2008 should be week 1"); @@ -342,7 +323,6 @@ exports["lang:kr"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(6); test.equal(moment([2002, 11, 29]).week(), 1, "Dec 29 2002 should be week 1"); test.equal(moment([2003, 0, 1]).week(), 1, "Jan 1 2003 should be week 1"); @@ -355,7 +335,6 @@ exports["lang:kr"] = { }, "weeks year starting thursday" : function (test) { - test.expect(6); test.equal(moment([2008, 11, 28]).week(), 1, "Dec 28 2008 should be week 1"); test.equal(moment([2009, 0, 1]).week(), 1, "Jan 1 2009 should be week 1"); @@ -368,7 +347,6 @@ exports["lang:kr"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 27]).week(), 1, "Dec 27 2009 should be week 1"); test.equal(moment([2010, 0, 1]).week(), 1, "Jan 1 2010 should be week 1"); @@ -381,7 +359,6 @@ exports["lang:kr"] = { }, "weeks year starting saturday" : function (test) { - test.expect(5); test.equal(moment([2010, 11, 26]).week(), 1, "Dec 26 2010 should be week 1"); test.equal(moment([2011, 0, 1]).week(), 1, "Jan 1 2011 should be week 1"); @@ -393,7 +370,6 @@ exports["lang:kr"] = { }, "weeks year starting sunday format" : function (test) { - test.expect(5); 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, 7]).format('w ww wo'), '1 01 1일', "Jan 7 2012 should be week 1"); diff --git a/test/lang/lb.js b/test/lang/lb.js index 0e0f31d92..9d9c03a60 100644 --- a/test/lang/lb.js +++ b/test/lang/lb.js @@ -19,7 +19,6 @@ exports["lang:lb"] = { }, "parse": function (test) { - test.expect(96); var tests = 'Januar Jan._Februar Febr._Mäerz Mrz._Abrëll Abr._Mee Mee_Juni Jun._Juli Jul._August Aug._September Sept._Oktober Okt._November Nov._Dezember Dez.'.split("_"), i; @@ -42,7 +41,6 @@ exports["lang:lb"] = { }, "format": function (test) { - test.expect(22); var a = [ ['dddd, Do MMMM YYYY, HH:mm:ss', 'Sonndeg, 14. Februar 2010, 15:25:50'], @@ -77,7 +75,6 @@ exports["lang:lb"] = { }, "format month": function (test) { - test.expect(12); var expected = 'Januar Jan._Februar Febr._Mäerz Mrz._Abrëll Abr._Mee Mee_Juni Jun._Juli Jul._August Aug._September Sept._Oktober Okt._November Nov._Dezember Dez.'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -87,7 +84,6 @@ exports["lang:lb"] = { }, "format week": function (test) { - test.expect(7); var expected = 'Sonndeg So. So_Méindeg Mé. Mé_Dënschdeg Dë. Dë_Mëttwoch Më. Më_Donneschdeg Do. Do_Freideg Fr. Fr_Samschdeg Sa. Sa'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -97,7 +93,6 @@ exports["lang:lb"] = { }, "from": function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "e puer Sekonnen", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "eng Minutt", "45 seconds = a minute"); @@ -117,15 +112,13 @@ exports["lang:lb"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 Deeg", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "ee Mount", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "ee Mount", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "ee Mount", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "ee Mount", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 Méint", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 Méint", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 Méint", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "ee Mount", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 Méint", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 Méint", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "ee Joer", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "ee Joer", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 Joer", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "ee Joer", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 Joer", "5 years = 5 years"); @@ -133,14 +126,12 @@ exports["lang:lb"] = { }, "suffix": function (test) { - test.expect(2); test.equal(moment(30000).from(0), "an e puer Sekonnen", "prefix"); test.equal(moment(0).from(30000), "virun e puer Sekonnen", "suffix"); test.done(); }, "fromNow": function (test) { - test.expect(13); test.equal(moment().add({s: 30}).fromNow(), "an e puer Sekonnen", "in a few seconds"); test.equal(moment().add({d: 1}).fromNow(), "an engem Dag", "in one day"); test.equal(moment().add({d: 2}).fromNow(), "an 2 Deeg", "in 2 days"); @@ -158,7 +149,6 @@ exports["lang:lb"] = { }, "calendar last week": function (test) { - test.expect(15); var i, m, weekday, datestring; for (i = 2; i < 7; i++) { diff --git a/test/lang/lt.js b/test/lang/lt.js index 7bf5b028b..210940771 100644 --- a/test/lang/lt.js +++ b/test/lang/lt.js @@ -20,7 +20,6 @@ exports["lang:lt"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'sausio sau_vasario vas_kovo kov_balandžio bal_gegužės geg_birželio bir_liepos lie_rugpjūčio rgp_rugsėjo rgs_spalio spa_lapkričio lap_gruodžio grd'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:lt"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, Do MMMM YYYY, h:mm:ss a', 'sekmadienis, 14-oji vasario 2010, 3:25:50 pm'], @@ -76,7 +74,6 @@ exports["lang:lt"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1-oji', '1-oji'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2-oji', '2-oji'); @@ -116,7 +113,6 @@ exports["lang:lt"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'sausio sau_vasario vas_kovo kov_balandžio bal_gegužės geg_birželio bir_liepos lie_rugpjūčio rgp_rugsėjo rgs_spalio spa_lapkričio lap_gruodžio grd'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -126,7 +122,6 @@ exports["lang:lt"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'sekmadienis Sek S_pirmadienis Pir P_antradienis Ant A_trečiadienis Tre T_ketvirtadienis Ket K_penktadienis Pen Pn_šeštadienis Šeš Š'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -147,7 +142,6 @@ exports["lang:lt"] = { }, "from" : function (test) { - test.expect(37); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "kelios sekundės", "44 seconds = seconds"); @@ -174,16 +168,14 @@ exports["lang:lt"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dienos", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "mėnuo", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "mėnuo", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "mėnuo", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "mėnuo", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 mėnesiai", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 mėnesiai", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 mėnesiai", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "mėnuo", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 mėnesiai", "5 months = 5 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 10}), true), "10 mėnesių", "10 months = 10 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 mėnesių", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "metai", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "metai", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 metai", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "metai", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 metai", "5 years = 5 years"); @@ -191,27 +183,23 @@ exports["lang:lt"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "po kelių sekundžių", "prefix"); test.equal(moment(0).from(30000), "prieš kelias sekundes", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "prieš kelias sekundes", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "po kelių sekundžių", "in seconds"); test.equal(moment().add({d: 5}).fromNow(), "po 5 dienų", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -225,7 +213,6 @@ exports["lang:lt"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -240,7 +227,6 @@ exports["lang:lt"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -255,7 +241,6 @@ exports["lang:lt"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -274,7 +259,6 @@ exports["lang:lt"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -286,7 +270,6 @@ exports["lang:lt"] = { }, "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"); @@ -298,7 +281,6 @@ exports["lang:lt"] = { }, "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"); @@ -311,7 +293,6 @@ exports["lang:lt"] = { }, "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"); @@ -324,7 +305,6 @@ exports["lang:lt"] = { }, "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"); @@ -337,7 +317,6 @@ exports["lang:lt"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -350,7 +329,6 @@ exports["lang:lt"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -363,7 +341,6 @@ exports["lang:lt"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52-oji', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1-oji', "Jan 2 2012 should be week 1"); diff --git a/test/lang/lv.js b/test/lang/lv.js index 2f82c8fde..7cd812f9d 100644 --- a/test/lang/lv.js +++ b/test/lang/lv.js @@ -20,7 +20,6 @@ exports["lang:lv"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'janvāris jan_februāris feb_marts mar_aprīlis apr_maijs mai_jūnijs jūn_jūlijs jūl_augusts aug_septembris sep_oktobris okt_novembris nov_decembris dec'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:lv"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, Do MMMM YYYY, h:mm:ss a', 'svētdiena, 14. februāris 2010, 3:25:50 pm'], @@ -76,7 +74,6 @@ exports["lang:lv"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.'); @@ -116,7 +113,6 @@ exports["lang:lv"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'janvāris jan_februāris feb_marts mar_aprīlis apr_maijs mai_jūnijs jūn_jūlijs jūl_augusts aug_septembris sep_oktobris okt_novembris nov_decembris dec'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -126,7 +122,6 @@ exports["lang:lv"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'svētdiena Sv Sv_pirmdiena P P_otrdiena O O_trešdiena T T_ceturtdiena C C_piektdiena Pk Pk_sestdiena S S'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -136,7 +131,6 @@ exports["lang:lv"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "dažas sekundes", "44 seconds = seconds"); @@ -157,15 +151,13 @@ exports["lang:lv"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dienas", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "mēnesi", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "mēnesi", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "mēnesi", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "mēnesi", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 mēneši", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 mēneši", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 mēneši", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "mēnesi", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 mēneši", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 mēneši", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "gadu", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "gadu", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 gadi", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "gadu", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 gadi", "5 years = 5 years"); @@ -173,27 +165,23 @@ exports["lang:lv"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "dažas sekundes vēlāk", "prefix"); test.equal(moment(0).from(30000), "dažas sekundes agrāk", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "dažas sekundes agrāk", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "dažas sekundes vēlāk", "in seconds"); test.equal(moment().add({d: 5}).fromNow(), "5 dienas vēlāk", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -207,7 +195,6 @@ exports["lang:lv"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -222,7 +209,6 @@ exports["lang:lv"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -237,7 +223,6 @@ exports["lang:lv"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -256,7 +241,6 @@ exports["lang:lv"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -268,7 +252,6 @@ exports["lang:lv"] = { }, "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"); @@ -280,7 +263,6 @@ exports["lang:lv"] = { }, "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"); @@ -293,7 +275,6 @@ exports["lang:lv"] = { }, "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"); @@ -306,7 +287,6 @@ exports["lang:lv"] = { }, "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"); @@ -319,7 +299,6 @@ exports["lang:lv"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -332,7 +311,6 @@ exports["lang:lv"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -345,7 +323,6 @@ exports["lang:lv"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52.', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1.', "Jan 2 2012 should be week 1"); diff --git a/test/lang/mk.js b/test/lang/mk.js index 9581756b7..07469886a 100644 --- a/test/lang/mk.js +++ b/test/lang/mk.js @@ -20,7 +20,6 @@ exports["lang:mk"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'јануари јан_февруари фев_март мар_април апр_мај мај_јуни јун_јули јул_август авг_септември сеп_октомври окт_ноември ное_декември дек'.split("_"), i; function equalTest(input, mmm, i) { test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1)); @@ -40,7 +39,6 @@ exports["lang:mk"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, H:mm:ss', 'недела, февруари 14-ти 2010, 15:25:50'], ['ddd, hA', 'нед, 3PM'], @@ -74,7 +72,6 @@ exports["lang:mk"] = { }, "format ordinal" : function (test) { - test.expect(31); 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-ти'); @@ -113,7 +110,6 @@ exports["lang:mk"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'јануари јан_февруари фев_март мар_април апр_мај мај_јуни јун_јули јул_август авг_септември сеп_октомври окт_ноември ное_декември дек'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -122,7 +118,6 @@ exports["lang:mk"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'недела нед нe_понеделник пон пo_вторник вто вт_среда сре ср_четврток чет че_петок пет пе_сабота саб сa'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -131,7 +126,6 @@ exports["lang:mk"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "неколку секунди", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "минута", "45 seconds = a minute"); @@ -151,15 +145,13 @@ exports["lang:mk"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 дена", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "месец", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "месец", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "месец", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "месец", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 месеци", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 месеци", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 месеци", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "месец", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 месеци", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 месеци", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "година", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "година", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 години", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "година", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 години", "5 years = 5 years"); @@ -167,27 +159,23 @@ exports["lang:mk"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "после неколку секунди", "prefix"); test.equal(moment(0).from(30000), "пред неколку секунди", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "пред неколку секунди", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "после неколку секунди", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "после 5 дена", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -201,7 +189,6 @@ exports["lang:mk"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -216,7 +203,6 @@ exports["lang:mk"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -246,7 +232,6 @@ exports["lang:mk"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -265,7 +250,6 @@ exports["lang:mk"] = { // 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"); @@ -277,7 +261,6 @@ exports["lang:mk"] = { }, "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"); @@ -289,7 +272,6 @@ exports["lang:mk"] = { }, "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"); @@ -302,7 +284,6 @@ exports["lang:mk"] = { }, "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"); @@ -315,7 +296,6 @@ exports["lang:mk"] = { }, "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"); @@ -328,7 +308,6 @@ exports["lang:mk"] = { }, "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"); @@ -341,7 +320,6 @@ exports["lang:mk"] = { }, "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"); @@ -354,7 +332,6 @@ exports["lang:mk"] = { }, "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"); diff --git a/test/lang/ml.js b/test/lang/ml.js index 19223f221..b3ce061c5 100644 --- a/test/lang/ml.js +++ b/test/lang/ml.js @@ -20,7 +20,6 @@ exports["lang:ml"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'ജനുവരി ജനു._ഫെബ്രുവരി ഫെബ്രു._മാർച്ച് മാർ._ഏപ്രിൽ ഏപ്രി._മേയ് മേയ്_ജൂൺ ജൂൺ_ജൂലൈ ജൂലൈ._ഓഗസ്റ്റ് ഓഗ._സെപ്റ്റംബർ സെപ്റ്റ._ഒക്ടോബർ ഒക്ടോ._നവംബർ നവം._ഡിസംബർ ഡിസം.'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:ml"] = { }, "format" : function (test) { - test.expect(21); var a = [ ['dddd, Do MMMM YYYY, a h:mm:ss -നു', 'ഞായറാഴ്ച, 14 ഫെബ്രുവരി 2010, ഉച്ച കഴിഞ്ഞ് 3:25:50 -നു'], @@ -75,7 +73,6 @@ exports["lang:ml"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2'); @@ -115,7 +112,6 @@ exports["lang:ml"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'ജനുവരി ജനു._ഫെബ്രുവരി ഫെബ്രു._മാർച്ച് മാർ._ഏപ്രിൽ ഏപ്രി._മേയ് മേയ്_ജൂൺ ജൂൺ_ജൂലൈ ജൂലൈ._ഓഗസ്റ്റ് ഓഗ._സെപ്റ്റംബർ സെപ്റ്റ._ഒക്ടോബർ ഒക്ടോ._നവംബർ നവം._ഡിസംബർ ഡിസം.'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -125,7 +121,6 @@ exports["lang:ml"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'ഞായറാഴ്ച ഞായർ ഞാ_തിങ്കളാഴ്ച തിങ്കൾ തി_ചൊവ്വാഴ്ച ചൊവ്വ ചൊ_ബുധനാഴ്ച ബുധൻ ബു_വ്യാഴാഴ്ച വ്യാഴം വ്യാ_വെള്ളിയാഴ്ച വെള്ളി വെ_ശനിയാഴ്ച ശനി ശ'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -135,7 +130,6 @@ exports["lang:ml"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "അൽപ നിമിഷങ്ങൾ", "44 seconds = a few seconds"); @@ -156,15 +150,13 @@ exports["lang:ml"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 ദിവസം", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "ഒരു മാസം", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "ഒരു മാസം", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "ഒരു മാസം", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "ഒരു മാസം", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 മാസം", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 മാസം", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 മാസം", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "ഒരു മാസം", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 മാസം", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 മാസം", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "ഒരു വർഷം", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "ഒരു വർഷം", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 വർഷം", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "ഒരു വർഷം", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 വർഷം", "5 years = 5 years"); @@ -172,27 +164,23 @@ exports["lang:ml"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "അൽപ നിമിഷങ്ങൾ കഴിഞ്ഞ്", "prefix"); test.equal(moment(0).from(30000), "അൽപ നിമിഷങ്ങൾ മുൻപ്", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "അൽപ നിമിഷങ്ങൾ മുൻപ്", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "അൽപ നിമിഷങ്ങൾ കഴിഞ്ഞ്", "അൽപ നിമിഷങ്ങൾ കഴിഞ്ഞ്"); test.equal(moment().add({d: 5}).fromNow(), "5 ദിവസം കഴിഞ്ഞ്", "5 ദിവസം കഴിഞ്ഞ്"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -206,7 +194,6 @@ exports["lang:ml"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -221,7 +208,6 @@ exports["lang:ml"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -237,7 +223,6 @@ exports["lang:ml"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -254,7 +239,6 @@ exports["lang:ml"] = { }, "meridiem" : function (test) { - test.expect(12); test.equal(moment([2011, 2, 23, 2, 30]).format('a'), "രാത്രി", "before dawn"); test.equal(moment([2011, 2, 23, 9, 30]).format('a'), "രാവിലെ", "morning"); @@ -277,7 +261,6 @@ exports["lang:ml"] = { // 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([2012, 0, 1]).week(), 1, "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).week(), 1, "Jan 7 2012 should be week 1"); @@ -289,7 +272,6 @@ exports["lang:ml"] = { }, "weeks year starting monday" : function (test) { - test.expect(6); test.equal(moment([2006, 11, 31]).week(), 1, "Dec 31 2006 should be week 1"); test.equal(moment([2007, 0, 1]).week(), 1, "Jan 1 2007 should be week 1"); @@ -302,7 +284,6 @@ exports["lang:ml"] = { }, "weeks year starting tuesday" : function (test) { - test.expect(6); test.equal(moment([2007, 11, 29]).week(), 52, "Dec 29 2007 should be week 52"); test.equal(moment([2008, 0, 1]).week(), 1, "Jan 1 2008 should be week 1"); @@ -315,7 +296,6 @@ exports["lang:ml"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(6); test.equal(moment([2002, 11, 29]).week(), 1, "Dec 29 2002 should be week 1"); test.equal(moment([2003, 0, 1]).week(), 1, "Jan 1 2003 should be week 1"); @@ -328,7 +308,6 @@ exports["lang:ml"] = { }, "weeks year starting thursday" : function (test) { - test.expect(6); test.equal(moment([2008, 11, 28]).week(), 1, "Dec 28 2008 should be week 1"); test.equal(moment([2009, 0, 1]).week(), 1, "Jan 1 2009 should be week 1"); @@ -341,7 +320,6 @@ exports["lang:ml"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 27]).week(), 1, "Dec 27 2009 should be week 1"); test.equal(moment([2010, 0, 1]).week(), 1, "Jan 1 2010 should be week 1"); @@ -354,7 +332,6 @@ exports["lang:ml"] = { }, "weeks year starting saturday" : function (test) { - test.expect(5); test.equal(moment([2010, 11, 26]).week(), 1, "Dec 26 2010 should be week 1"); test.equal(moment([2011, 0, 1]).week(), 1, "Jan 1 2011 should be week 1"); @@ -366,8 +343,6 @@ exports["lang:ml"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); - test.expect(5); 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, 7]).format('w ww wo'), '1 01 1', "Jan 7 2012 should be week 1"); diff --git a/test/lang/mr.js b/test/lang/mr.js index 4fe90a208..b2d5e538a 100644 --- a/test/lang/mr.js +++ b/test/lang/mr.js @@ -20,7 +20,6 @@ exports["lang:mr"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'जानेवारी जाने._फेब्रुवारी फेब्रु._मार्च मार्च._एप्रिल एप्रि._मे मे._जून जून._जुलै जुलै._ऑगस्ट ऑग._सप्टेंबर सप्टें._ऑक्टोबर ऑक्टो._नोव्हेंबर नोव्हें._डिसेंबर डिसें.'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:mr"] = { }, "format" : function (test) { - test.expect(21); var a = [ ['dddd, Do MMMM YYYY, a h:mm:ss वाजता', 'रविवार, १४ फेब्रुवारी २०१०, दुपारी ३:२५:५० वाजता'], @@ -75,7 +73,6 @@ exports["lang:mr"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '१', '१'); test.equal(moment([2011, 0, 2]).format('DDDo'), '२', '२'); @@ -115,7 +112,6 @@ exports["lang:mr"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'जानेवारी जाने._फेब्रुवारी फेब्रु._मार्च मार्च._एप्रिल एप्रि._मे मे._जून जून._जुलै जुलै._ऑगस्ट ऑग._सप्टेंबर सप्टें._ऑक्टोबर ऑक्टो._नोव्हेंबर नोव्हें._डिसेंबर डिसें.'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -125,7 +121,6 @@ exports["lang:mr"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'रविवार रवि र_सोमवार सोम सो_मंगळवार मंगळ मं_बुधवार बुध बु_गुरूवार गुरू गु_शुक्रवार शुक्र शु_शनिवार शनि श'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -135,7 +130,6 @@ exports["lang:mr"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "सेकंद", "44 seconds = a few seconds"); @@ -156,15 +150,13 @@ exports["lang:mr"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "२५ दिवस", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({ d: 26 }), true), "एक महिना", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({ d: 30 }), true), "एक महिना", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({ d: 45 }), true), "एक महिना", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({ d: 43 }), true), "एक महिना", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({ d: 46 }), true), "२ महिने", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({ d: 74 }), true), "२ महिने", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({ d: 76 }), true), "३ महिने", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({ M: 1 }), true), "एक महिना", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({ M: 5 }), true), "५ महिने", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({ d: 344 }), true), "११ महिने", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "एक वर्ष", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "एक वर्ष", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "२ वर्षे", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "एक वर्ष", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({ y: 5 }), true), "५ वर्षे", "5 years = 5 years"); @@ -172,27 +164,23 @@ exports["lang:mr"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "सेकंद नंतर", "prefix"); test.equal(moment(0).from(30000), "सेकंद पूर्वी", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "सेकंद पूर्वी", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({ s: 30 }).fromNow(), "सेकंद नंतर", "सेकंद नंतर"); test.equal(moment().add({ d: 5 }).fromNow(), "५ दिवस नंतर", "५ दिवस नंतर"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -206,7 +194,6 @@ exports["lang:mr"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -221,7 +208,6 @@ exports["lang:mr"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -237,7 +223,6 @@ exports["lang:mr"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -254,7 +239,6 @@ exports["lang:mr"] = { }, "meridiem" : function (test) { - test.expect(12); test.equal(moment([2011, 2, 23, 2, 30]).format('a'), "रात्री", "before dawn"); test.equal(moment([2011, 2, 23, 9, 30]).format('a'), "सकाळी", "morning"); @@ -277,7 +261,6 @@ exports["lang:mr"] = { // 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([2012, 0, 1]).week(), 1, "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).week(), 1, "Jan 7 2012 should be week 1"); @@ -289,7 +272,6 @@ exports["lang:mr"] = { }, "weeks year starting monday" : function (test) { - test.expect(6); test.equal(moment([2006, 11, 31]).week(), 1, "Dec 31 2006 should be week 1"); test.equal(moment([2007, 0, 1]).week(), 1, "Jan 1 2007 should be week 1"); @@ -302,7 +284,6 @@ exports["lang:mr"] = { }, "weeks year starting tuesday" : function (test) { - test.expect(6); test.equal(moment([2007, 11, 29]).week(), 52, "Dec 29 2007 should be week 52"); test.equal(moment([2008, 0, 1]).week(), 1, "Jan 1 2008 should be week 1"); @@ -315,7 +296,6 @@ exports["lang:mr"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(6); test.equal(moment([2002, 11, 29]).week(), 1, "Dec 29 2002 should be week 1"); test.equal(moment([2003, 0, 1]).week(), 1, "Jan 1 2003 should be week 1"); @@ -328,7 +308,6 @@ exports["lang:mr"] = { }, "weeks year starting thursday" : function (test) { - test.expect(6); test.equal(moment([2008, 11, 28]).week(), 1, "Dec 28 2008 should be week 1"); test.equal(moment([2009, 0, 1]).week(), 1, "Jan 1 2009 should be week 1"); @@ -341,7 +320,6 @@ exports["lang:mr"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 27]).week(), 1, "Dec 27 2009 should be week 1"); test.equal(moment([2010, 0, 1]).week(), 1, "Jan 1 2010 should be week 1"); @@ -354,7 +332,6 @@ exports["lang:mr"] = { }, "weeks year starting saturday" : function (test) { - test.expect(5); test.equal(moment([2010, 11, 26]).week(), 1, "Dec 26 2010 should be week 1"); test.equal(moment([2011, 0, 1]).week(), 1, "Jan 1 2011 should be week 1"); @@ -366,8 +343,6 @@ exports["lang:mr"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '१ ०१ १', "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).format('w ww wo'), '१ ०१ १', "Jan 7 2012 should be week 1"); diff --git a/test/lang/ms-my.js b/test/lang/ms-my.js index 1c673f30b..1224c98ff 100644 --- a/test/lang/ms-my.js +++ b/test/lang/ms-my.js @@ -20,7 +20,6 @@ exports["lang:ms-my"] = { }, "parse" : function (test) { - test.expect(96); var i, tests = 'Januari Jan_Februari Feb_Mac Mac_April Apr_Mei Mei_Jun Jun_Julai Jul_Ogos Ogs_September Sep_Oktober Okt_November Nov_Disember Dis'.split("_"); @@ -45,7 +44,6 @@ exports["lang:ms-my"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'Ahad, Februari 14 2010, 3:25:50 petang'], @@ -82,7 +80,6 @@ exports["lang:ms-my"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2'); @@ -122,7 +119,6 @@ exports["lang:ms-my"] = { }, "format month" : function (test) { - test.expect(12); var i, expected = 'Januari Jan_Februari Feb_Mac Mac_April Apr_Mei Mei_Jun Jun_Julai Jul_Ogos Ogs_September Sep_Oktober Okt_November Nov_Disember Dis'.split("_"); @@ -134,7 +130,6 @@ exports["lang:ms-my"] = { }, "format week" : function (test) { - test.expect(7); var i, expected = 'Ahad Ahd Ah_Isnin Isn Is_Selasa Sel Sl_Rabu Rab Rb_Khamis Kha Km_Jumaat Jum Jm_Sabtu Sab Sb'.split("_"); @@ -147,7 +142,6 @@ exports["lang:ms-my"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); @@ -169,15 +163,13 @@ exports["lang:ms-my"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 hari", "25 hari = 25 hari"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "sebulan", "26 hari = sebulan"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "sebulan", "30 hari = sebulan"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "sebulan", "45 hari = sebulan"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "sebulan", "45 hari = sebulan"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 bulan", "46 hari = 2 bulan"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 bulan", "75 hari = 2 bulan"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 bulan", "76 hari = 3 bulan"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "sebulan", "1 bulan = sebulan"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 bulan", "5 bulan = 5 bulan"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 bulan", "344 hari = 11 bulan"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "setahun", "345 hari = setahun"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "setahun", "547 hari = setahun"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 tahun", "548 hari = 2 tahun"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "setahun", "1 tahun = setahun"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 tahun", "5 tahun = 5 tahun"); @@ -186,7 +178,6 @@ exports["lang:ms-my"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "dalam beberapa saat", "prefix"); test.equal(moment(0).from(30000), "beberapa saat yang lepas", "suffix"); @@ -195,7 +186,6 @@ exports["lang:ms-my"] = { }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "beberapa saat yang lepas", "waktu sekarang dari sekarang sepatutnya menunjukkan sebagai telah lepas"); @@ -203,7 +193,6 @@ exports["lang:ms-my"] = { }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "dalam beberapa saat", "dalam beberapa saat"); test.equal(moment().add({d: 5}).fromNow(), "dalam 5 hari", "dalam 5 hari"); @@ -212,7 +201,6 @@ exports["lang:ms-my"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -227,7 +215,6 @@ exports["lang:ms-my"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -242,7 +229,6 @@ exports["lang:ms-my"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -257,7 +243,6 @@ exports["lang:ms-my"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -278,7 +263,6 @@ exports["lang:ms-my"] = { // 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([2012, 0, 1]).week(), 1, "Jan 1 2012 sepatutnya minggu 1"); test.equal(moment([2012, 0, 7]).week(), 2, "Jan 7 2012 sepatutnya minggu 2"); @@ -290,7 +274,6 @@ exports["lang:ms-my"] = { }, "weeks year starting monday" : function (test) { - test.expect(6); test.equal(moment([2006, 11, 31]).week(), 53, "Dec 31 2006 sepatutnya minggu 53"); test.equal(moment([2007, 0, 1]).week(), 1, "Jan 1 2007 sepatutnya minggu 1"); @@ -303,7 +286,6 @@ exports["lang:ms-my"] = { }, "weeks year starting tuesday" : function (test) { - test.expect(6); test.equal(moment([2007, 11, 30]).week(), 52, "Dec 30 2007 sepatutnya minggu 52"); test.equal(moment([2008, 0, 1]).week(), 1, "Jan 1 2008 sepatutnya minggu 1"); @@ -316,7 +298,6 @@ exports["lang:ms-my"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(6); test.equal(moment([2002, 11, 29]).week(), 52, "Dec 29 2002 sepatutnya minggu 52"); test.equal(moment([2003, 0, 1]).week(), 1, "Jan 1 2003 sepatutnya minggu 1"); @@ -329,7 +310,6 @@ exports["lang:ms-my"] = { }, "weeks year starting thursday" : function (test) { - test.expect(6); test.equal(moment([2008, 11, 28]).week(), 52, "Dec 28 2008 sepatutnya minggu 52"); test.equal(moment([2009, 0, 1]).week(), 1, "Jan 1 2009 sepatutnya minggu 1"); @@ -342,7 +322,6 @@ exports["lang:ms-my"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 27]).week(), 52, "Dec 27 2009 sepatutnya minggu 52"); test.equal(moment([2010, 0, 1]).week(), 1, "Jan 1 2010 sepatutnya minggu 1"); @@ -355,7 +334,6 @@ exports["lang:ms-my"] = { }, "weeks year starting saturday" : function (test) { - test.expect(5); test.equal(moment([2010, 11, 26]).week(), 52, "Dec 26 2010 sepatutnya minggu 52"); test.equal(moment([2011, 0, 1]).week(), 1, "Jan 1 2011 sepatutnya minggu 1"); @@ -367,7 +345,6 @@ exports["lang:ms-my"] = { }, "weeks year starting sunday format" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '1 01 1', "Jan 1 2012 sepatutnya minggu 1"); test.equal(moment([2012, 0, 7]).format('w ww wo'), '2 02 2', "Jan 7 2012 sepatutnya minggu 2"); diff --git a/test/lang/nb.js b/test/lang/nb.js index ff5b83e56..feb554c5e 100644 --- a/test/lang/nb.js +++ b/test/lang/nb.js @@ -20,7 +20,6 @@ exports["lang:nb"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'januar jan_februar feb_mars mars_april april_mai mai_juni juni_juli juli_august aug_september sep_oktober okt_november nov_desember des'.split("_"), i; @@ -42,7 +41,6 @@ exports["lang:nb"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'søndag, februar 14. 2010, 3:25:50 pm'], @@ -77,7 +75,6 @@ exports["lang:nb"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.'); @@ -117,7 +114,6 @@ exports["lang:nb"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'januar jan._februar feb._mars mars_april april_mai mai_juni juni_juli juli_august aug._september sep._oktober okt._november nov._desember des.'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -127,7 +123,6 @@ exports["lang:nb"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'søndag sø. sø_mandag ma. ma_tirsdag ti. ti_onsdag on. on_torsdag to. to_fredag fr. fr_lørdag lø. lø'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -137,7 +132,6 @@ exports["lang:nb"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "noen sekunder", "44 sekunder = a few seconds"); @@ -158,15 +152,13 @@ exports["lang:nb"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dager", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "en måned", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "en måned", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "en måned", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "en måned", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 måneder", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 måneder", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 måneder", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "en måned", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 måneder", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 måneder", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "ett år", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "ett år", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 år", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "ett år", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 år", "5 years = 5 years"); @@ -174,27 +166,23 @@ exports["lang:nb"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "om noen sekunder", "prefix"); test.equal(moment(0).from(30000), "for noen sekunder siden", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "for noen sekunder siden", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "om noen sekunder", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "om 5 dager", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -208,7 +196,6 @@ exports["lang:nb"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -223,7 +210,6 @@ exports["lang:nb"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -238,7 +224,6 @@ exports["lang:nb"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -257,7 +242,6 @@ exports["lang:nb"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -269,7 +253,6 @@ exports["lang:nb"] = { }, "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"); @@ -281,7 +264,6 @@ exports["lang:nb"] = { }, "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"); @@ -294,7 +276,6 @@ exports["lang:nb"] = { }, "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"); @@ -307,7 +288,6 @@ exports["lang:nb"] = { }, "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"); @@ -320,7 +300,6 @@ exports["lang:nb"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -333,7 +312,6 @@ exports["lang:nb"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -346,7 +324,6 @@ exports["lang:nb"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52.', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1.', "Jan 2 2012 should be week 1"); diff --git a/test/lang/ne.js b/test/lang/ne.js index 59dcc8ca7..e8b1d0aee 100644 --- a/test/lang/ne.js +++ b/test/lang/ne.js @@ -20,7 +20,6 @@ exports["lang:ne"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'जनवरी जन._फेब्रुवरी फेब्रु._मार्च मार्च_अप्रिल अप्रि._मई मई_जुन जुन_जुलाई जुलाई._अगष्ट अग._सेप्टेम्बर सेप्ट._अक्टोबर अक्टो._नोभेम्बर नोभे._डिसेम्बर डिसे.'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:ne"] = { }, "format" : function (test) { - test.expect(21); var a = [ ['dddd, Do MMMM YYYY, aको h:mm:ss बजे', 'आइतबार, १४ फेब्रुवरी २०१०, बेलुकाको ३:२५:५० बजे'], @@ -75,7 +73,6 @@ exports["lang:ne"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '१', '१'); test.equal(moment([2011, 0, 2]).format('DDDo'), '२', '२'); @@ -115,7 +112,6 @@ exports["lang:ne"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'जनवरी जन._फेब्रुवरी फेब्रु._मार्च मार्च_अप्रिल अप्रि._मई मई_जुन जुन_जुलाई जुलाई._अगष्ट अग._सेप्टेम्बर सेप्ट._अक्टोबर अक्टो._नोभेम्बर नोभे._डिसेम्बर डिसे.'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -125,7 +121,6 @@ exports["lang:ne"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'आइतबार आइत. आइ._सोमबार सोम. सो._मङ्गलबार मङ्गल. मङ्_बुधबार बुध. बु._बिहिबार बिहि. बि._शुक्रबार शुक्र. शु._शनिबार शनि. श.'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -135,7 +130,6 @@ exports["lang:ne"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "केही समय", "44 seconds = a few seconds"); @@ -156,15 +150,13 @@ exports["lang:ne"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "२५ दिन", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "एक महिना", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "एक महिना", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "एक महिना", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "एक महिना", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "२ महिना", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "२ महिना", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "३ महिना", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "एक महिना", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "५ महिना", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "११ महिना", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "एक बर्ष", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "एक बर्ष", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "२ बर्ष", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "एक बर्ष", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "५ बर्ष", "5 years = 5 years"); @@ -172,27 +164,23 @@ exports["lang:ne"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "केही समयमा", "prefix"); test.equal(moment(0).from(30000), "केही समय अगाडी", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "केही समय अगाडी", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "केही समयमा", "केही समयमा"); test.equal(moment().add({d: 5}).fromNow(), "५ दिनमा", "५ दिनमा"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -206,7 +194,6 @@ exports["lang:ne"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -221,7 +208,6 @@ exports["lang:ne"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -236,7 +222,6 @@ exports["lang:ne"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -253,7 +238,6 @@ exports["lang:ne"] = { }, "meridiem" : function (test) { - test.expect(12); test.equal(moment([2011, 2, 23, 2, 30]).format('a'), "राती", "before dawn"); test.equal(moment([2011, 2, 23, 9, 30]).format('a'), "बिहान", "morning"); @@ -276,7 +260,6 @@ exports["lang:ne"] = { // 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"); @@ -288,7 +271,6 @@ exports["lang:ne"] = { }, "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"); @@ -300,7 +282,6 @@ exports["lang:ne"] = { }, "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"); @@ -313,7 +294,6 @@ exports["lang:ne"] = { }, "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"); @@ -326,7 +306,6 @@ exports["lang:ne"] = { }, "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"); @@ -339,7 +318,6 @@ exports["lang:ne"] = { }, "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"); @@ -352,7 +330,6 @@ exports["lang:ne"] = { }, "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"); @@ -365,7 +342,6 @@ exports["lang:ne"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2011, 11, 26]).format('w ww wo'), '१ ०१ १', "Dec 26 2011 should be week 1"); test.equal(moment([2012, 0, 1]).format('w ww wo'), '१ ०१ १', "Jan 1 2012 should be week 1"); diff --git a/test/lang/nl.js b/test/lang/nl.js index f1e146d17..bd8ca55db 100644 --- a/test/lang/nl.js +++ b/test/lang/nl.js @@ -20,7 +20,6 @@ exports["lang:nl"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'januari jan._februari feb._maart mrt._april apr._mei mei._juni jun._juli jul._augustus aug._september sep._oktober okt._november nov._december dec.'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:nl"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, HH:mm:ss', 'zondag, februari 14de 2010, 15:25:50'], @@ -76,7 +74,6 @@ exports["lang:nl"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1ste', '1ste'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2de', '2de'); @@ -116,7 +113,6 @@ exports["lang:nl"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'januari jan._februari feb._maart mrt._april apr._mei mei_juni jun._juli jul._augustus aug._september sep._oktober okt._november nov._december dec.'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -126,7 +122,6 @@ exports["lang:nl"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'zondag zo. Zo_maandag ma. Ma_dinsdag di. Di_woensdag wo. Wo_donderdag do. Do_vrijdag vr. Vr_zaterdag za. Za'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -136,7 +131,6 @@ exports["lang:nl"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "een paar seconden", "44 seconds = a few seconds"); @@ -157,15 +151,13 @@ exports["lang:nl"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dagen", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "één maand", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "één maand", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "één maand", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "één maand", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 maanden", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 maanden", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 maanden", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "één maand", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 maanden", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 maanden", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "één jaar", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "één jaar", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 jaar", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "één jaar", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 jaar", "5 years = 5 years"); @@ -173,27 +165,23 @@ exports["lang:nl"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "over een paar seconden", "prefix"); test.equal(moment(0).from(30000), "een paar seconden geleden", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "een paar seconden geleden", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "over een paar seconden", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "over 5 dagen", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -207,7 +195,6 @@ exports["lang:nl"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -222,7 +209,6 @@ exports["lang:nl"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -237,7 +223,6 @@ exports["lang:nl"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -255,7 +240,6 @@ exports["lang:nl"] = { }, "month abbreviation" : function (test) { - test.expect(2); test.equal(moment([2012, 5, 23]).format('D-MMM-YYYY'), '23-jun-2012', 'format month abbreviation surrounded by dashes should not include a dot'); test.equal(moment([2012, 5, 23]).format('D MMM YYYY'), '23 jun. 2012', 'format month abbreviation not surrounded by dashes should include a dot'); @@ -267,7 +251,6 @@ exports["lang:nl"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -279,7 +262,6 @@ exports["lang:nl"] = { }, "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"); @@ -291,7 +273,6 @@ exports["lang:nl"] = { }, "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"); @@ -304,7 +285,6 @@ exports["lang:nl"] = { }, "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"); @@ -317,7 +297,6 @@ exports["lang:nl"] = { }, "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"); @@ -330,7 +309,6 @@ exports["lang:nl"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -343,7 +321,6 @@ exports["lang:nl"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -356,7 +333,6 @@ exports["lang:nl"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52ste', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1ste', "Jan 2 2012 should be week 1"); diff --git a/test/lang/nn.js b/test/lang/nn.js index 96a1745aa..a8cdd3456 100644 --- a/test/lang/nn.js +++ b/test/lang/nn.js @@ -20,7 +20,6 @@ exports["lang:nn"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'januar jan_februar feb_mars mar_april apr_mai mai_juni jun_juli jul_august aug_september sep_oktober okt_november nov_desember des'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:nn"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'sundag, februar 14. 2010, 3:25:50 pm'], @@ -76,7 +74,6 @@ exports["lang:nn"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.'); @@ -116,7 +113,6 @@ exports["lang:nn"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'januar jan_februar feb_mars mar_april apr_mai mai_juni jun_juli jul_august aug_september sep_oktober okt_november nov_desember des'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -126,7 +122,6 @@ exports["lang:nn"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'sundag sun su_måndag mån må_tysdag tys ty_onsdag ons on_torsdag tor to_fredag fre fr_laurdag lau lø'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -136,7 +131,6 @@ exports["lang:nn"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "nokre sekund", "44 sekunder = a few seconds"); @@ -157,15 +151,13 @@ exports["lang:nn"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dagar", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "ein månad", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "ein månad", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "ein månad", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "ein månad", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 månader", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 månader", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 månader", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "ein månad", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 månader", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 månader", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "eit år", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "eit år", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 år", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "eit år", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 år", "5 years = 5 years"); @@ -173,27 +165,23 @@ exports["lang:nn"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "om nokre sekund", "prefix"); test.equal(moment(0).from(30000), "for nokre sekund sidan", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "for nokre sekund sidan", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "om nokre sekund", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "om 5 dagar", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -207,7 +195,6 @@ exports["lang:nn"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -222,7 +209,6 @@ exports["lang:nn"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -237,7 +223,6 @@ exports["lang:nn"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -256,7 +241,6 @@ exports["lang:nn"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -268,7 +252,6 @@ exports["lang:nn"] = { }, "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"); @@ -280,7 +263,6 @@ exports["lang:nn"] = { }, "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"); @@ -293,7 +275,6 @@ exports["lang:nn"] = { }, "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"); @@ -306,7 +287,6 @@ exports["lang:nn"] = { }, "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"); @@ -319,7 +299,6 @@ exports["lang:nn"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -332,7 +311,6 @@ exports["lang:nn"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -345,7 +323,6 @@ exports["lang:nn"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52.', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1.', "Jan 2 2012 should be week 1"); diff --git a/test/lang/pl.js b/test/lang/pl.js index fe9caad1a..cc36c1a2f 100644 --- a/test/lang/pl.js +++ b/test/lang/pl.js @@ -20,7 +20,6 @@ exports["lang:pl"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'styczeń sty_luty lut_marzec mar_kwiecień kwi_maj maj_czerwiec cze_lipiec lip_sierpień sie_wrzesień wrz_październik paź_listopad lis_grudzień gru'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:pl"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'niedziela, luty 14. 2010, 3:25:50 pm'], @@ -76,7 +74,6 @@ exports["lang:pl"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.'); @@ -116,7 +113,6 @@ exports["lang:pl"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'styczeń sty_luty lut_marzec mar_kwiecień kwi_maj maj_czerwiec cze_lipiec lip_sierpień sie_wrzesień wrz_październik paź_listopad lis_grudzień gru'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -126,7 +122,6 @@ exports["lang:pl"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'niedziela nie N_poniedziałek pon Pn_wtorek wt Wt_środa śr Śr_czwartek czw Cz_piątek pt Pt_sobota sb So'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -136,7 +131,6 @@ exports["lang:pl"] = { }, "from" : function (test) { - test.expect(34); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "kilka sekund", "44 seconds = a few seconds"); @@ -157,15 +151,13 @@ exports["lang:pl"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dni", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "miesiąc", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "miesiąc", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "miesiąc", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "miesiąc", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 miesiące", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 miesiące", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 miesiące", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "miesiąc", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 miesięcy", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 miesięcy", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "rok", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "rok", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 lata", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "rok", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 lat", "5 years = 5 years"); @@ -177,20 +169,17 @@ exports["lang:pl"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "za kilka sekund", "prefix"); test.equal(moment(0).from(30000), "kilka sekund temu", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "kilka sekund temu", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(3); test.equal(moment().add({s: 30}).fromNow(), "za kilka sekund", "in a few seconds"); test.equal(moment().add({h: 1}).fromNow(), "za godzinę", "in an hour"); test.equal(moment().add({d: 5}).fromNow(), "za 5 dni", "in 5 days"); @@ -198,7 +187,6 @@ exports["lang:pl"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -212,7 +200,6 @@ exports["lang:pl"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -227,7 +214,6 @@ exports["lang:pl"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -258,7 +244,6 @@ exports["lang:pl"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -279,7 +264,6 @@ exports["lang:pl"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -291,7 +275,6 @@ exports["lang:pl"] = { }, "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"); @@ -303,7 +286,6 @@ exports["lang:pl"] = { }, "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"); @@ -316,7 +298,6 @@ exports["lang:pl"] = { }, "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"); @@ -329,7 +310,6 @@ exports["lang:pl"] = { }, "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"); @@ -342,7 +322,6 @@ exports["lang:pl"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -355,7 +334,6 @@ exports["lang:pl"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -368,7 +346,6 @@ exports["lang:pl"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52.', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1.', "Jan 2 2012 should be week 1"); diff --git a/test/lang/pt-br.js b/test/lang/pt-br.js index c75d90606..d672988bb 100644 --- a/test/lang/pt-br.js +++ b/test/lang/pt-br.js @@ -20,7 +20,6 @@ exports["lang:pt-br"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'janeiro jan_fevereiro fev_março mar_abril abr_maio mai_junho jun_julho jul_agosto ago_setembro set_outubro out_novembro nov_dezembro dez'.split("_"), i; @@ -44,7 +43,6 @@ exports["lang:pt-br"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'domingo, fevereiro 14º 2010, 3:25:50 pm'], @@ -79,7 +77,6 @@ exports["lang:pt-br"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1º', '1º'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2º', '2º'); @@ -119,7 +116,6 @@ exports["lang:pt-br"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'janeiro jan_fevereiro fev_março mar_abril abr_maio mai_junho jun_julho jul_agosto ago_setembro set_outubro out_novembro nov_dezembro dez'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -129,7 +125,6 @@ exports["lang:pt-br"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'domingo dom_segunda-feira seg_terça-feira ter_quarta-feira qua_quinta-feira qui_sexta-feira sex_sábado sáb'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -139,7 +134,6 @@ exports["lang:pt-br"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "segundos", "44 seconds = seconds"); @@ -160,15 +154,13 @@ exports["lang:pt-br"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dias", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "um mês", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "um mês", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "um mês", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "um mês", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 meses", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 meses", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 meses", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "um mês", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 meses", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 meses", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "um ano", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "um ano", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 anos", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "um ano", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 anos", "5 years = 5 years"); @@ -176,7 +168,6 @@ exports["lang:pt-br"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "em segundos", "prefix"); test.equal(moment(0).from(30000), "segundos atrás", "suffix"); @@ -184,7 +175,6 @@ exports["lang:pt-br"] = { }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "em segundos", "in seconds"); test.equal(moment().add({d: 5}).fromNow(), "em 5 dias", "in 5 days"); @@ -192,7 +182,6 @@ exports["lang:pt-br"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -207,7 +196,6 @@ exports["lang:pt-br"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -222,7 +210,6 @@ exports["lang:pt-br"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -237,7 +224,6 @@ exports["lang:pt-br"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -258,7 +244,6 @@ exports["lang:pt-br"] = { // 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([2012, 0, 1]).week(), 1, "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).week(), 1, "Jan 7 2012 should be week 1"); @@ -270,7 +255,6 @@ exports["lang:pt-br"] = { }, "weeks year starting monday" : function (test) { - test.expect(6); test.equal(moment([2006, 11, 31]).week(), 1, "Dec 31 2006 should be week 1"); test.equal(moment([2007, 0, 1]).week(), 1, "Jan 1 2007 should be week 1"); @@ -283,7 +267,6 @@ exports["lang:pt-br"] = { }, "weeks year starting tuesday" : function (test) { - test.expect(6); test.equal(moment([2007, 11, 29]).week(), 52, "Dec 29 2007 should be week 52"); test.equal(moment([2008, 0, 1]).week(), 1, "Jan 1 2008 should be week 1"); @@ -296,7 +279,6 @@ exports["lang:pt-br"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(6); test.equal(moment([2002, 11, 29]).week(), 1, "Dec 29 2002 should be week 1"); test.equal(moment([2003, 0, 1]).week(), 1, "Jan 1 2003 should be week 1"); @@ -309,7 +291,6 @@ exports["lang:pt-br"] = { }, "weeks year starting thursday" : function (test) { - test.expect(6); test.equal(moment([2008, 11, 28]).week(), 1, "Dec 28 2008 should be week 1"); test.equal(moment([2009, 0, 1]).week(), 1, "Jan 1 2009 should be week 1"); @@ -322,7 +303,6 @@ exports["lang:pt-br"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 27]).week(), 1, "Dec 27 2009 should be week 1"); test.equal(moment([2010, 0, 1]).week(), 1, "Jan 1 2010 should be week 1"); @@ -335,7 +315,6 @@ exports["lang:pt-br"] = { }, "weeks year starting saturday" : function (test) { - test.expect(5); test.equal(moment([2010, 11, 26]).week(), 1, "Dec 26 2010 should be week 1"); test.equal(moment([2011, 0, 1]).week(), 1, "Jan 1 2011 should be week 1"); @@ -347,7 +326,6 @@ exports["lang:pt-br"] = { }, "weeks year starting sunday format" : function (test) { - test.expect(5); 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, 7]).format('w ww wo'), '1 01 1º', "Jan 7 2012 should be week 1"); diff --git a/test/lang/pt.js b/test/lang/pt.js index 43e01c5e5..261811f2d 100644 --- a/test/lang/pt.js +++ b/test/lang/pt.js @@ -20,7 +20,6 @@ exports["lang:pt"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'Janeiro Jan_Fevereiro Fev_Março Mar_Abril Abr_Maio Mai_Junho Jun_Julho Jul_Agosto Ago_Setembro Set_Outubro Out_Novembro Nov_Dezembro Dez'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:pt"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'domingo, fevereiro 14º 2010, 3:25:50 pm'], @@ -76,7 +74,6 @@ exports["lang:pt"] = { }, "format ordinal" : function (test) { - test.expect(31); 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º'); @@ -115,7 +112,6 @@ exports["lang:pt"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'janeiro jan_fevereiro fev_março mar_abril abr_maio mai_junho jun_julho jul_agosto ago_setembro set_outubro out_novembro nov_dezembro dez'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -124,7 +120,6 @@ exports["lang:pt"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'domingo dom dom_segunda-feira seg 2ª_terça-feira ter 3ª_quarta-feira qua 4ª_quinta-feira qui 5ª_sexta-feira sex 6ª_sábado sáb sáb'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -133,7 +128,6 @@ exports["lang:pt"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "segundos", "44 seconds = seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "um minuto", "45 seconds = a minute"); @@ -153,15 +147,13 @@ exports["lang:pt"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dias", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "um mês", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "um mês", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "um mês", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "um mês", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 meses", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 meses", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 meses", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "um mês", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 meses", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 meses", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "um ano", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "um ano", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 anos", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "um ano", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 anos", "5 years = 5 years"); @@ -169,21 +161,18 @@ exports["lang:pt"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "em segundos", "prefix"); test.equal(moment(0).from(30000), "há segundos", "suffix"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "em segundos", "in seconds"); test.equal(moment().add({d: 5}).fromNow(), "em 5 dias", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -197,7 +186,6 @@ exports["lang:pt"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -212,7 +200,6 @@ exports["lang:pt"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -227,7 +214,6 @@ exports["lang:pt"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -248,7 +234,6 @@ exports["lang:pt"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -260,7 +245,6 @@ exports["lang:pt"] = { }, "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"); @@ -272,7 +256,6 @@ exports["lang:pt"] = { }, "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"); @@ -285,7 +268,6 @@ exports["lang:pt"] = { }, "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"); @@ -298,7 +280,6 @@ exports["lang:pt"] = { }, "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"); @@ -311,7 +292,6 @@ exports["lang:pt"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -324,7 +304,6 @@ exports["lang:pt"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -337,7 +316,6 @@ exports["lang:pt"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52º', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1º', "Jan 2 2012 should be week 1"); diff --git a/test/lang/ro.js b/test/lang/ro.js index d30adc15d..4a42d6ccc 100644 --- a/test/lang/ro.js +++ b/test/lang/ro.js @@ -20,7 +20,6 @@ exports["lang:ro"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'ianuarie ian._februarie febr._martie mart._aprilie apr._mai mai_iunie iun._iulie iul._august aug._septembrie sept._octombrie oct._noiembrie nov._decembrie dec.'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:ro"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss A', 'duminică, februarie 14 2010, 3:25:50 PM'], @@ -76,7 +74,6 @@ exports["lang:ro"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2'); @@ -116,7 +113,6 @@ exports["lang:ro"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'ianuarie ian._februarie febr._martie mart._aprilie apr._mai mai_iunie iun._iulie iul._august aug._septembrie sept._octombrie oct._noiembrie nov._decembrie dec.'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -126,7 +122,6 @@ exports["lang:ro"] = { }, "format week" : function (test) { - test.expect(7); 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("_"), i; for (i = 0; i < expected.length; i++) { @@ -136,7 +131,6 @@ exports["lang:ro"] = { }, "from" : function (test) { - test.expect(38); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "câteva secunde", "44 seconds = a few seconds"); @@ -157,15 +151,13 @@ exports["lang:ro"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 de zile", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "o lună", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "o lună", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "o lună", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "o lună", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 luni", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 luni", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 luni", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "o lună", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 luni", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 luni", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "un an", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "un an", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 ani", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "un an", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 ani", "5 years = 5 years"); @@ -181,27 +173,23 @@ exports["lang:ro"] = { }, "suffix" : function (test) { - test.expect(2); 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(); }, "now from now" : function (test) { - test.expect(1); 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); 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(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -215,7 +203,6 @@ exports["lang:ro"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -230,7 +217,6 @@ exports["lang:ro"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -245,7 +231,6 @@ exports["lang:ro"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -265,7 +250,6 @@ exports["lang:ro"] = { // 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"); @@ -277,7 +261,6 @@ exports["lang:ro"] = { }, "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"); @@ -289,7 +272,6 @@ exports["lang:ro"] = { }, "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"); @@ -302,7 +284,6 @@ exports["lang:ro"] = { }, "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"); @@ -315,7 +296,6 @@ exports["lang:ro"] = { }, "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"); @@ -328,7 +308,6 @@ exports["lang:ro"] = { }, "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"); @@ -341,7 +320,6 @@ exports["lang:ro"] = { }, "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"); @@ -354,7 +332,6 @@ exports["lang:ro"] = { }, "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"); diff --git a/test/lang/ru.js b/test/lang/ru.js index d380f781b..743d16c23 100644 --- a/test/lang/ru.js +++ b/test/lang/ru.js @@ -20,7 +20,6 @@ exports["lang:ru"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'январь янв_февраль фев_март мар_апрель апр_май май_июнь июнь_июль июль_август авг_сентябрь сен_октябрь окт_ноябрь ноя_декабрь дек'.split("_"), i; function equalTest(input, mmm, i) { @@ -46,7 +45,6 @@ exports["lang:ru"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, Do MMMM YYYY, HH:mm:ss', 'воскресенье, 14-го февраля 2010, 15:25:50'], @@ -81,7 +79,6 @@ exports["lang:ru"] = { }, "format meridiem" : function (test) { - test.expect(8); test.equal(moment([2012, 11, 28, 0, 0]).format("A"), "ночи", "night"); test.equal(moment([2012, 11, 28, 3, 59]).format("A"), "ночи", "night"); @@ -96,7 +93,6 @@ exports["lang:ru"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1-й', '1-й'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2-й', '2-й'); @@ -136,7 +132,6 @@ exports["lang:ru"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'январь янв_февраль фев_март мар_апрель апр_май май_июнь июнь_июль июль_август авг_сентябрь сен_октябрь окт_ноябрь ноя_декабрь дек'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -146,7 +141,6 @@ exports["lang:ru"] = { }, "format month case" : function (test) { - test.expect(24); var months = { 'nominative': 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'), @@ -160,7 +154,6 @@ exports["lang:ru"] = { }, "format month short case" : function (test) { - test.expect(24); var monthsShort = { 'nominative': 'янв_фев_мар_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'), @@ -174,7 +167,6 @@ exports["lang:ru"] = { }, "format month case with escaped symbols" : function (test) { - test.expect(48); var months = { 'nominative': 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'), @@ -190,7 +182,6 @@ exports["lang:ru"] = { }, "format month short case with escaped symbols" : function (test) { - test.expect(48); var monthsShort = { 'nominative': 'янв_фев_мар_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'), @@ -206,7 +197,6 @@ exports["lang:ru"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'воскресенье вс вс_понедельник пн пн_вторник вт вт_среда ср ср_четверг чт чт_пятница пт пт_суббота сб сб'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -216,7 +206,6 @@ exports["lang:ru"] = { }, "from" : function (test) { - test.expect(33); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "несколько секунд", "44 seconds = seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "минута", "45 seconds = a minute"); @@ -239,15 +228,13 @@ exports["lang:ru"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 дней", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "месяц", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "месяц", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "месяц", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "месяц", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 месяца", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 месяца", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 месяца", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "месяц", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 месяцев", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 месяцев", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "год", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "год", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 года", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "год", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 лет", "5 years = 5 years"); @@ -255,14 +242,12 @@ exports["lang:ru"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "через несколько секунд", "prefix"); test.equal(moment(0).from(30000), "несколько секунд назад", "suffix"); test.done(); }, "fromNow" : function (test) { - test.expect(4); test.equal(moment().add({s: 30}).fromNow(), "через несколько секунд", "in seconds"); test.equal(moment().add({d: 5}).fromNow(), "через 5 дней", "in 5 days"); test.equal(moment().add({m: 31}).fromNow(), "через 31 минуту", "in 31 minutes = in 31 minutes"); @@ -271,7 +256,6 @@ exports["lang:ru"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -285,7 +269,6 @@ exports["lang:ru"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; function makeFormat(d) { @@ -304,7 +287,6 @@ exports["lang:ru"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -335,7 +317,6 @@ exports["lang:ru"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -356,7 +337,6 @@ exports["lang:ru"] = { // 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"); @@ -368,7 +348,6 @@ exports["lang:ru"] = { }, "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"); @@ -380,7 +359,6 @@ exports["lang:ru"] = { }, "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"); @@ -393,7 +371,6 @@ exports["lang:ru"] = { }, "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"); @@ -406,7 +383,6 @@ exports["lang:ru"] = { }, "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"); @@ -419,7 +395,6 @@ exports["lang:ru"] = { }, "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"); @@ -432,7 +407,6 @@ exports["lang:ru"] = { }, "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"); @@ -445,7 +419,6 @@ exports["lang:ru"] = { }, "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"); diff --git a/test/lang/sk.js b/test/lang/sk.js index 69b4d8671..a49315ebe 100644 --- a/test/lang/sk.js +++ b/test/lang/sk.js @@ -20,7 +20,6 @@ exports["lang:sk"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'január jan._február feb._marec mar._apríl apr._máj máj_jún jún._júl júl._august aug._september sep._október okt._november nov._december dec.'.split("_"), i; function equalTest(input, mmm, monthIndex) { test.equal(moment(input, mmm).month(), monthIndex, input + ' should be month ' + (monthIndex + 1)); @@ -40,7 +39,6 @@ exports["lang:sk"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss', 'nedeľa, február 14. 2010, 3:25:50'], ['ddd, h', 'ne, 3'], @@ -74,7 +72,6 @@ exports["lang:sk"] = { }, "format ordinal" : function (test) { - test.expect(31); 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.'); @@ -113,7 +110,6 @@ exports["lang:sk"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'január jan_február feb_marec mar_apríl apr_máj máj_jún jún_júl júl_august aug_september sep_október okt_november nov_december dec'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -122,7 +118,6 @@ exports["lang:sk"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'nedeľa ne ne_pondelok po po_utorok ut ut_streda st st_štvrtok št št_piatok pi pi_sobota so so'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -131,7 +126,6 @@ exports["lang:sk"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "pár sekúnd", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "minúta", "45 seconds = a minute"); @@ -151,15 +145,13 @@ exports["lang:sk"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dní", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "mesiac", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "mesiac", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "mesiac", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "mesiac", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 mesiace", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 mesiace", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 mesiace", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "mesiac", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 mesiacov", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 mesiacov", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "rok", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "rok", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 roky", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "rok", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 rokov", "5 years = 5 years"); @@ -167,20 +159,17 @@ exports["lang:sk"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "za pár sekúnd", "prefix"); test.equal(moment(0).from(30000), "pred pár sekundami", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "pred pár sekundami", "now from now should display as in the past"); test.done(); }, "fromNow (future)" : function (test) { - test.expect(16); test.equal(moment().add({s: 30}).fromNow(), "za pár sekúnd", "in a few seconds"); test.equal(moment().add({m: 1}).fromNow(), "za minútu", "in a minute"); test.equal(moment().add({m: 3}).fromNow(), "za 3 minúty", "in 3 minutes"); @@ -201,7 +190,6 @@ exports["lang:sk"] = { }, "fromNow (past)" : function (test) { - test.expect(16); test.equal(moment().subtract({s: 30}).fromNow(), "pred pár sekundami", "a few seconds ago"); test.equal(moment().subtract({m: 1}).fromNow(), "pred minútou", "a minute ago"); test.equal(moment().subtract({m: 3}).fromNow(), "pred 3 minútami", "3 minutes ago"); @@ -222,7 +210,6 @@ exports["lang:sk"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -236,7 +223,6 @@ exports["lang:sk"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m, nextDay; for (i = 2; i < 7; i++) { @@ -275,7 +261,6 @@ exports["lang:sk"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m, lastDay; for (i = 2; i < 7; i++) { @@ -314,7 +299,6 @@ exports["lang:sk"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -330,7 +314,6 @@ exports["lang:sk"] = { }, "humanize duration" : function (test) { - test.expect(4); test.equal(moment.duration(1, "minutes").humanize(), "minúta", "a minute (future)"); test.equal(moment.duration(1, "minutes").humanize(true), "za minútu", "in a minute"); test.equal(moment.duration(-1, "minutes").humanize(), "minúta", "a minute (past)"); @@ -342,7 +325,6 @@ exports["lang:sk"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -354,7 +336,6 @@ exports["lang:sk"] = { }, "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"); @@ -366,7 +347,6 @@ exports["lang:sk"] = { }, "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"); @@ -379,7 +359,6 @@ exports["lang:sk"] = { }, "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"); @@ -392,7 +371,6 @@ exports["lang:sk"] = { }, "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"); @@ -405,7 +383,6 @@ exports["lang:sk"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -418,7 +395,6 @@ exports["lang:sk"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -431,7 +407,6 @@ exports["lang:sk"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52.', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1.', "Jan 2 2012 should be week 1"); diff --git a/test/lang/sl.js b/test/lang/sl.js index ec5670a5a..d0dd8a611 100644 --- a/test/lang/sl.js +++ b/test/lang/sl.js @@ -20,7 +20,6 @@ exports["lang:sl"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'januar jan._februar feb._marec mar._april apr._maj maj_junij jun._julij jul._avgust avg._september sep._oktober okt._november nov._december dec.'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:sl"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, Do MMMM YYYY, h:mm:ss a', 'nedelja, 14. februar 2010, 3:25:50 pm'], ['ddd, hA', 'ned., 3PM'], @@ -75,7 +73,6 @@ exports["lang:sl"] = { }, "format ordinal" : function (test) { - test.expect(31); 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.'); @@ -114,7 +111,6 @@ exports["lang:sl"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'januar jan._februar feb._marec mar._april apr._maj maj._junij jun._julij jul._avgust avg._september sep._oktober okt._november nov._december dec.'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -123,7 +119,6 @@ exports["lang:sl"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'nedelja ned. ne_ponedeljek pon. po_torek tor. to_sreda sre. sr_četrtek čet. če_petek pet. pe_sobota sob. so'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -132,7 +127,6 @@ exports["lang:sl"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "nekaj sekund", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "ena minuta", "45 seconds = a minute"); @@ -152,15 +146,13 @@ exports["lang:sl"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dni", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "en mesec", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "en mesec", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "en mesec", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "en mesec", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 meseca", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 meseca", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 mesece", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "en mesec", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 mesecev", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 mesecev", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "eno leto", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "eno leto", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 leti", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "eno leto", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 let", "5 years = 5 years"); @@ -168,27 +160,23 @@ exports["lang:sl"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "čez nekaj sekund", "prefix"); test.equal(moment(0).from(30000), "nekaj sekund nazaj", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "nekaj sekund nazaj", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "čez nekaj sekund", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "čez 5 dni", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -202,7 +190,6 @@ exports["lang:sl"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; @@ -234,7 +221,6 @@ exports["lang:sl"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -264,7 +250,6 @@ exports["lang:sl"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -285,7 +270,6 @@ exports["lang:sl"] = { // 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"); @@ -297,7 +281,6 @@ exports["lang:sl"] = { }, "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"); @@ -309,7 +292,6 @@ exports["lang:sl"] = { }, "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"); @@ -322,7 +304,6 @@ exports["lang:sl"] = { }, "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"); @@ -335,7 +316,6 @@ exports["lang:sl"] = { }, "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"); @@ -348,7 +328,6 @@ exports["lang:sl"] = { }, "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"); @@ -361,7 +340,6 @@ exports["lang:sl"] = { }, "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"); @@ -374,7 +352,6 @@ exports["lang:sl"] = { }, "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"); diff --git a/test/lang/sq.js b/test/lang/sq.js index a00c82287..f29dfb4a6 100644 --- a/test/lang/sq.js +++ b/test/lang/sq.js @@ -20,7 +20,6 @@ exports["lang:sq"] = { }, "parse" : function (test) { - test.expect(96); var i, tests = 'Janar Jan_Shkurt Shk_Mars Mar_Prill Pri_Maj Maj_Qershor Qer_Korrik Kor_Gusht Gus_Shtator Sht_Tetor Tet_Nëntor Nën_Dhjetor Dhj'.split("_"); @@ -45,7 +44,6 @@ exports["lang:sq"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, HH:mm:ss', 'E Diel, Shkurt 14. 2010, 15:25:50'], @@ -82,7 +80,6 @@ exports["lang:sq"] = { }, "meridiem" : function (test) { - test.expect(2); test.equal(moment([2011, 2, 23, 0, 0]).format('A'), "PD", "before dawn"); test.equal(moment([2011, 2, 23, 12, 0]).format('A'), "MD", "noon"); @@ -91,7 +88,6 @@ exports["lang:sq"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.'); @@ -131,7 +127,6 @@ exports["lang:sq"] = { }, "format month" : function (test) { - test.expect(12); var i, expected = 'Janar Jan_Shkurt Shk_Mars Mar_Prill Pri_Maj Maj_Qershor Qer_Korrik Kor_Gusht Gus_Shtator Sht_Tetor Tet_Nëntor Nën_Dhjetor Dhj'.split("_"); @@ -143,7 +138,6 @@ exports["lang:sq"] = { }, "format week" : function (test) { - test.expect(7); var i, expected = 'E Diel Die D_E Hënë Hën H_E Martë Mar Ma_E Mërkurë Mër Më_E Enjte Enj E_E Premte Pre P_E Shtunë Sht Sh'.split("_"); @@ -156,7 +150,6 @@ exports["lang:sq"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); @@ -178,15 +171,13 @@ exports["lang:sq"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 ditë", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "një muaj", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "një muaj", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "një muaj", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "një muaj", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 muaj", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 muaj", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 muaj", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "një muaj", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 muaj", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 muaj", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "një vit", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "një vit", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 vite", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "një vit", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 vite", "5 years = 5 years"); @@ -195,7 +186,6 @@ exports["lang:sq"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "në disa sekonda", "prefix"); test.equal(moment(0).from(30000), "disa sekonda më parë", "suffix"); @@ -204,7 +194,6 @@ exports["lang:sq"] = { }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "disa sekonda më parë", "now from now should display as in the past"); @@ -212,7 +201,6 @@ exports["lang:sq"] = { }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "në disa sekonda", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "në 5 ditë", "in 5 days"); @@ -221,7 +209,6 @@ exports["lang:sq"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -236,7 +223,6 @@ exports["lang:sq"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; @@ -252,7 +238,6 @@ exports["lang:sq"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -268,7 +253,6 @@ exports["lang:sq"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -288,7 +272,6 @@ exports["lang:sq"] = { // Monday is the first day of the week. // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -300,7 +283,6 @@ exports["lang:sq"] = { }, "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"); @@ -312,7 +294,6 @@ exports["lang:sq"] = { }, "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"); @@ -325,7 +306,6 @@ exports["lang:sq"] = { }, "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"); @@ -338,7 +318,6 @@ exports["lang:sq"] = { }, "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"); @@ -351,7 +330,6 @@ exports["lang:sq"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -364,7 +342,6 @@ exports["lang:sq"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -377,7 +354,6 @@ exports["lang:sq"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52.', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1.', "Jan 2 2012 should be week 1"); diff --git a/test/lang/sr-cyrl.js b/test/lang/sr-cyrl.js index 0ff38d8ad..35acccdfe 100644 --- a/test/lang/sr-cyrl.js +++ b/test/lang/sr-cyrl.js @@ -20,7 +20,6 @@ exports["lang:sr-cyrl"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'јануар јан._фебруар феб._март мар._април апр._мај мај_јун јун_јул јул_август авг._септембар сеп._октобар окт._новембар нов._децембар дец.'.split("_"), i; @@ -42,7 +41,6 @@ exports["lang:sr-cyrl"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, Do MMMM YYYY, h:mm:ss a', 'недеља, 14. фебруар 2010, 3:25:50 pm'], ['ddd, hA', 'нед., 3PM'], @@ -76,7 +74,6 @@ exports["lang:sr-cyrl"] = { }, "format ordinal" : function (test) { - test.expect(31); 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.'); @@ -115,7 +112,6 @@ exports["lang:sr-cyrl"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'јануар јан._фебруар феб._март мар._април апр._мај мај_јун јун_јул јул_август авг._септембар сеп._октобар окт._новембар нов._децембар дец.'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -125,7 +121,6 @@ exports["lang:sr-cyrl"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'недеља нед. не_понедељак пон. по_уторак уто. ут_среда сре. ср_четвртак чет. че_петак пет. пе_субота суб. су'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -135,7 +130,6 @@ exports["lang:sr-cyrl"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "неколико секунди", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "један минут", "45 seconds = a minute"); @@ -155,15 +149,13 @@ exports["lang:sr-cyrl"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 дана", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "месец", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "месец", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "месец", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "месец", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 месеца", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 месеца", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 месеца", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "месец", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 месеци", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 месеци", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "годину", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "годину", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 године", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "годину", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 година", "5 years = 5 years"); @@ -171,27 +163,23 @@ exports["lang:sr-cyrl"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "за неколико секунди", "prefix"); test.equal(moment(0).from(30000), "пре неколико секунди", "prefix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "пре неколико секунди", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "за неколико секунди", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "за 5 дана", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -205,7 +193,6 @@ exports["lang:sr-cyrl"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; @@ -237,7 +224,6 @@ exports["lang:sr-cyrl"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -267,7 +253,6 @@ exports["lang:sr-cyrl"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -288,7 +273,6 @@ exports["lang:sr-cyrl"] = { // 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"); @@ -300,7 +284,6 @@ exports["lang:sr-cyrl"] = { }, "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"); @@ -312,7 +295,6 @@ exports["lang:sr-cyrl"] = { }, "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"); @@ -325,7 +307,6 @@ exports["lang:sr-cyrl"] = { }, "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"); @@ -338,7 +319,6 @@ exports["lang:sr-cyrl"] = { }, "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"); @@ -351,7 +331,6 @@ exports["lang:sr-cyrl"] = { }, "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"); @@ -364,7 +343,6 @@ exports["lang:sr-cyrl"] = { }, "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"); @@ -377,7 +355,6 @@ exports["lang:sr-cyrl"] = { }, "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"); diff --git a/test/lang/sr.js b/test/lang/sr.js index c0556b955..79591d04e 100644 --- a/test/lang/sr.js +++ b/test/lang/sr.js @@ -20,7 +20,6 @@ exports["lang:sr"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'januar jan._februar feb._mart mar._april apr._maj maj_jun jun_jul jul_avgust avg._septembar sep._oktobar okt._novembar nov._decembar dec.'.split("_"), i; @@ -42,7 +41,6 @@ exports["lang:sr"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, Do MMMM YYYY, h:mm:ss a', 'nedelja, 14. februar 2010, 3:25:50 pm'], ['ddd, hA', 'ned., 3PM'], @@ -76,7 +74,6 @@ exports["lang:sr"] = { }, "format ordinal" : function (test) { - test.expect(31); 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.'); @@ -115,7 +112,6 @@ exports["lang:sr"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'januar jan._februar feb._mart mar._april apr._maj maj_jun jun_jul jul_avgust avg._septembar sep._oktobar okt._novembar nov._decembar dec.'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -125,7 +121,6 @@ exports["lang:sr"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'nedelja ned. ne_ponedeljak pon. po_utorak uto. ut_sreda sre. sr_četvrtak čet. če_petak pet. pe_subota sub. su'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -135,7 +130,6 @@ exports["lang:sr"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "nekoliko sekundi", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "jedan minut", "45 seconds = a minute"); @@ -155,15 +149,13 @@ exports["lang:sr"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dana", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "mesec", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "mesec", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "mesec", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "mesec", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 meseca", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 meseca", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 meseca", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "mesec", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 meseci", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 meseci", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "godinu", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "godinu", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 godine", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "godinu", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 godina", "5 years = 5 years"); @@ -171,27 +163,23 @@ exports["lang:sr"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "za nekoliko sekundi", "prefix"); test.equal(moment(0).from(30000), "pre nekoliko sekundi", "prefix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "pre nekoliko sekundi", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "za nekoliko sekundi", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "za 5 dana", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -205,7 +193,6 @@ exports["lang:sr"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; @@ -237,7 +224,6 @@ exports["lang:sr"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -267,7 +253,6 @@ exports["lang:sr"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -288,7 +273,6 @@ exports["lang:sr"] = { // 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"); @@ -300,7 +284,6 @@ exports["lang:sr"] = { }, "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"); @@ -312,7 +295,6 @@ exports["lang:sr"] = { }, "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"); @@ -325,7 +307,6 @@ exports["lang:sr"] = { }, "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"); @@ -338,7 +319,6 @@ exports["lang:sr"] = { }, "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"); @@ -351,7 +331,6 @@ exports["lang:sr"] = { }, "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"); @@ -364,7 +343,6 @@ exports["lang:sr"] = { }, "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"); @@ -377,7 +355,6 @@ exports["lang:sr"] = { }, "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"); diff --git a/test/lang/sv.js b/test/lang/sv.js index 2a9047b9e..51edfd567 100644 --- a/test/lang/sv.js +++ b/test/lang/sv.js @@ -19,7 +19,6 @@ exports["lang:sv"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'januari jan_februari feb_mars mar_april apr_maj maj_juni jun_juli jul_augusti aug_september sep_oktober okt_november nov_december dec'.split("_"), i; function equalTest(input, mmm, i) { test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1)); @@ -39,7 +38,6 @@ exports["lang:sv"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'söndag, februari 14e 2010, 3:25:50 pm'], ['ddd, hA', 'sön, 3PM'], @@ -73,7 +71,6 @@ exports["lang:sv"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1a', '1a'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2a', '2a'); test.equal(moment([2011, 0, 3]).format('DDDo'), '3e', '3e'); @@ -112,7 +109,6 @@ exports["lang:sv"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'januari jan_februari feb_mars mar_april apr_maj maj_juni jun_juli jul_augusti aug_september sep_oktober okt_november nov_december dec'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -121,7 +117,6 @@ exports["lang:sv"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'söndag sön sö_måndag mån må_tisdag tis ti_onsdag ons on_torsdag tor to_fredag fre fr_lördag lör lö'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -130,7 +125,6 @@ exports["lang:sv"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "några sekunder", "44 sekunder = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "en minut", "45 seconds = a minute"); @@ -150,15 +144,13 @@ exports["lang:sv"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 dagar", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "en månad", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "en månad", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "en månad", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "en månad", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 månader", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 månader", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 månader", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "en månad", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 månader", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 månader", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "ett år", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "ett år", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 år", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "ett år", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 år", "5 years = 5 years"); @@ -166,27 +158,23 @@ exports["lang:sv"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "om några sekunder", "prefix"); test.equal(moment(0).from(30000), "för några sekunder sedan", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "för några sekunder sedan", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "om några sekunder", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "om 5 dagar", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -200,7 +188,6 @@ exports["lang:sv"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -215,7 +202,6 @@ exports["lang:sv"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -230,7 +216,6 @@ exports["lang:sv"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -250,7 +235,6 @@ exports["lang:sv"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -262,7 +246,6 @@ exports["lang:sv"] = { }, "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"); @@ -274,7 +257,6 @@ exports["lang:sv"] = { }, "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"); @@ -287,7 +269,6 @@ exports["lang:sv"] = { }, "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"); @@ -300,7 +281,6 @@ exports["lang:sv"] = { }, "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"); @@ -313,7 +293,6 @@ exports["lang:sv"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -326,7 +305,6 @@ exports["lang:sv"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -339,7 +317,6 @@ exports["lang:sv"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52a', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1a', "Jan 2 2012 should be week 1"); diff --git a/test/lang/ta.js b/test/lang/ta.js index 25ead5d4f..d9ca4eea2 100644 --- a/test/lang/ta.js +++ b/test/lang/ta.js @@ -20,7 +20,6 @@ exports["lang:ta"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'ஜனவரி ஜனவரி_பிப்ரவரி பிப்ரவரி_மார்ச் மார்ச்_ஏப்ரல் ஏப்ரல்_மே மே_ஜூன் ஜூன்_ஜூலை ஜூலை_ஆகஸ்ட் ஆகஸ்ட்_செப்டெம்பர் செப்டெம்பர்_அக்டோபர் அக்டோபர்_நவம்பர் நவம்பர்_டிசம்பர் டிசம்பர்'.split("_"), i; function equalTest(input, mmm, i) { test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1)); @@ -40,7 +39,6 @@ exports["lang:ta"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'ஞாயிற்றுக்கிழமை, பிப்ரவரி 14வது 2010, 3:25:50 எற்பாடு'], ['ddd, hA', 'ஞாயிறு, 3 எற்பாடு'], @@ -74,7 +72,6 @@ exports["lang:ta"] = { }, "format ordinal" : function (test) { - test.expect(31); 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வது'); @@ -113,7 +110,6 @@ exports["lang:ta"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'ஜனவரி ஜனவரி_பிப்ரவரி பிப்ரவரி_மார்ச் மார்ச்_ஏப்ரல் ஏப்ரல்_மே மே_ஜூன் ஜூன்_ஜூலை ஜூலை_ஆகஸ்ட் ஆகஸ்ட்_செப்டெம்பர் செப்டெம்பர்_அக்டோபர் அக்டோபர்_நவம்பர் நவம்பர்_டிசம்பர் டிசம்பர்'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -122,7 +118,6 @@ exports["lang:ta"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'ஞாயிற்றுக்கிழமை ஞாயிறு ஞா_திங்கட்கிழமை திங்கள் தி_செவ்வாய்கிழமை செவ்வாய் செ_புதன்கிழமை புதன் பு_வியாழக்கிழமை வியாழன் வி_வெள்ளிக்கிழமை வெள்ளி வெ_சனிக்கிழமை சனி ச'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -131,7 +126,6 @@ exports["lang:ta"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "ஒரு சில விநாடிகள்", "44 விநாடிகள் = ஒரு சில விநாடிகள்"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "ஒரு நிமிடம்", "45 விநாடிகள் = ஒரு நிமிடம்"); @@ -151,15 +145,13 @@ exports["lang:ta"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 நாட்கள்", "25 நாட்கள் = 25 நாட்கள்"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "ஒரு மாதம்", "26 நாட்கள் = ஒரு மாதம்"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "ஒரு மாதம்", "30 நாட்கள் = ஒரு மாதம்"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "ஒரு மாதம்", "45 நாட்கள் = ஒரு மாதம்"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "ஒரு மாதம்", "45 நாட்கள் = ஒரு மாதம்"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 மாதங்கள்", "46 நாட்கள் = 2 மாதங்கள்"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 மாதங்கள்", "75 நாட்கள் = 2 மாதங்கள்"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 மாதங்கள்", "76 நாட்கள் = 3 மாதங்கள்"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "ஒரு மாதம்", "1 மாதம் = ஒரு மாதம்"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 மாதங்கள்", "5 மாதங்கள் = 5 மாதங்கள்"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 மாதங்கள்", "344 நாட்கள் = 11 மாதங்கள்"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "ஒரு வருடம்", "345 நாட்கள் = ஒரு வருடம்"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "ஒரு வருடம்", "547 நாட்கள் = ஒரு வருடம்"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 ஆண்டுகள்", "548 நாட்கள் = 2 ஆண்டுகள்"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "ஒரு வருடம்", "1 வருடம் = ஒரு வருடம்"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 ஆண்டுகள்", "5 ஆண்டுகள் = 5 ஆண்டுகள்"); @@ -167,27 +159,23 @@ exports["lang:ta"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "ஒரு சில விநாடிகள் இல்", "prefix"); test.equal(moment(0).from(30000), "ஒரு சில விநாடிகள் முன்", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "ஒரு சில விநாடிகள் முன்", "இப்போது இருந்து கடந்த காலத்தில் காட்ட வேண்டும்"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "ஒரு சில விநாடிகள் இல்", "ஒரு சில விநாடிகள் இல்"); test.equal(moment().add({d: 5}).fromNow(), "5 நாட்கள் இல்", "5 நாட்கள் இல்"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -201,7 +189,6 @@ exports["lang:ta"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -216,7 +203,6 @@ exports["lang:ta"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -233,7 +219,6 @@ exports["lang:ta"] = { "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -256,7 +241,6 @@ exports["lang:ta"] = { // 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([2012, 0, 1]).week(), 1, "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).week(), 1, "Jan 7 2012 should be week 1"); @@ -268,7 +252,6 @@ exports["lang:ta"] = { }, "weeks year starting monday" : function (test) { - test.expect(6); test.equal(moment([2006, 11, 31]).week(), 1, "Dec 31 2006 should be week 1"); test.equal(moment([2007, 0, 1]).week(), 1, "Jan 1 2007 should be week 1"); @@ -281,7 +264,6 @@ exports["lang:ta"] = { }, "weeks year starting tuesday" : function (test) { - test.expect(6); test.equal(moment([2007, 11, 29]).week(), 52, "Dec 29 2007 should be week 52"); test.equal(moment([2008, 0, 1]).week(), 1, "Jan 1 2008 should be week 1"); @@ -294,7 +276,6 @@ exports["lang:ta"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(6); test.equal(moment([2002, 11, 29]).week(), 1, "Dec 29 2002 should be week 1"); test.equal(moment([2003, 0, 1]).week(), 1, "Jan 1 2003 should be week 1"); @@ -307,7 +288,6 @@ exports["lang:ta"] = { }, "weeks year starting thursday" : function (test) { - test.expect(6); test.equal(moment([2008, 11, 28]).week(), 1, "Dec 28 2008 should be week 1"); test.equal(moment([2009, 0, 1]).week(), 1, "Jan 1 2009 should be week 1"); @@ -320,7 +300,6 @@ exports["lang:ta"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 27]).week(), 1, "Dec 27 2009 should be week 1"); test.equal(moment([2010, 0, 1]).week(), 1, "Jan 1 2010 should be week 1"); @@ -333,7 +312,6 @@ exports["lang:ta"] = { }, "weeks year starting saturday" : function (test) { - test.expect(5); test.equal(moment([2010, 11, 26]).week(), 1, "Dec 26 2010 should be week 1"); test.equal(moment([2011, 0, 1]).week(), 1, "Jan 1 2011 should be week 1"); @@ -345,7 +323,6 @@ exports["lang:ta"] = { }, "meridiem" : function (test) { - test.expect(6); test.equal(moment([2011, 2, 23, 2, 30]).format('a'), " வைகறை", "before dawn"); test.equal(moment([2011, 2, 23, 9, 30]).format('a'), " காலை", "morning"); diff --git a/test/lang/th.js b/test/lang/th.js index f1949acc8..13da803f2 100644 --- a/test/lang/th.js +++ b/test/lang/th.js @@ -20,7 +20,6 @@ exports["lang:th"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'มกราคม มกรา_กุมภาพันธ์ กุมภา_มีนาคม มีนา_เมษายน เมษา_พฤษภาคม พฤษภา_มิถุนายน มิถุนา_กรกฎาคม กรกฎา_สิงหาคม สิงหา_กันยายน กันยา_ตุลาคม ตุลา_พฤศจิกายน พฤศจิกา_ธันวาคม ธันวา'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:th"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, Do MMMM YYYY, h:mm:ss a', 'อาทิตย์, 14 กุมภาพันธ์ 2010, 3:25:50 หลังเที่ยง'], @@ -76,7 +74,6 @@ exports["lang:th"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'มกราคม มกรา_กุมภาพันธ์ กุมภา_มีนาคม มีนา_เมษายน เมษา_พฤษภาคม พฤษภา_มิถุนายน มิถุนา_กรกฎาคม กรกฎา_สิงหาคม สิงหา_กันยายน กันยา_ตุลาคม ตุลา_พฤศจิกายน พฤศจิกา_ธันวาคม ธันวา'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -86,7 +83,6 @@ exports["lang:th"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'อาทิตย์ อาทิตย์ อา._จันทร์ จันทร์ จ._อังคาร อังคาร อ._พุธ พุธ พ._พฤหัสบดี พฤหัส พฤ._ศุกร์ ศุกร์ ศ._เสาร์ เสาร์ ส.'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -96,7 +92,6 @@ exports["lang:th"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "ไม่กี่วินาที", "44 seconds = a few seconds"); @@ -117,15 +112,13 @@ exports["lang:th"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 วัน", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "1 เดือน", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "1 เดือน", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "1 เดือน", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "1 เดือน", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 เดือน", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 เดือน", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 เดือน", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "1 เดือน", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 เดือน", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 เดือน", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "1 ปี", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "1 ปี", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 ปี", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "1 ปี", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 ปี", "5 years = 5 years"); @@ -133,27 +126,23 @@ exports["lang:th"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "อีก ไม่กี่วินาที", "prefix"); test.equal(moment(0).from(30000), "ไม่กี่วินาทีที่แล้ว", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "ไม่กี่วินาทีที่แล้ว", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "อีก ไม่กี่วินาที", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "อีก 5 วัน", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -167,7 +156,6 @@ exports["lang:th"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -182,7 +170,6 @@ exports["lang:th"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -197,7 +184,6 @@ exports["lang:th"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -217,7 +203,6 @@ exports["lang:th"] = { // 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([2012, 0, 1]).week(), 1, "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).week(), 1, "Jan 7 2012 should be week 1"); @@ -229,7 +214,6 @@ exports["lang:th"] = { }, "weeks year starting monday" : function (test) { - test.expect(6); test.equal(moment([2006, 11, 31]).week(), 1, "Dec 31 2006 should be week 1"); test.equal(moment([2007, 0, 1]).week(), 1, "Jan 1 2007 should be week 1"); @@ -242,7 +226,6 @@ exports["lang:th"] = { }, "weeks year starting tuesday" : function (test) { - test.expect(6); test.equal(moment([2007, 11, 29]).week(), 52, "Dec 29 2007 should be week 52"); test.equal(moment([2008, 0, 1]).week(), 1, "Jan 1 2008 should be week 1"); @@ -255,7 +238,6 @@ exports["lang:th"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(6); test.equal(moment([2002, 11, 29]).week(), 1, "Dec 29 2002 should be week 1"); test.equal(moment([2003, 0, 1]).week(), 1, "Jan 1 2003 should be week 1"); @@ -268,7 +250,6 @@ exports["lang:th"] = { }, "weeks year starting thursday" : function (test) { - test.expect(6); test.equal(moment([2008, 11, 28]).week(), 1, "Dec 28 2008 should be week 1"); test.equal(moment([2009, 0, 1]).week(), 1, "Jan 1 2009 should be week 1"); @@ -281,7 +262,6 @@ exports["lang:th"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 27]).week(), 1, "Dec 27 2009 should be week 1"); test.equal(moment([2010, 0, 1]).week(), 1, "Jan 1 2010 should be week 1"); @@ -294,7 +274,6 @@ exports["lang:th"] = { }, "weeks year starting saturday" : function (test) { - test.expect(5); test.equal(moment([2010, 11, 26]).week(), 1, "Dec 26 2010 should be week 1"); test.equal(moment([2011, 0, 1]).week(), 1, "Jan 1 2011 should be week 1"); @@ -306,7 +285,6 @@ exports["lang:th"] = { }, "weeks year starting sunday format" : function (test) { - test.expect(5); 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, 7]).format('w ww wo'), '1 01 1', "Jan 7 2012 should be week 1"); diff --git a/test/lang/tl-ph.js b/test/lang/tl-ph.js index 6bdc8ddcd..7da00486f 100644 --- a/test/lang/tl-ph.js +++ b/test/lang/tl-ph.js @@ -20,7 +20,6 @@ exports["lang:tl-ph"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'Enero Ene_Pebrero Peb_Marso Mar_Abril Abr_Mayo May_Hunyo Hun_Hulyo Hul_Agosto Ago_Setyembre Set_Oktubre Okt_Nobyembre Nob_Disyembre Dis'.split("_"), i; @@ -42,7 +41,6 @@ exports["lang:tl-ph"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'Linggo, Pebrero 14 2010, 3:25:50 pm'], @@ -77,7 +75,6 @@ exports["lang:tl-ph"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2'); @@ -117,7 +114,6 @@ exports["lang:tl-ph"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'Enero Ene_Pebrero Peb_Marso Mar_Abril Abr_Mayo May_Hunyo Hun_Hulyo Hul_Agosto Ago_Setyembre Set_Oktubre Okt_Nobyembre Nob_Disyembre Dis'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -127,7 +123,6 @@ exports["lang:tl-ph"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'Linggo Lin Li_Lunes Lun Lu_Martes Mar Ma_Miyerkules Miy Mi_Huwebes Huw Hu_Biyernes Biy Bi_Sabado Sab Sab'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -137,7 +132,6 @@ exports["lang:tl-ph"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "ilang segundo", "44 seconds = a few seconds"); @@ -158,15 +152,13 @@ exports["lang:tl-ph"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 araw", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "isang buwan", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "isang buwan", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "isang buwan", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "isang buwan", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 buwan", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 buwan", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 buwan", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "isang buwan", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 buwan", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 buwan", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "isang taon", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "isang taon", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 taon", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "isang taon", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 taon", "5 years = 5 years"); @@ -174,7 +166,6 @@ exports["lang:tl-ph"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "sa loob ng ilang segundo", "prefix"); test.equal(moment(0).from(30000), "ilang segundo ang nakalipas", "suffix"); @@ -182,7 +173,6 @@ exports["lang:tl-ph"] = { }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "sa loob ng ilang segundo", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "sa loob ng 5 araw", "in 5 days"); @@ -190,7 +180,6 @@ exports["lang:tl-ph"] = { }, "same day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -204,7 +193,6 @@ exports["lang:tl-ph"] = { }, "same next week" : function (test) { - test.expect(15); var i, m; @@ -220,7 +208,6 @@ exports["lang:tl-ph"] = { }, "same last week" : function (test) { - test.expect(15); var i, m; @@ -236,7 +223,6 @@ exports["lang:tl-ph"] = { }, "same all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -255,7 +241,6 @@ exports["lang:tl-ph"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -267,7 +252,6 @@ exports["lang:tl-ph"] = { }, "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"); @@ -279,7 +263,6 @@ exports["lang:tl-ph"] = { }, "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"); @@ -292,7 +275,6 @@ exports["lang:tl-ph"] = { }, "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"); @@ -305,7 +287,6 @@ exports["lang:tl-ph"] = { }, "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"); @@ -318,7 +299,6 @@ exports["lang:tl-ph"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -331,7 +311,6 @@ exports["lang:tl-ph"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -344,7 +323,6 @@ exports["lang:tl-ph"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1', "Jan 2 2012 should be week 1"); diff --git a/test/lang/tr.js b/test/lang/tr.js index c5ae0d713..388edbf37 100644 --- a/test/lang/tr.js +++ b/test/lang/tr.js @@ -20,7 +20,6 @@ exports["lang:tr"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'Ocak Oca_Şubat Şub_Mart Mar_Nisan Nis_Mayıs May_Haziran Haz_Temmuz Tem_Ağustos Ağu_Eylül Eyl_Ekim Eki_Kasım Kas_Aralık Ara'.split("_"), i; function equalTest(input, mmm, i) { @@ -74,7 +73,6 @@ exports["lang:tr"] = { dt = moment(new Date(2010, 1, 14, 15, 25, 50, 125)), DDDoDt, i; - test.expect(a.length + DDDo.length); for (i = 0; i < a.length; i++) { test.equal(dt.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]); @@ -87,7 +85,6 @@ exports["lang:tr"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1\'inci', '1st'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2\'nci', '2nd'); @@ -127,7 +124,6 @@ exports["lang:tr"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'Ocak Oca_Şubat Şub_Mart Mar_Nisan Nis_Mayıs May_Haziran Haz_Temmuz Tem_Ağustos Ağu_Eylül Eyl_Ekim Eki_Kasım Kas_Aralık Ara'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -137,7 +133,6 @@ exports["lang:tr"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'Pazar Paz Pz_Pazartesi Pts Pt_Salı Sal Sa_Çarşamba Çar Ça_Perşembe Per Pe_Cuma Cum Cu_Cumartesi Cts Ct'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -147,7 +142,6 @@ exports["lang:tr"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "birkaç saniye", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "bir dakika", "45 seconds = a minute"); @@ -167,15 +161,13 @@ exports["lang:tr"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 gün", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "bir ay", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "bir ay", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "bir ay", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "bir ay", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 ay", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 ay", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 ay", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "bir ay", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 ay", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 ay", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "bir yıl", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "bir yıl", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 yıl", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "bir yıl", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 yıl", "5 years = 5 years"); @@ -183,27 +175,23 @@ exports["lang:tr"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "birkaç saniye sonra", "prefix"); test.equal(moment(0).from(30000), "birkaç saniye önce", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "birkaç saniye önce", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "birkaç saniye sonra", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "5 gün sonra", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -217,7 +205,6 @@ exports["lang:tr"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -232,7 +219,6 @@ exports["lang:tr"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -247,7 +233,6 @@ exports["lang:tr"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -268,7 +253,6 @@ exports["lang:tr"] = { // 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"); @@ -280,7 +264,6 @@ exports["lang:tr"] = { }, "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"); @@ -292,7 +275,6 @@ exports["lang:tr"] = { }, "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"); @@ -305,7 +287,6 @@ exports["lang:tr"] = { }, "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"); @@ -318,7 +299,6 @@ exports["lang:tr"] = { }, "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"); @@ -331,7 +311,6 @@ exports["lang:tr"] = { }, "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"); @@ -344,7 +323,6 @@ exports["lang:tr"] = { }, "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"); @@ -357,7 +335,6 @@ exports["lang:tr"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2011, 11, 26]).format('w ww wo'), "1 01 1'inci", "Dec 26 2011 should be week 1"); test.equal(moment([2012, 0, 1]).format('w ww wo'), "1 01 1'inci", "Jan 1 2012 should be week 1"); diff --git a/test/lang/tzm-latn.js b/test/lang/tzm-latn.js index 1069116e4..efedb58ab 100644 --- a/test/lang/tzm-latn.js +++ b/test/lang/tzm-latn.js @@ -18,7 +18,6 @@ exports["lang:tzm-latn"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'innayr innayr_brˤayrˤ brˤayrˤ_marˤsˤ marˤsˤ_ibrir ibrir_mayyw mayyw_ywnyw ywnyw_ywlywz ywlywz_ɣwšt ɣwšt_šwtanbir šwtanbir_ktˤwbrˤ ktˤwbrˤ_nwwanbir nwwanbir_dwjnbir dwjnbir'.split("_"), i; function equalTest(input, mmm, i) { @@ -39,7 +38,6 @@ exports["lang:tzm-latn"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'asamas, brˤayrˤ 14 2010, 3:25:50 pm'], @@ -74,7 +72,6 @@ exports["lang:tzm-latn"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2'); @@ -114,7 +111,6 @@ exports["lang:tzm-latn"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'innayr innayr_brˤayrˤ brˤayrˤ_marˤsˤ marˤsˤ_ibrir ibrir_mayyw mayyw_ywnyw ywnyw_ywlywz ywlywz_ɣwšt ɣwšt_šwtanbir šwtanbir_ktˤwbrˤ ktˤwbrˤ_nwwanbir nwwanbir_dwjnbir dwjnbir'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -124,7 +120,6 @@ exports["lang:tzm-latn"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'asamas asamas asamas_aynas aynas aynas_asinas asinas asinas_akras akras akras_akwas akwas akwas_asimwas asimwas asimwas_asiḍyas asiḍyas asiḍyas'.split("_"), i; for (i = 0; i < expected.length; i++) { @@ -134,7 +129,6 @@ exports["lang:tzm-latn"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "imik", "44 seconds = a few seconds"); @@ -155,15 +149,13 @@ exports["lang:tzm-latn"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 ossan", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "ayowr", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "ayowr", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "ayowr", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "ayowr", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 iyyirn", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 iyyirn", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 iyyirn", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "ayowr", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 iyyirn", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 iyyirn", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "asgas", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "asgas", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 isgasn", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "asgas", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 isgasn", "5 years = 5 years"); @@ -171,7 +163,6 @@ exports["lang:tzm-latn"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "dadkh s yan imik", "prefix"); test.equal(moment(0).from(30000), "yan imik", "suffix"); @@ -179,14 +170,12 @@ exports["lang:tzm-latn"] = { }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "yan imik", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "dadkh s yan imik", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "dadkh s yan 5 ossan", "in 5 days"); @@ -194,7 +183,6 @@ exports["lang:tzm-latn"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -208,7 +196,6 @@ exports["lang:tzm-latn"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -223,7 +210,6 @@ exports["lang:tzm-latn"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -238,7 +224,6 @@ exports["lang:tzm-latn"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -258,7 +243,6 @@ exports["lang:tzm-latn"] = { // 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"); @@ -270,7 +254,6 @@ exports["lang:tzm-latn"] = { }, "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"); @@ -282,7 +265,6 @@ exports["lang:tzm-latn"] = { }, "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"); @@ -295,7 +277,6 @@ exports["lang:tzm-latn"] = { }, "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"); @@ -308,7 +289,6 @@ exports["lang:tzm-latn"] = { }, "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"); @@ -321,7 +301,6 @@ exports["lang:tzm-latn"] = { }, "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"); @@ -333,7 +312,6 @@ exports["lang:tzm-latn"] = { }, "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"); @@ -345,7 +323,6 @@ exports["lang:tzm-latn"] = { }, "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"); diff --git a/test/lang/tzm.js b/test/lang/tzm.js index dc7a3345b..566592b77 100644 --- a/test/lang/tzm.js +++ b/test/lang/tzm.js @@ -18,7 +18,6 @@ exports["lang:tzm"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'ⵉⵏⵏⴰⵢⵔ ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ ⴷⵓⵊⵏⴱⵉⵔ'.split("_"), i; function equalTest(input, mmm, i) { test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1)); @@ -38,7 +37,6 @@ exports["lang:tzm"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'ⴰⵙⴰⵎⴰⵙ, ⴱⵕⴰⵢⵕ 14 2010, 3:25:50 pm'], ['ddd, hA', 'ⴰⵙⴰⵎⴰⵙ, 3PM'], @@ -72,7 +70,6 @@ exports["lang:tzm"] = { }, "format ordinal" : function (test) { - test.expect(31); 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'); @@ -111,7 +108,6 @@ exports["lang:tzm"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'ⵉⵏⵏⴰⵢⵔ ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ ⴷⵓⵊⵏⴱⵉⵔ'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -120,7 +116,6 @@ exports["lang:tzm"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'ⴰⵙⴰⵎⴰⵙ ⴰⵙⴰⵎⴰⵙ ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ ⴰⵢⵏⴰⵙ ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ ⴰⵙⵉⵏⴰⵙ ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ ⴰⴽⵔⴰⵙ ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ ⴰⴽⵡⴰⵙ ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ ⴰⵙⵉⵎⵡⴰⵙ ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ ⴰⵙⵉⴹⵢⴰⵙ ⴰⵙⵉⴹⵢⴰⵙ'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -129,7 +124,6 @@ exports["lang:tzm"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "ⵉⵎⵉⴽ", "44 seconds = a few seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "ⵎⵉⵏⵓⴺ", "45 seconds = a minute"); @@ -149,15 +143,13 @@ exports["lang:tzm"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 oⵙⵙⴰⵏ", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "ⴰⵢoⵓⵔ", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "ⴰⵢoⵓⵔ", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "ⴰⵢoⵓⵔ", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "ⴰⵢoⵓⵔ", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 ⵉⵢⵢⵉⵔⵏ", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 ⵉⵢⵢⵉⵔⵏ", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 ⵉⵢⵢⵉⵔⵏ", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "ⴰⵢoⵓⵔ", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 ⵉⵢⵢⵉⵔⵏ", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 ⵉⵢⵢⵉⵔⵏ", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "ⴰⵙⴳⴰⵙ", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "ⴰⵙⴳⴰⵙ", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 ⵉⵙⴳⴰⵙⵏ", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "ⴰⵙⴳⴰⵙ", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 ⵉⵙⴳⴰⵙⵏ", "5 years = 5 years"); @@ -165,27 +157,23 @@ exports["lang:tzm"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ ⵉⵎⵉⴽ", "prefix"); test.equal(moment(0).from(30000), "ⵢⴰⵏ ⵉⵎⵉⴽ", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "ⵢⴰⵏ ⵉⵎⵉⴽ", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ ⵉⵎⵉⴽ", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ 5 oⵙⵙⴰⵏ", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -199,7 +187,6 @@ exports["lang:tzm"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -214,7 +201,6 @@ exports["lang:tzm"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -229,7 +215,6 @@ exports["lang:tzm"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -249,7 +234,6 @@ exports["lang:tzm"] = { // 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"); @@ -261,7 +245,6 @@ exports["lang:tzm"] = { }, "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"); @@ -273,7 +256,6 @@ exports["lang:tzm"] = { }, "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"); @@ -286,7 +268,6 @@ exports["lang:tzm"] = { }, "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"); @@ -299,7 +280,6 @@ exports["lang:tzm"] = { }, "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"); @@ -312,7 +292,6 @@ exports["lang:tzm"] = { }, "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"); @@ -324,7 +303,6 @@ exports["lang:tzm"] = { }, "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"); @@ -336,7 +314,6 @@ exports["lang:tzm"] = { }, "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"); diff --git a/test/lang/uk.js b/test/lang/uk.js index 6da4afd9e..7cfe4ec7a 100644 --- a/test/lang/uk.js +++ b/test/lang/uk.js @@ -20,7 +20,6 @@ exports["lang:uk"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'січень січ_лютий лют_березень бер_квітень квіт_травень трав_червень черв_липень лип_серпень серп_вересень вер_жовтень жовт_листопад лист_грудень груд'.split("_"), i; function equalTest(input, mmm, i) { test.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1)); @@ -40,7 +39,6 @@ exports["lang:uk"] = { }, "format" : function (test) { - test.expect(18); var a = [ ['dddd, Do MMMM YYYY, HH:mm:ss', 'неділя, 14-го лютого 2010, 15:25:50'], ['ddd, h A', 'нд, 3 дня'], @@ -70,7 +68,6 @@ exports["lang:uk"] = { }, "format meridiem" : function (test) { - test.expect(8); test.equal(moment([2012, 11, 28, 0, 0]).format("A"), "ночі", "night"); test.equal(moment([2012, 11, 28, 3, 59]).format("A"), "ночі", "night"); @@ -85,7 +82,6 @@ exports["lang:uk"] = { }, "format ordinal" : function (test) { - test.expect(31); 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-й'); @@ -124,7 +120,6 @@ exports["lang:uk"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'січень січ_лютий лют_березень бер_квітень квіт_травень трав_червень черв_липень лип_серпень серп_вересень вер_жовтень жовт_листопад лист_грудень груд'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -133,7 +128,6 @@ exports["lang:uk"] = { }, "format month case" : function (test) { - test.expect(24); var months = { 'nominative': 'січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень'.split('_'), 'accusative': 'січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня'.split('_') @@ -146,7 +140,6 @@ exports["lang:uk"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'неділя нд нд_понеділок пн пн_вівторок вт вт_середа ср ср_четвер чт чт_п’ятниця пт пт_субота сб сб'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -155,7 +148,6 @@ exports["lang:uk"] = { }, "from" : function (test) { - test.expect(32); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "декілька секунд", "44 seconds = seconds"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "хвилина", "45 seconds = a minute"); @@ -177,15 +169,13 @@ exports["lang:uk"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 днів", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "місяць", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "місяць", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "місяць", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "місяць", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 місяці", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 місяці", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 місяці", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "місяць", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 місяців", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 місяців", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "рік", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "рік", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 роки", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "рік", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 років", "5 years = 5 years"); @@ -193,21 +183,18 @@ exports["lang:uk"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "за декілька секунд", "prefix"); test.equal(moment(0).from(30000), "декілька секунд тому", "suffix"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "за декілька секунд", "in seconds"); test.equal(moment().add({d: 5}).fromNow(), "за 5 днів", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(7); var a = moment().hours(2).minutes(0).seconds(0); @@ -223,7 +210,6 @@ exports["lang:uk"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -238,7 +224,6 @@ exports["lang:uk"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -268,7 +253,6 @@ exports["lang:uk"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -287,7 +271,6 @@ exports["lang:uk"] = { // 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"); @@ -299,7 +282,6 @@ exports["lang:uk"] = { }, "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"); @@ -311,7 +293,6 @@ exports["lang:uk"] = { }, "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"); @@ -324,7 +305,6 @@ exports["lang:uk"] = { }, "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"); @@ -337,7 +317,6 @@ exports["lang:uk"] = { }, "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"); @@ -350,7 +329,6 @@ exports["lang:uk"] = { }, "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"); @@ -363,7 +341,6 @@ exports["lang:uk"] = { }, "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"); @@ -376,7 +353,6 @@ exports["lang:uk"] = { }, "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"); diff --git a/test/lang/uz.js b/test/lang/uz.js index 697ee888d..27dfd1d91 100644 --- a/test/lang/uz.js +++ b/test/lang/uz.js @@ -20,7 +20,6 @@ exports["lang:uz"] = { }, "parse" : function (test) { - test.expect(96); var tests = 'январь янв_февраль фев_март мар_апрель апр_май май_июнь июнь_июль июль_август авг_сентябрь сен_октябрь окт_ноябрь ноя_декабрь дек'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:uz"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, Do-MMMM YYYY, h:mm:ss', 'Якшанба, 14-февраль 2010, 3:25:50'], ['ddd, h:mm', 'Якш, 3:25'], @@ -75,7 +73,6 @@ exports["lang:uz"] = { }, "format ordinal" : function (test) { - test.expect(31); 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'); @@ -114,7 +111,6 @@ exports["lang:uz"] = { }, "format month" : function (test) { - test.expect(12); var expected = 'январь янв_февраль фев_март мар_апрель апр_май май_июнь июн_июль июл_август авг_сентябрь сен_октябрь окт_ноябрь ноя_декабрь дек'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); @@ -123,7 +119,6 @@ exports["lang:uz"] = { }, "format week" : function (test) { - test.expect(7); var expected = 'Якшанба Якш Як_Душанба Душ Ду_Сешанба Сеш Се_Чоршанба Чор Чо_Пайшанба Пай Па_Жума Жум Жу_Шанба Шан Ша'.split("_"), i; for (i = 0; i < expected.length; i++) { test.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]); @@ -132,7 +127,6 @@ exports["lang:uz"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "фурсат", "44 секунд = фурсат"); test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), "бир дакика", "45 секунд = бир дакика"); @@ -152,15 +146,13 @@ exports["lang:uz"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 кун", "25 кун = 25 кун"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "бир ой", "26 кун = бир ой"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "бир ой", "30 кун = бир ой"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "бир ой", "45 кун = бир ой"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "бир ой", "45 кун = бир ой"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 ой", "46 кун = 2 ой"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 ой", "75 кун = 2 ой"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 ой", "76 кун = 3 ой"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "бир ой", "бир ой = бир ой"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 ой", "5 ой = 5 ой"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 ой", "344 кун = 11 ой"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "бир йил", "345 кун = бир йил"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "бир йил", "547 кун = бир йил"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 йил", "548 кун = 2 йил"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "бир йил", "1 йил = бир йил"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 йил", "5 йил = 5 йил"); @@ -168,27 +160,23 @@ exports["lang:uz"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "Якин фурсат ичида", "prefix"); test.equal(moment(0).from(30000), "Бир неча фурсат олдин", "suffix"); test.done(); }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "Бир неча фурсат олдин", "now from now should display as in the past"); test.done(); }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "Якин фурсат ичида", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "Якин 5 кун ичида", "in 5 days"); test.done(); }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -202,7 +190,6 @@ exports["lang:uz"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -217,7 +204,6 @@ exports["lang:uz"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -233,7 +219,6 @@ exports["lang:uz"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -254,7 +239,6 @@ exports["lang:uz"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 1, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 2, "Jan 2 2012 should be week 1"); @@ -266,7 +250,6 @@ exports["lang:uz"] = { }, "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"); @@ -278,7 +261,6 @@ exports["lang:uz"] = { }, "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"); @@ -291,7 +273,6 @@ exports["lang:uz"] = { }, "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"); @@ -304,7 +285,6 @@ exports["lang:uz"] = { }, "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"); @@ -317,7 +297,6 @@ exports["lang:uz"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 1, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 1, "Jan 1 2010 should be week 53"); @@ -330,7 +309,6 @@ exports["lang:uz"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 1, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 1, "Jan 1 2011 should be week 52"); @@ -343,7 +321,6 @@ exports["lang:uz"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '1 01 1', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '2 02 2', "Jan 2 2012 should be week 1"); diff --git a/test/lang/vi.js b/test/lang/vi.js index c5bf2e3f1..4a969986c 100644 --- a/test/lang/vi.js +++ b/test/lang/vi.js @@ -20,7 +20,6 @@ exports["lang:vi"] = { }, "parse" : function (test) { - test.expect(96); var i, tests = 'tháng 1,Th01_tháng 2,Th02_tháng 3,Th03_tháng 4,Th04_tháng 5,Th05_tháng 6,Th06_tháng 7,Th07_tháng 8,Th08_tháng 9,Th09_tháng 10,Th10_tháng 11,Th11_tháng 12,Th12'.split("_"); @@ -45,7 +44,6 @@ exports["lang:vi"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'chủ nhật, tháng 2 14 2010, 3:25:50 pm'], @@ -82,7 +80,6 @@ exports["lang:vi"] = { }, "format ordinal" : function (test) { - test.expect(31); test.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2'); @@ -122,7 +119,6 @@ exports["lang:vi"] = { }, "format month" : function (test) { - test.expect(12); var i, expected = 'tháng 1,Th01_tháng 2,Th02_tháng 3,Th03_tháng 4,Th04_tháng 5,Th05_tháng 6,Th06_tháng 7,Th07_tháng 8,Th08_tháng 9,Th09_tháng 10,Th10_tháng 11,Th11_tháng 12,Th12'.split("_"); @@ -134,7 +130,6 @@ exports["lang:vi"] = { }, "format week" : function (test) { - test.expect(7); var i, expected = 'chủ nhật CN CN_thứ hai T2 T2_thứ ba T3 T3_thứ tư T4 T4_thứ năm T5 T5_thứ sáu T6 T6_thứ bảy T7 T7'.split("_"); @@ -147,7 +142,6 @@ exports["lang:vi"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); @@ -169,15 +163,13 @@ exports["lang:vi"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25 ngày", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "một tháng", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "một tháng", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "một tháng", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "một tháng", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2 tháng", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2 tháng", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3 tháng", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "một tháng", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5 tháng", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11 tháng", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "một năm", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "một năm", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2 năm", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "một năm", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5 năm", "5 years = 5 years"); @@ -186,7 +178,6 @@ exports["lang:vi"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "vài giây tới", "prefix"); test.equal(moment(0).from(30000), "vài giây trước", "suffix"); @@ -195,7 +186,6 @@ exports["lang:vi"] = { }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "vài giây trước", "now from now should display as in the past"); @@ -203,7 +193,6 @@ exports["lang:vi"] = { }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "vài giây tới", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "5 ngày tới", "in 5 days"); @@ -212,7 +201,6 @@ exports["lang:vi"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -227,7 +215,6 @@ exports["lang:vi"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; @@ -243,7 +230,6 @@ exports["lang:vi"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; @@ -259,7 +245,6 @@ exports["lang:vi"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -280,7 +265,6 @@ exports["lang:vi"] = { // The week that contains Jan 4th is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 1"); @@ -292,7 +276,6 @@ exports["lang:vi"] = { }, "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"); @@ -304,7 +287,6 @@ exports["lang:vi"] = { }, "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"); @@ -317,7 +299,6 @@ exports["lang:vi"] = { }, "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"); @@ -330,7 +311,6 @@ exports["lang:vi"] = { }, "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"); @@ -343,7 +323,6 @@ exports["lang:vi"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); @@ -356,7 +335,6 @@ exports["lang:vi"] = { }, "weeks year starting saturday" : function (test) { - test.expect(6); test.equal(moment([2010, 11, 27]).week(), 52, "Dec 27 2010 should be week 52"); test.equal(moment([2011, 0, 1]).week(), 52, "Jan 1 2011 should be week 52"); @@ -369,7 +347,6 @@ exports["lang:vi"] = { }, "weeks year starting sunday formatted" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52', "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1', "Jan 2 2012 should be week 1"); diff --git a/test/lang/zh-cn.js b/test/lang/zh-cn.js index 49353ddd3..c48e1e002 100644 --- a/test/lang/zh-cn.js +++ b/test/lang/zh-cn.js @@ -20,7 +20,6 @@ exports["lang:zh-cn"] = { }, "parse" : function (test) { - test.expect(96); var tests = '一月 1月_二月 2月_三月 3月_四月 4月_五月 5月_六月 6月_七月 7月_八月 8月_九月 9月_十月 10月_十一月 11月_十二月 12月'.split("_"), i; @@ -43,7 +42,6 @@ exports["lang:zh-cn"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, a h:mm:ss', '星期日, 二月 14日 2010, 下午 3:25:50'], @@ -80,7 +78,6 @@ exports["lang:zh-cn"] = { }, "format month" : function (test) { - test.expect(12); var expected = '一月 1月_二月 2月_三月 3月_四月 4月_五月 5月_六月 6月_七月 7月_八月 8月_九月 9月_十月 10月_十一月 11月_十二月 12月'.split("_"), i; @@ -92,7 +89,6 @@ exports["lang:zh-cn"] = { }, "format week" : function (test) { - test.expect(7); var expected = '星期日 周日 日_星期一 周一 一_星期二 周二 二_星期三 周三 三_星期四 周四 四_星期五 周五 五_星期六 周六 六'.split("_"), i; @@ -104,7 +100,6 @@ exports["lang:zh-cn"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "几秒", "44 seconds = a few seconds"); @@ -125,15 +120,13 @@ exports["lang:zh-cn"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25天", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "1个月", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "1个月", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "1个月", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "1个月", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2个月", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2个月", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3个月", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "1个月", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5个月", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11个月", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "1年", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "1年", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2年", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "1年", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5年", "5 years = 5 years"); @@ -142,7 +135,6 @@ exports["lang:zh-cn"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "几秒内", "prefix"); test.equal(moment(0).from(30000), "几秒前", "suffix"); @@ -151,7 +143,6 @@ exports["lang:zh-cn"] = { }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "几秒前", "now from now should display as in the past"); @@ -159,7 +150,6 @@ exports["lang:zh-cn"] = { }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "几秒内", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "5天内", "in 5 days"); @@ -168,7 +158,6 @@ exports["lang:zh-cn"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -227,7 +216,6 @@ exports["lang:zh-cn"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -244,7 +232,6 @@ exports["lang:zh-cn"] = { }, "meridiem" : function (test) { - test.expect(6); test.equal(moment([2011, 2, 23, 0, 0]).format('A'), "凌晨", "before dawn"); test.equal(moment([2011, 2, 23, 6, 0]).format('A'), "早上", "morning"); @@ -260,7 +247,6 @@ exports["lang:zh-cn"] = { // The week that contains Jan 1st is the first week of the year. "weeks year starting sunday" : function (test) { - test.expect(4); test.equal(moment([2012, 0, 1]).week(), 52, "Jan 1 2012 should be week 52"); test.equal(moment([2012, 0, 2]).week(), 1, "Jan 2 2012 should be week 52"); @@ -271,7 +257,6 @@ exports["lang:zh-cn"] = { }, "weeks year starting monday" : function (test) { - test.expect(6); test.equal(moment([2006, 11, 31]).week(), 52, "Dec 31 2006 should be week 52"); test.equal(moment([2007, 0, 1]).week(), 1, "Jan 1 2007 should be week 1"); @@ -284,7 +269,6 @@ exports["lang:zh-cn"] = { }, "weeks year starting tuesday" : function (test) { - test.expect(6); test.equal(moment([2007, 11, 29]).week(), 52, "Dec 29 2007 should be week 52"); test.equal(moment([2008, 0, 1]).week(), 1, "Jan 1 2008 should be week 1"); @@ -297,7 +281,6 @@ exports["lang:zh-cn"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(6); test.equal(moment([2002, 11, 29]).week(), 52, "Dec 29 2002 should be week 52"); test.equal(moment([2003, 0, 1]).week(), 1, "Jan 1 2003 should be week 1"); @@ -310,7 +293,6 @@ exports["lang:zh-cn"] = { }, "weeks year starting thursday" : function (test) { - test.expect(5); test.equal(moment([2009, 0, 1]).week(), 1, "Jan 1 2009 should be week 1"); test.equal(moment([2009, 0, 3]).week(), 1, "Jan 3 2009 should be week 1"); @@ -322,7 +304,6 @@ exports["lang:zh-cn"] = { }, "weeks year starting friday" : function (test) { - test.expect(2); test.equal(moment([2010, 0, 2]).week(), 53, "Jan 2 2010 should be week 53"); test.equal(moment([2010, 0, 10]).week(), 1, "Jan 10 2010 should be week 1"); @@ -331,7 +312,6 @@ exports["lang:zh-cn"] = { }, "weeks year starting saturday" : function (test) { - test.expect(3); test.equal(moment([2011, 0, 2]).week(), 52, "Jan 2 2011 should be week 52"); test.equal(moment([2011, 0, 8]).week(), 1, "Jan 8 2011 should be week 1"); @@ -341,7 +321,6 @@ exports["lang:zh-cn"] = { }, "weeks year starting sunday format" : function (test) { - test.expect(3); test.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52周', "Jan 1 2012 应该是第52周"); test.equal(moment([2012, 0, 7]).format('w ww wo'), '1 01 1周', "Jan 7 2012 应该是第 1周"); diff --git a/test/lang/zh-tw.js b/test/lang/zh-tw.js index a91cf12d9..cff82a802 100644 --- a/test/lang/zh-tw.js +++ b/test/lang/zh-tw.js @@ -20,7 +20,6 @@ exports["lang:zh-tw"] = { }, "parse" : function (test) { - test.expect(96); var tests = '一月 1月_二月 2月_三月 3月_四月 4月_五月 5月_六月 6月_七月 7月_八月 8月_九月 9月_十月 10月_十一月 11月_十二月 12月'.split("_"), i; function equalTest(input, mmm, i) { @@ -41,7 +40,6 @@ exports["lang:zh-tw"] = { }, "format" : function (test) { - test.expect(22); var a = [ ['dddd, MMMM Do YYYY, a h:mm:ss', '星期日, 二月 14日 2010, 下午 3:25:50'], @@ -78,7 +76,6 @@ exports["lang:zh-tw"] = { }, "format month" : function (test) { - test.expect(12); var expected = '一月 1月_二月 2月_三月 3月_四月 4月_五月 5月_六月 6月_七月 7月_八月 8月_九月 9月_十月 10月_十一月 11月_十二月 12月'.split("_"), i; @@ -90,7 +87,6 @@ exports["lang:zh-tw"] = { }, "format week" : function (test) { - test.expect(7); var expected = '星期日 週日 日_星期一 週一 一_星期二 週二 二_星期三 週三 三_星期四 週四 四_星期五 週五 五_星期六 週六 六'.split("_"), i; @@ -102,7 +98,6 @@ exports["lang:zh-tw"] = { }, "from" : function (test) { - test.expect(30); var start = moment([2007, 1, 28]); test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), "幾秒", "44 seconds = a few seconds"); @@ -123,15 +118,13 @@ exports["lang:zh-tw"] = { test.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), "25天", "25 days = 25 days"); test.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), "一個月", "26 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), "一個月", "30 days = a month"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 45}), true), "一個月", "45 days = a month"); + test.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), "一個月", "43 days = a month"); test.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), "2個月", "46 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), "2個月", "75 days = 2 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), "3個月", "76 days = 3 months"); test.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), "一個月", "1 month = a month"); test.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), "5個月", "5 months = 5 months"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 344}), true), "11個月", "344 days = 11 months"); test.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), "一年", "345 days = a year"); - test.equal(start.from(moment([2007, 1, 28]).add({d: 547}), true), "一年", "547 days = a year"); test.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), "2年", "548 days = 2 years"); test.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), "一年", "1 year = a year"); test.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), "5年", "5 years = 5 years"); @@ -140,7 +133,6 @@ exports["lang:zh-tw"] = { }, "suffix" : function (test) { - test.expect(2); test.equal(moment(30000).from(0), "幾秒內", "prefix"); test.equal(moment(0).from(30000), "幾秒前", "suffix"); @@ -149,7 +141,6 @@ exports["lang:zh-tw"] = { }, "now from now" : function (test) { - test.expect(1); test.equal(moment().fromNow(), "幾秒前", "now from now should display as in the past"); @@ -157,7 +148,6 @@ exports["lang:zh-tw"] = { }, "fromNow" : function (test) { - test.expect(2); test.equal(moment().add({s: 30}).fromNow(), "幾秒內", "in a few seconds"); test.equal(moment().add({d: 5}).fromNow(), "5天內", "in 5 days"); @@ -166,7 +156,6 @@ exports["lang:zh-tw"] = { }, "calendar day" : function (test) { - test.expect(6); var a = moment().hours(2).minutes(0).seconds(0); @@ -181,7 +170,6 @@ exports["lang:zh-tw"] = { }, "calendar next week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -197,7 +185,6 @@ exports["lang:zh-tw"] = { }, "calendar last week" : function (test) { - test.expect(15); var i, m; for (i = 2; i < 7; i++) { @@ -213,7 +200,6 @@ exports["lang:zh-tw"] = { }, "calendar all else" : function (test) { - test.expect(4); var weeksAgo = moment().subtract({ w: 1 }), weeksFromNow = moment().add({ w: 1 }); @@ -231,7 +217,6 @@ exports["lang:zh-tw"] = { }, "meridiem" : function (test) { - test.expect(10); test.equal(moment([2011, 2, 23, 0, 0]).format('a'), "早上", "morning"); test.equal(moment([2011, 2, 23, 9, 0]).format('a'), "上午", "before noon"); @@ -252,7 +237,6 @@ exports["lang:zh-tw"] = { // 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([2012, 0, 1]).week(), 1, "Jan 1 2012 should be week 1"); test.equal(moment([2012, 0, 7]).week(), 1, "Jan 7 2012 should be week 1"); @@ -264,7 +248,6 @@ exports["lang:zh-tw"] = { }, "weeks year starting monday" : function (test) { - test.expect(6); test.equal(moment([2006, 11, 31]).week(), 1, "Dec 31 2006 should be week 1"); test.equal(moment([2007, 0, 1]).week(), 1, "Jan 1 2007 should be week 1"); @@ -277,7 +260,6 @@ exports["lang:zh-tw"] = { }, "weeks year starting tuesday" : function (test) { - test.expect(6); test.equal(moment([2007, 11, 29]).week(), 52, "Dec 29 2007 should be week 52"); test.equal(moment([2008, 0, 1]).week(), 1, "Jan 1 2008 should be week 1"); @@ -290,7 +272,6 @@ exports["lang:zh-tw"] = { }, "weeks year starting wednesday" : function (test) { - test.expect(6); test.equal(moment([2002, 11, 29]).week(), 1, "Dec 29 2002 should be week 1"); test.equal(moment([2003, 0, 1]).week(), 1, "Jan 1 2003 should be week 1"); @@ -303,7 +284,6 @@ exports["lang:zh-tw"] = { }, "weeks year starting thursday" : function (test) { - test.expect(6); test.equal(moment([2008, 11, 28]).week(), 1, "Dec 28 2008 should be week 1"); test.equal(moment([2009, 0, 1]).week(), 1, "Jan 1 2009 should be week 1"); @@ -316,7 +296,6 @@ exports["lang:zh-tw"] = { }, "weeks year starting friday" : function (test) { - test.expect(6); test.equal(moment([2009, 11, 27]).week(), 1, "Dec 27 2009 should be week 1"); test.equal(moment([2010, 0, 1]).week(), 1, "Jan 1 2010 should be week 1"); @@ -329,7 +308,6 @@ exports["lang:zh-tw"] = { }, "weeks year starting saturday" : function (test) { - test.expect(5); test.equal(moment([2010, 11, 26]).week(), 1, "Dec 26 2010 should be week 1"); test.equal(moment([2011, 0, 1]).week(), 1, "Jan 1 2011 should be week 1"); @@ -341,7 +319,6 @@ exports["lang:zh-tw"] = { }, "weeks year starting sunday format" : function (test) { - test.expect(5); test.equal(moment([2012, 0, 1]).format('w ww wo'), '1 01 1週', "Jan 1 2012 應該是第 1週"); test.equal(moment([2012, 0, 7]).format('w ww wo'), '1 01 1週', "Jan 7 2012 應該是第 1週");