From: Tim Wood Date: Thu, 8 Nov 2012 01:52:44 +0000 (-0800) Subject: en-gb week tests X-Git-Tag: 2.0.0~35^2~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e24d6e77b35523b389ece0fa9de87f80c9113bf;p=thirdparty%2Fmoment.git en-gb week tests --- diff --git a/lang/en-gb.js b/lang/en-gb.js index a01a7d04c..b2a2c2059 100644 --- a/lang/en-gb.js +++ b/lang/en-gb.js @@ -18,9 +18,9 @@ calendar : { sameDay : '[Today at] LT', nextDay : '[Tomorrow at] LT', - nextWeek : 'dddd [at] LT', + nextWeek : 'dddd [at] LT', lastDay : '[Yesterday at] LT', - lastWeek : '[last] dddd [at] LT', + lastWeek : '[last] dddd [at] LT', sameElse : 'L' }, relativeTime : { @@ -44,6 +44,10 @@ (b === 1) ? 'st' : (b === 2) ? 'nd' : (b === 3) ? 'rd' : 'th'; + }, + 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/en-gb.js b/test/lang/en-gb.js index cc5c85168..5a1e302eb 100644 --- a/test/lang/en-gb.js +++ b/test/lang/en-gb.js @@ -6,9 +6,18 @@ var moment = require("../../moment"); *************************************************/ exports["lang:en-gb"] = { + setUp : function (cb) { + moment.lang('en-gb'); + cb(); + }, + + tearDown : function (cb) { + moment.lang('en'); + cb(); + }, + "parse" : function(test) { test.expect(96); - moment.lang('en-gb'); 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("_"); var i; function equalTest(input, mmm, i) { @@ -30,7 +39,6 @@ exports["lang:en-gb"] = { "format" : function(test) { test.expect(18); - moment.lang('en-gb'); var a = [ ['dddd, MMMM Do YYYY, h:mm:ss a', 'Sunday, February 14th 2010, 3:25:50 pm'], ['ddd, hA', 'Sun, 3PM'], @@ -39,7 +47,7 @@ exports["lang:en-gb"] = { ['D Do DD', '14 14th 14'], ['d do dddd ddd dd', '0 0th Sunday Sun Su'], ['DDD DDDo DDDD', '45 45th 045'], - ['w wo ww', '8 8th 08'], + ['w wo ww', '6 6th 06'], ['h hh', '3 03'], ['H HH', '15 15'], ['m mm', '25 25'], @@ -61,7 +69,6 @@ exports["lang:en-gb"] = { "format ordinal" : function(test) { test.expect(31); - moment.lang('en-gb'); 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'); @@ -101,7 +108,6 @@ exports["lang:en-gb"] = { "format month" : function(test) { test.expect(12); - moment.lang('en-gb'); 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("_"); var i; for (i = 0; i < expected.length; i++) { @@ -112,7 +118,6 @@ exports["lang:en-gb"] = { "format week" : function(test) { test.expect(7); - moment.lang('en-gb'); var expected = 'Sunday Sun Su_Monday Mon Mo_Tuesday Tue Tu_Wednesday Wed We_Thursday Thu Th_Friday Fri Fr_Saturday Sat Sa'.split("_"); var i; for (i = 0; i < expected.length; i++) { @@ -123,7 +128,6 @@ exports["lang:en-gb"] = { "from" : function(test) { test.expect(30); - moment.lang('en-gb'); 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"); @@ -160,7 +164,6 @@ exports["lang:en-gb"] = { "suffix" : function(test) { test.expect(2); - moment.lang('en-gb'); test.equal(moment(30000).from(0), "in a few seconds", "prefix"); test.equal(moment(0).from(30000), "a few seconds ago", "suffix"); test.done(); @@ -168,14 +171,12 @@ exports["lang:en-gb"] = { "now from now" : function(test) { test.expect(1); - moment.lang('en-gb'); 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); - moment.lang('en-gb'); 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(); @@ -183,7 +184,6 @@ exports["lang:en-gb"] = { "calendar day" : function(test) { test.expect(6); - moment.lang('en-gb'); var a = moment().hours(2).minutes(0).seconds(0); @@ -198,7 +198,6 @@ exports["lang:en-gb"] = { "calendar next week" : function(test) { test.expect(15); - moment.lang('en-gb'); var i; var m; @@ -216,7 +215,9 @@ exports["lang:en-gb"] = { "calendar last week" : function(test) { test.expect(15); - moment.lang('en-gb'); + + var i; + var m; for (i = 2; i < 7; i++) { m = moment().subtract({ d: i }); @@ -231,7 +232,7 @@ exports["lang:en-gb"] = { "calendar all else" : function(test) { test.expect(4); - moment.lang('en-gb'); + var weeksAgo = moment().subtract({ w: 1 }); var weeksFromNow = moment().add({ w: 1 }); @@ -243,6 +244,111 @@ exports["lang:en-gb"] = { 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 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"); + test.equal(moment([2012, 0, 8]).format('w ww wo'), '1 01 1st' , "Jan 8 2012 should be week 1"); + test.equal(moment([2012, 0, 9]).format('w ww wo'), '2 02 2nd' , "Jan 9 2012 should be week 2"); + test.equal(moment([2012, 0, 15]).format('w ww wo'), '2 02 2nd' , "Jan 15 2012 should be week 2"); + + test.done(); } };