From: Tim Wood Date: Thu, 8 Nov 2012 01:26:44 +0000 (-0800) Subject: is week tests X-Git-Tag: 2.0.0~35^2~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3c0895da8b098a45a3884d5318d6d8faa77fce3;p=thirdparty%2Fmoment.git is week tests --- diff --git a/lang/is.js b/lang/is.js index aeff8a980..26aaf4f3b 100644 --- a/lang/is.js +++ b/lang/is.js @@ -104,10 +104,14 @@ M : translate, MM : translate, y : translate, - yy : translate, + yy : translate }, ordinal : function (number) { return '.'; + }, + week : { + dow : 1, // Monday is the first day of the week. + doy : 4 // The week that contains Jan 4th is the first week of the year. } }; diff --git a/test/lang/is.js b/test/lang/is.js index 5f4282a1e..aa1436900 100644 --- a/test/lang/is.js +++ b/test/lang/is.js @@ -6,9 +6,19 @@ var moment = require("../../moment"); *************************************************/ exports["lang:is"] = { + setUp : function (cb) { + moment.lang('is'); + cb(); + }, + + tearDown : function (cb) { + moment.lang('en'); + cb(); + }, + "parse" : function(test) { test.expect(96); - moment.lang('is'); + 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("_"); var i; function equalTest(input, mmm, i) { @@ -30,7 +40,7 @@ exports["lang:is"] = { "format" : function(test) { test.expect(18); - moment.lang('is'); + var a = [ ['dddd, Do MMMM YYYY, h:mm:ss a', 'sunnudagur, 14. febrúar 2010, 3:25:50 pm'], ['ddd, hA', 'sun, 3PM'], @@ -39,7 +49,7 @@ exports["lang:is"] = { ['D Do DD', '14 14. 14'], ['d do dddd ddd dd', '0 0. sunnudagur sun Su'], ['DDD DDDo DDDD', '45 45. 045'], - ['w wo ww', '8 8. 08'], + ['w wo ww', '6 6. 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], @@ -61,7 +71,7 @@ exports["lang:is"] = { "format ordinal" : function(test) { test.expect(31); - moment.lang('is'); + test.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.'); test.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.'); test.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.'); @@ -101,7 +111,7 @@ exports["lang:is"] = { "format month" : function(test) { test.expect(12); - moment.lang('is'); + 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("_"); var i; for (i = 0; i < expected.length; i++) { @@ -112,7 +122,7 @@ exports["lang:is"] = { "format week" : function(test) { test.expect(7); - moment.lang('is'); + 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("_"); var i; for (i = 0; i < expected.length; i++) { @@ -123,7 +133,7 @@ exports["lang:is"] = { "from" : function(test) { test.expect(34); - moment.lang('is'); + 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"); test.equal(start.from(moment([2007, 1, 28]).add({s:45}), true), "mínúta", "45 seconds = a minute"); @@ -164,7 +174,6 @@ exports["lang:is"] = { "suffix" : function(test) { test.expect(3); - moment.lang('is'); 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"); @@ -173,14 +182,12 @@ exports["lang:is"] = { "now from now" : function(test) { test.expect(1); - moment.lang('is'); 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); - moment.lang('is'); 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"); @@ -189,7 +196,6 @@ exports["lang:is"] = { "calendar day" : function(test) { test.expect(6); - moment.lang('is'); var a = moment().hours(2).minutes(0).seconds(0); @@ -204,7 +210,6 @@ exports["lang:is"] = { "calendar next week" : function(test) { test.expect(15); - moment.lang('is'); var i; var m; @@ -222,7 +227,9 @@ exports["lang:is"] = { "calendar last week" : function(test) { test.expect(15); - moment.lang('is'); + + var i; + var m; for (i = 2; i < 7; i++) { m = moment().subtract({ d: i }); @@ -237,7 +244,7 @@ exports["lang:is"] = { "calendar all else" : function(test) { test.expect(4); - moment.lang('is'); + var weeksAgo = moment().subtract({ w: 1 }); var weeksFromNow = moment().add({ w: 1 }); @@ -249,6 +256,111 @@ exports["lang:is"] = { test.equal(weeksAgo.calendar(), weeksAgo.format('L'), "2 weeks ago"); test.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), "in 2 weeks"); - test.done(); + + test.done(); + }, + + // Monday is the first day of the week. + // The week that contains Jan 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"); + test.equal(moment([2012, 0, 8]).week(), 1, "Jan 8 2012 should be week 1"); + test.equal(moment([2012, 0, 9]).week(), 2, "Jan 9 2012 should be week 2"); + test.equal(moment([2012, 0, 15]).week(), 2, "Jan 15 2012 should be week 2"); + + test.done(); + }, + + "weeks year starting monday" : function(test) { + test.expect(5); + + test.equal(moment([2007, 0, 1]).week(), 1, "Jan 1 2007 should be week 1"); + test.equal(moment([2007, 0, 7]).week(), 1, "Jan 7 2007 should be week 1"); + test.equal(moment([2007, 0, 8]).week(), 2, "Jan 8 2007 should be week 2"); + test.equal(moment([2007, 0, 14]).week(), 2, "Jan 14 2007 should be week 2"); + test.equal(moment([2007, 0, 15]).week(), 3, "Jan 15 2007 should be week 3"); + + test.done(); + }, + + "weeks year starting tuesday" : function(test) { + test.expect(6); + + test.equal(moment([2007, 11, 31]).week(), 1, "Dec 31 2007 should be week 1"); + test.equal(moment([2008, 0, 1]).week(), 1, "Jan 1 2008 should be week 1"); + test.equal(moment([2008, 0, 6]).week(), 1, "Jan 6 2008 should be week 1"); + test.equal(moment([2008, 0, 7]).week(), 2, "Jan 7 2008 should be week 2"); + test.equal(moment([2008, 0, 13]).week(), 2, "Jan 13 2008 should be week 2"); + test.equal(moment([2008, 0, 14]).week(), 3, "Jan 14 2008 should be week 3"); + + test.done(); + }, + + "weeks year starting wednesday" : function(test) { + test.expect(6); + + test.equal(moment([2002, 11, 30]).week(), 1, "Dec 30 2002 should be week 1"); + test.equal(moment([2003, 0, 1]).week(), 1, "Jan 1 2003 should be week 1"); + test.equal(moment([2003, 0, 5]).week(), 1, "Jan 5 2003 should be week 1"); + test.equal(moment([2003, 0, 6]).week(), 2, "Jan 6 2003 should be week 2"); + test.equal(moment([2003, 0, 12]).week(), 2, "Jan 12 2003 should be week 2"); + test.equal(moment([2003, 0, 13]).week(), 3, "Jan 13 2003 should be week 3"); + + test.done(); + }, + + "weeks year starting thursday" : function(test) { + test.expect(6); + + test.equal(moment([2008, 11, 29]).week(), 1, "Dec 29 2008 should be week 1"); + test.equal(moment([2009, 0, 1]).week(), 1, "Jan 1 2009 should be week 1"); + test.equal(moment([2009, 0, 4]).week(), 1, "Jan 4 2009 should be week 1"); + test.equal(moment([2009, 0, 5]).week(), 2, "Jan 5 2009 should be week 2"); + test.equal(moment([2009, 0, 11]).week(), 2, "Jan 11 2009 should be week 2"); + test.equal(moment([2009, 0, 13]).week(), 3, "Jan 12 2009 should be week 3"); + + test.done(); + }, + + "weeks year starting friday" : function(test) { + test.expect(6); + + test.equal(moment([2009, 11, 28]).week(), 53, "Dec 28 2009 should be week 53"); + test.equal(moment([2010, 0, 1]).week(), 53, "Jan 1 2010 should be week 53"); + test.equal(moment([2010, 0, 3]).week(), 53, "Jan 3 2010 should be week 53"); + test.equal(moment([2010, 0, 4]).week(), 1, "Jan 4 2010 should be week 1"); + test.equal(moment([2010, 0, 10]).week(), 1, "Jan 10 2010 should be week 1"); + test.equal(moment([2010, 0, 11]).week(), 2, "Jan 11 2010 should be week 2"); + + test.done(); + }, + + "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"); + test.equal(moment([2011, 0, 2]).week(), 52, "Jan 2 2011 should be week 52"); + test.equal(moment([2011, 0, 3]).week(), 1, "Jan 3 2011 should be week 1"); + test.equal(moment([2011, 0, 9]).week(), 1, "Jan 9 2011 should be week 1"); + test.equal(moment([2011, 0, 10]).week(), 2, "Jan 10 2011 should be week 2"); + + test.done(); + }, + + "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"); + test.equal(moment([2012, 0, 8]).format('w ww wo'), '1 01 1.' , "Jan 8 2012 should be week 1"); + test.equal(moment([2012, 0, 9]).format('w ww wo'), '2 02 2.' , "Jan 9 2012 should be week 2"); + test.equal(moment([2012, 0, 15]).format('w ww wo'), '2 02 2.' , "Jan 15 2012 should be week 2"); + + test.done(); } };