From 7fcf2747cf84ffb098ad482d007a60bb7e0de12e Mon Sep 17 00:00:00 2001 From: Tim Wood Date: Thu, 10 May 2012 10:09:17 -0700 Subject: [PATCH] More work on isValid I moved all calls to Date.utc.apply({}, array) into makeDateFromArray. I also noticed a bug where moment([2010, 0, 0]) would be converted to moment([2010, 0, 1]) and had to fix a bunch of unit tests that were dependent on this bug. --- min/moment.min.js | 2 +- min/moment.min.pretty.js | 33 ++++++++++++++++++++++----------- moment.js | 23 ++++++++++++++--------- test/lang/ca.js | 2 +- test/lang/cv.js | 2 +- test/lang/da.js | 2 +- test/lang/de.js | 2 +- test/lang/en-gb.js | 2 +- test/lang/en.js | 2 +- test/lang/es.js | 2 +- test/lang/eu.js | 2 +- test/lang/fi.js | 2 +- test/lang/fr.js | 2 +- test/lang/gl.js | 2 +- test/lang/is.js | 2 +- test/lang/it.js | 2 +- test/lang/jp.js | 2 +- test/lang/kr.js | 2 +- test/lang/nb.js | 2 +- test/lang/nl.js | 2 +- test/lang/pl.js | 2 +- test/lang/pt.js | 2 +- test/lang/ru.js | 2 +- test/lang/sv.js | 2 +- test/lang/tr.js | 2 +- test/lang/zh-cn.js | 2 +- test/lang/zh-tw.js | 2 +- test/moment/create.js | 2 +- 28 files changed, 62 insertions(+), 46 deletions(-) diff --git a/min/moment.min.js b/min/moment.min.js index f4c14cf93..99edd55aa 100644 --- a/min/moment.min.js +++ b/min/moment.min.js @@ -3,4 +3,4 @@ // author : Tim Wood // license : MIT // momentjs.com -(function(a,b){function A(a,b){this._d=a,this._isUTC=!!b}function B(a){return a<0?Math.ceil(a):Math.floor(a)}function C(a){var b=this._data={},c=a.years||a.y||0,d=a.months||a.M||0,e=a.weeks||a.w||0,f=a.days||a.d||0,g=a.hours||a.h||0,h=a.minutes||a.m||0,i=a.seconds||a.s||0,j=a.milliseconds||a.ms||0;this._milliseconds=j+i*1e3+h*6e4+g*36e5,this._days=f+e*7,this._months=d+c*12,b.milliseconds=j%1e3,i+=B(j/1e3),b.seconds=i%60,h+=B(i/60),b.minutes=h%60,g+=B(h/60),b.hours=g%24,f+=B(g/24),f+=e*7,b.days=f%30,d+=B(f/30),b.months=d%12,c+=B(d/12),b.years=c}function D(a,b){var c=a+"";while(c.length11?"pm":"am";case"A":return p?p(i,j,!0):i>11?"PM":"AM";case"H":return i;case"HH":return D(i,2);case"h":return i%12||12;case"hh":return D(i%12||12,2);case"m":return j;case"mm":return D(j,2);case"s":return k;case"ss":return D(k,2);case"S":return~~(m/100);case"SS":return D(~~(m/10),2);case"SSS":return D(m,3);case"Z":return(n<0?"-":"+")+D(~~(Math.abs(n)/60),2)+":"+D(~~(Math.abs(n)%60),2);case"ZZ":return(n<0?"-":"+")+D(~~(10*Math.abs(n)/6),4);case"L":case"LL":case"LLL":case"LLLL":case"LT":return H(b,c.longDateFormat[d]);default:return d.replace(/(^\[)|(\\)|\]$/g,"")}}var e=b.month(),f=b.date(),g=b.year(),h=b.day(),i=b.hours(),j=b.minutes(),k=b.seconds(),m=b.milliseconds(),n=-b.zone(),o=c.ordinal,p=c.meridiem;return d.replace(l,q)}function I(a){switch(a){case"DDDD":return p;case"YYYY":return q;case"S":case"SS":case"SSS":case"DDD":return o;case"MMM":case"MMMM":case"ddd":case"dddd":case"a":case"A":return r;case"Z":case"ZZ":return s;case"T":return t;case"MM":case"DD":case"dd":case"YY":case"HH":case"hh":case"mm":case"ss":case"M":case"D":case"d":case"H":case"h":case"m":case"s":return n;default:return new RegExp(a.replace("\\",""))}}function J(a,b,d,e){var f;switch(a){case"M":case"MM":d[1]=b==null?0:~~b-1;break;case"MMM":case"MMMM":for(f=0;f<12;f++)if(c.monthsParse[f].test(b)){d[1]=f;break}break;case"D":case"DD":case"DDD":case"DDDD":d[2]=~~b;break;case"YY":b=~~b,d[0]=b+(b>70?1900:2e3);break;case"YYYY":d[0]=~~Math.abs(b);break;case"a":case"A":e.isPm=(b+"").toLowerCase()==="pm";break;case"H":case"HH":case"h":case"hh":d[3]=~~b;break;case"m":case"mm":d[4]=~~b;break;case"s":case"ss":d[5]=~~b;break;case"S":case"SS":case"SSS":d[6]=~~(("0."+b)*1e3);break;case"Z":case"ZZ":e.isUTC=!0,f=(b+"").match(x),f&&f[1]&&(e.tzh=~~f[1]),f&&f[2]&&(e.tzm=~~f[2]),f&&f[0]==="+"&&(e.tzh=-e.tzh,e.tzm=-e.tzm)}}function K(b,c){var d=[0,0,1,0,0,0,0],e={tzh:0,tzm:0},f=c.match(l),g,h;for(g=0;g0,O.apply({},i)}function Q(a,b){c.fn[a]=function(a){var c=this._isUTC?"UTC":"";return a!=null?(this._d["set"+c+b](a),this):this._d["get"+c+b]()}}function R(a){c.duration.fn[a]=function(){return this._data[a]}}function S(a,b){c.duration.fn["as"+a]=function(){return+this/b}}var c,d="1.6.2",e=Math.round,f,g={},h="en",i=typeof module!="undefined",j="months|monthsShort|monthsParse|weekdays|weekdaysShort|longDateFormat|calendar|relativeTime|ordinal|meridiem".split("|"),k=/^\/?Date\((\-?\d+)/i,l=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|dddd?|do?|w[o|w]?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|SS?S?|zz?|ZZ?|LT|LL?L?L?)/g,m=/([0-9a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)/gi,n=/\d\d?/,o=/\d{1,3}/,p=/\d{3}/,q=/\d{4}/,r=/[0-9a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+/i,s=/Z|[\+\-]\d\d:?\d\d/i,t=/T/i,u=/^\s*\d{4}-\d\d-\d\d(T(\d\d(:\d\d(:\d\d(\.\d\d?\d?)?)?)?)?([\+\-]\d\d:?\d\d)?)?/,v="YYYY-MM-DDTHH:mm:ssZ",w=[["HH:mm:ss.S",/T\d\d:\d\d:\d\d\.\d{1,3}/],["HH:mm:ss",/T\d\d:\d\d:\d\d/],["HH:mm",/T\d\d:\d\d/],["HH",/T\d\d/]],x=/([\+\-]|\d\d)/gi,y="Month|Date|Hours|Minutes|Seconds|Milliseconds".split("|"),z={Milliseconds:1,Seconds:1e3,Minutes:6e4,Hours:36e5,Days:864e5,Months:2592e6,Years:31536e6};c=function(d,e){if(d===null||d==="")return null;var f,g,h;return c.isMoment(d)?(f=new a(+d._d),h=d._isUTC):e?F(e)?f=M(d,e):f=K(d,e):(g=k.exec(d),f=d===b?new a:g?new a(+g[1]):d instanceof a?d:F(d)?G(d):typeof d=="string"?N(d):new a(d)),new A(f,h)},c.utc=function(b,d){return F(b)?new A(new a(a.UTC.apply({},b)),!0):d&&b?c(b+" +0000",d+" Z").utc():c(b&&!s.exec(b)?b+"+0000":b).utc()},c.unix=function(a){return c(a*1e3)},c.duration=function(a,b){var d=c.isDuration(a),e=typeof a=="number",f=d?a._data:e?{}:a;return e&&(b?f[b]=a:f.milliseconds=a),new C(f)},c.humanizeDuration=function(a,b,d){return c.duration(a,b===!0?null:b).humanize(b===!0?!0:d)},c.version=d,c.defaultFormat=v,c.lang=function(a,b){var d,e,f=[];if(!a)return h;if(b){for(d=0;d<12;d++)f[d]=new RegExp("^"+b.months[d]+"|^"+b.monthsShort[d].replace(".",""),"i");b.monthsParse=b.monthsParse||f,g[a]=b}if(g[a]){for(d=0;d11?"pm":"am";case"A":return p?p(i,j,!0):i>11?"PM":"AM";case"H":return i;case"HH":return D(i,2);case"h":return i%12||12;case"hh":return D(i%12||12,2);case"m":return j;case"mm":return D(j,2);case"s":return k;case"ss":return D(k,2);case"S":return~~(m/100);case"SS":return D(~~(m/10),2);case"SSS":return D(m,3);case"Z":return(n<0?"-":"+")+D(~~(Math.abs(n)/60),2)+":"+D(~~(Math.abs(n)%60),2);case"ZZ":return(n<0?"-":"+")+D(~~(10*Math.abs(n)/6),4);case"L":case"LL":case"LLL":case"LLLL":case"LT":return H(b,c.longDateFormat[d]);default:return d.replace(/(^\[)|(\\)|\]$/g,"")}}var e=b.month(),f=b.date(),g=b.year(),h=b.day(),i=b.hours(),j=b.minutes(),k=b.seconds(),m=b.milliseconds(),n=-b.zone(),o=c.ordinal,p=c.meridiem;return d.replace(l,q)}function I(a){switch(a){case"DDDD":return p;case"YYYY":return q;case"S":case"SS":case"SSS":case"DDD":return o;case"MMM":case"MMMM":case"ddd":case"dddd":case"a":case"A":return r;case"Z":case"ZZ":return s;case"T":return t;case"MM":case"DD":case"dd":case"YY":case"HH":case"hh":case"mm":case"ss":case"M":case"D":case"d":case"H":case"h":case"m":case"s":return n;default:return new RegExp(a.replace("\\",""))}}function J(a,b,d,e){var f;switch(a){case"M":case"MM":d[1]=b==null?0:~~b-1;break;case"MMM":case"MMMM":for(f=0;f<12;f++)if(c.monthsParse[f].test(b)){d[1]=f;break}break;case"D":case"DD":case"DDD":case"DDDD":b!=null&&(d[2]=~~b);break;case"YY":b=~~b,d[0]=b+(b>70?1900:2e3);break;case"YYYY":d[0]=~~Math.abs(b);break;case"a":case"A":e.isPm=(b+"").toLowerCase()==="pm";break;case"H":case"HH":case"h":case"hh":d[3]=~~b;break;case"m":case"mm":d[4]=~~b;break;case"s":case"ss":d[5]=~~b;break;case"S":case"SS":case"SSS":d[6]=~~(("0."+b)*1e3);break;case"Z":case"ZZ":e.isUTC=!0,f=(b+"").match(x),f&&f[1]&&(e.tzh=~~f[1]),f&&f[2]&&(e.tzm=~~f[2]),f&&f[0]==="+"&&(e.tzh=-e.tzh,e.tzm=-e.tzm)}}function K(a,b){var c=[0,0,1,0,0,0,0],d={tzh:0,tzm:0},e=b.match(l),f,g;for(f=0;f0,O.apply({},i)}function Q(a,b){c.fn[a]=function(a){var c=this._isUTC?"UTC":"";return a!=null?(this._d["set"+c+b](a),this):this._d["get"+c+b]()}}function R(a){c.duration.fn[a]=function(){return this._data[a]}}function S(a,b){c.duration.fn["as"+a]=function(){return+this/b}}var c,d="1.6.2",e=Math.round,f,g={},h="en",i=typeof module!="undefined",j="months|monthsShort|monthsParse|weekdays|weekdaysShort|longDateFormat|calendar|relativeTime|ordinal|meridiem".split("|"),k=/^\/?Date\((\-?\d+)/i,l=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|dddd?|do?|w[o|w]?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|SS?S?|zz?|ZZ?|LT|LL?L?L?)/g,m=/([0-9a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)/gi,n=/\d\d?/,o=/\d{1,3}/,p=/\d{3}/,q=/\d{4}/,r=/[0-9a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+/i,s=/Z|[\+\-]\d\d:?\d\d/i,t=/T/i,u=/^\s*\d{4}-\d\d-\d\d(T(\d\d(:\d\d(:\d\d(\.\d\d?\d?)?)?)?)?([\+\-]\d\d:?\d\d)?)?/,v="YYYY-MM-DDTHH:mm:ssZ",w=[["HH:mm:ss.S",/T\d\d:\d\d:\d\d\.\d{1,3}/],["HH:mm:ss",/T\d\d:\d\d:\d\d/],["HH:mm",/T\d\d:\d\d/],["HH",/T\d\d/]],x=/([\+\-]|\d\d)/gi,y="Month|Date|Hours|Minutes|Seconds|Milliseconds".split("|"),z={Milliseconds:1,Seconds:1e3,Minutes:6e4,Hours:36e5,Days:864e5,Months:2592e6,Years:31536e6};c=function(d,e){if(d===null||d==="")return null;var f,g,h;return c.isMoment(d)?(f=new a(+d._d),h=d._isUTC):e?F(e)?f=M(d,e):f=K(d,e):(g=k.exec(d),f=d===b?new a:g?new a(+g[1]):d instanceof a?d:F(d)?G(d):typeof d=="string"?N(d):new a(d)),new A(f,h)},c.utc=function(a,b){return F(a)?new A(G(a,!0),!0):b&&a?c(a+" +0000",b+" Z").utc():c(a&&!s.exec(a)?a+"+0000":a).utc()},c.unix=function(a){return c(a*1e3)},c.duration=function(a,b){var d=c.isDuration(a),e=typeof a=="number",f=d?a._data:e?{}:a;return e&&(b?f[b]=a:f.milliseconds=a),new C(f)},c.humanizeDuration=function(a,b,d){return c.duration(a,b===!0?null:b).humanize(b===!0?!0:d)},c.version=d,c.defaultFormat=v,c.lang=function(a,b){var d,e,f=[];if(!a)return h;if(b){for(d=0;d<12;d++)f[d]=new RegExp("^"+b.months[d]+"|^"+b.monthsShort[d].replace(".",""),"i");b.monthsParse=b.monthsParse||f,g[a]=b}if(g[a]){for(d=0;d 70 ? 1900 : 2e3); @@ -213,13 +215,13 @@ e.isUTC = !0, f = (b + "").match(x), f && f[1] && (e.tzh = ~~f[1]), f && f[2] && (e.tzm = ~~f[2]), f && f[0] === "+" && (e.tzh = -e.tzh, e.tzm = -e.tzm); } } - function K(b, c) { - var d = [ 0, 0, 1, 0, 0, 0, 0 ], e = { + function K(a, b) { + var c = [ 0, 0, 1, 0, 0, 0, 0 ], d = { tzh: 0, tzm: 0 - }, f = c.match(l), g, h; - for (g = 0; g < f.length; g++) h = (I(f[g]).exec(b) || [])[0], b = b.replace(I(f[g]), ""), J(f[g], h, d, e); - return e.isPm && d[3] < 12 && (d[3] += 12), e.isPm === !1 && d[3] === 12 && (d[3] = 0), d[3] += e.tzh, d[4] += e.tzm, e.isUTC ? new a(a.UTC.apply({}, d)) : G(d); + }, e = b.match(l), f, g; + for (f = 0; f < e.length; f++) g = (I(e[f]).exec(a) || [])[0], a = a.replace(I(e[f]), ""), J(e[f], g, c, d); + return d.isPm && c[3] < 12 && (c[3] += 12), d.isPm === !1 && c[3] === 12 && (c[3] = 0), c[3] += d.tzh, c[4] += d.tzm, G(c, d.isUTC); } function L(a, b) { var c = Math.min(a.length, b.length), d = Math.abs(a.length - b.length), e = 0, f; @@ -279,8 +281,8 @@ if (d === null || d === "") return null; var f, g, h; return c.isMoment(d) ? (f = new a(+d._d), h = d._isUTC) : e ? F(e) ? f = M(d, e) : f = K(d, e) : (g = k.exec(d), f = d === b ? new a : g ? new a(+g[1]) : d instanceof a ? d : F(d) ? G(d) : typeof d == "string" ? N(d) : new a(d)), new A(f, h); - }, c.utc = function(b, d) { - return F(b) ? new A(new a(a.UTC.apply({}, b)), !0) : d && b ? c(b + " +0000", d + " Z").utc() : c(b && !s.exec(b) ? b + "+0000" : b).utc(); + }, c.utc = function(a, b) { + return F(a) ? new A(G(a, !0), !0) : b && a ? c(a + " +0000", b + " Z").utc() : c(a && !s.exec(a) ? a + "+0000" : a).utc(); }, c.unix = function(a) { return c(a * 1e3); }, c.duration = function(a, b) { @@ -359,6 +361,15 @@ toDate: function() { return this._d; }, + toArray: function() { + var a = this; + return [ a.year(), a.month(), a.date(), a.hours(), a.minutes(), a.seconds(), a.milliseconds() ]; + }, + isValid: function() { + var a = 0, b = this.toArray(); + for (; this._a && a < 7; a++) if ((this._a[a] || 0) !== b[a]) return !1; + return !isNaN(this._d.getTime()); + }, utc: function() { return this._isUTC = !0, this; }, diff --git a/moment.js b/moment.js index 09a243dc1..31939c938 100644 --- a/moment.js +++ b/moment.js @@ -69,8 +69,8 @@ function Moment(date, isUTC) { this._d = date; this._isUTC = !!isUTC; - this._a = date.__origin || 0; - date.__origin = null; + this._a = date._a || null; + date._a = null; } function absRound(number) { @@ -174,10 +174,13 @@ // note: all values past the year are optional and will default to the lowest possible value. // [year, month, day , hour, minute, second, millisecond] function dateFromArray(input, asUTC) { - input[2] = input[2] || 1; - var date = asUTC ? new Date(Date.UTC.apply({}, input)) : - new Date(input[0], input[1] || 0, input[2], input[3] || 0, input[4] || 0, input[5] || 0, input[6] || 0); - date.__origin = input; + var i, date; + for (i = 1; i < 8; i++) { + input[i] = (input[i] == null) ? (i === 2 ? 1 : 0) : input[i]; + } + date = asUTC ? new Date(Date.UTC.apply({}, input)) : + new Date(input[0], input[1], input[2], input[3], input[4], input[5], input[6]); + date._a = input; return date; } @@ -377,7 +380,9 @@ case 'DD' : // fall through to DDDD case 'DDD' : // fall through to DDDD case 'DDDD' : - datePartArray[2] = ~~input; + if (input != null) { + datePartArray[2] = ~~input; + } break; // YEAR case 'YY' : @@ -462,7 +467,7 @@ datePartArray[3] += config.tzh; datePartArray[4] += config.tzm; // return - return config.isUTC ? new Date(Date.UTC.apply({}, datePartArray)) : dateFromArray(datePartArray); + return dateFromArray(datePartArray, config.isUTC); } // compare two arrays, return the number of differences @@ -581,7 +586,7 @@ // creating with utc moment.utc = function (input, format) { if (isArray(input)) { - return new Moment(new Date(Date.UTC.apply({}, input)), true); + return new Moment(dateFromArray(input, true), true); } return (format && input) ? moment(input + ' +0000', format + ' Z').utc() : diff --git a/test/lang/ca.js b/test/lang/ca.js index 1e5c1cec6..55f352354 100644 --- a/test/lang/ca.js +++ b/test/lang/ca.js @@ -76,7 +76,7 @@ exports["lang:ca"] = { 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("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/cv.js b/test/lang/cv.js index 6293a24de..e185ae6fa 100644 --- a/test/lang/cv.js +++ b/test/lang/cv.js @@ -105,7 +105,7 @@ exports["lang:cv"] = { var expected = 'кăрлач кăр_нарăс нар_пуш пуш_ака ака_май май_çĕртме çĕр_утă утă_çурла çур_авăн ав_юпа юпа_чӳк чӳк_раштав раш'.split("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/da.js b/test/lang/da.js index 68d9873b9..5d1720f86 100644 --- a/test/lang/da.js +++ b/test/lang/da.js @@ -105,7 +105,7 @@ exports["lang:da"] = { 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("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/de.js b/test/lang/de.js index c1816f9cc..a855a50fe 100644 --- a/test/lang/de.js +++ b/test/lang/de.js @@ -105,7 +105,7 @@ exports["lang:de"] = { 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("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/en-gb.js b/test/lang/en-gb.js index a0850536e..1905b7b63 100644 --- a/test/lang/en-gb.js +++ b/test/lang/en-gb.js @@ -105,7 +105,7 @@ exports["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++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/en.js b/test/lang/en.js index 5280718aa..550f94157 100644 --- a/test/lang/en.js +++ b/test/lang/en.js @@ -105,7 +105,7 @@ exports["lang:en"] = { 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++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/es.js b/test/lang/es.js index f7867ef3b..6d1f9cf6d 100644 --- a/test/lang/es.js +++ b/test/lang/es.js @@ -74,7 +74,7 @@ exports["lang:es"] = { 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("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/eu.js b/test/lang/eu.js index e24ce1809..34d71f207 100644 --- a/test/lang/eu.js +++ b/test/lang/eu.js @@ -105,7 +105,7 @@ exports["lang:eu"] = { 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("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/fi.js b/test/lang/fi.js index fc100d587..66efc351a 100644 --- a/test/lang/fi.js +++ b/test/lang/fi.js @@ -105,7 +105,7 @@ exports["lang:fi"] = { var expected = 'tammikuu tam_helmikuu hel_maaliskuu maa_huhtikuu huh_toukokuu tou_kesäkuu kes_heinäkuu hei_elokuu elo_syyskuu syy_lokakuu lok_marraskuu mar_joulukuu jou'.split("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/fr.js b/test/lang/fr.js index f8fa09830..f6731b236 100644 --- a/test/lang/fr.js +++ b/test/lang/fr.js @@ -105,7 +105,7 @@ exports["lang:fr"] = { 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("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/gl.js b/test/lang/gl.js index 4e36ec59e..d3019fd56 100644 --- a/test/lang/gl.js +++ b/test/lang/gl.js @@ -75,7 +75,7 @@ exports["lang:gl"] = { var expected = "Xaneiro Xan._Febreiro Feb._Marzo Mar._Abril Abr._Maio Mai._Xuño Xuñ._Xullo Xul._Agosto Ago._Setembro Set._Octubro Out._Novembro Nov._Decembro Dec.".split("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/is.js b/test/lang/is.js index 246a561f4..87faa0b11 100644 --- a/test/lang/is.js +++ b/test/lang/is.js @@ -105,7 +105,7 @@ exports["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++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/it.js b/test/lang/it.js index 660e3817a..7277e8418 100644 --- a/test/lang/it.js +++ b/test/lang/it.js @@ -105,7 +105,7 @@ exports["lang:it"] = { var expected = 'Gennaio Gen_Febbraio Feb_Marzo Mar_Aprile Apr_Maggio Mag_Giugno Giu_Luglio Lug_Agosto Ago_Settebre Set_Ottobre Ott_Novembre Nov_Dicembre Dic'.split("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/jp.js b/test/lang/jp.js index 6043555b4..a2074bdbd 100644 --- a/test/lang/jp.js +++ b/test/lang/jp.js @@ -65,7 +65,7 @@ exports["lang:jp"] = { 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("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/kr.js b/test/lang/kr.js index a5e76585c..76222b0a5 100644 --- a/test/lang/kr.js +++ b/test/lang/kr.js @@ -104,7 +104,7 @@ exports["lang:kr"] = { 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("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/nb.js b/test/lang/nb.js index 98149d1e4..b979cd30b 100644 --- a/test/lang/nb.js +++ b/test/lang/nb.js @@ -105,7 +105,7 @@ exports["lang:nb"] = { 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("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/nl.js b/test/lang/nl.js index 62e75e495..1b8b43343 100644 --- a/test/lang/nl.js +++ b/test/lang/nl.js @@ -105,7 +105,7 @@ exports["lang:nl"] = { var expected = 'januari jan._februari feb._maart mar._april apr._mei mei._juni jun._juli jul._augustus aug._september sep._oktober okt._november nov._december dec.'.split("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/pl.js b/test/lang/pl.js index d9d970208..d1b203523 100644 --- a/test/lang/pl.js +++ b/test/lang/pl.js @@ -105,7 +105,7 @@ exports["lang:pl"] = { 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("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/pt.js b/test/lang/pt.js index f720788d2..dd4888cd6 100644 --- a/test/lang/pt.js +++ b/test/lang/pt.js @@ -105,7 +105,7 @@ exports["lang:pt"] = { 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("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/ru.js b/test/lang/ru.js index 29c08f599..0c398376a 100644 --- a/test/lang/ru.js +++ b/test/lang/ru.js @@ -105,7 +105,7 @@ exports["lang:ru"] = { var expected = 'январь янв_февраль фев_март мар_апрель апр_май май_июнь июн_июль июл_август авг_сентябрь сен_октябрь окт_ноябрь ноя_декабрь дек'.split("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/sv.js b/test/lang/sv.js index 797aa9560..f011c5bd3 100644 --- a/test/lang/sv.js +++ b/test/lang/sv.js @@ -105,7 +105,7 @@ exports["lang:sv"] = { 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("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/tr.js b/test/lang/tr.js index 7ecd49622..bad81d63f 100644 --- a/test/lang/tr.js +++ b/test/lang/tr.js @@ -105,7 +105,7 @@ exports["lang:tr"] = { 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("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/zh-cn.js b/test/lang/zh-cn.js index 36dee56e5..795c92ad3 100644 --- a/test/lang/zh-cn.js +++ b/test/lang/zh-cn.js @@ -65,7 +65,7 @@ exports["lang:zh-cn"] = { var expected = '一月 1月_二月 2月_三月 3月_四月 4月_五月 5月_六月 6月_七月 7月_八月 8月_九月 9月_十月 10月_十一月 11月_十二月 12月'.split("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/lang/zh-tw.js b/test/lang/zh-tw.js index 19cb02e41..6d3b2ebe6 100644 --- a/test/lang/zh-tw.js +++ b/test/lang/zh-tw.js @@ -65,7 +65,7 @@ exports["lang:zh-tw"] = { var expected = '一月 1月_二月 2月_三月 3月_四月 4月_五月 5月_六月 6月_七月 7月_八月 8月_九月 9月_十月 10月_十一月 11月_十二月 12月'.split("_"); var i; for (i = 0; i < expected.length; i++) { - test.equal(moment([2011, i, 0]).format('MMMM MMM'), expected[i], expected[i]); + test.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]); } test.done(); }, diff --git a/test/moment/create.js b/test/moment/create.js index d806dd813..dc3710f93 100644 --- a/test/moment/create.js +++ b/test/moment/create.js @@ -10,7 +10,7 @@ exports.create = { test.ok(moment([2010, 1, 12, 1, 1]).toDate() instanceof Date, "[2010, 1, 12, 1, 1]"); test.ok(moment([2010, 1, 12, 1, 1, 1]).toDate() instanceof Date, "[2010, 1, 12, 1, 1, 1]"); test.ok(moment([2010, 1, 12, 1, 1, 1, 1]).toDate() instanceof Date, "[2010, 1, 12, 1, 1, 1, 1]"); - test.deepEqual(moment(new Date(2010, 1, 14, 15, 25, 50, 125)), moment([2010, 1, 14, 15, 25, 50, 125]), "constructing with array === constructing with new Date()"); + test.equal(+moment(new Date(2010, 1, 14, 15, 25, 50, 125)), +moment([2010, 1, 14, 15, 25, 50, 125]), "constructing with array === constructing with new Date()"); test.done(); }, -- 2.47.3