X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fajax.js;h=0464c7b5fbb9b72f31d144f2bcc61ee3fdcc2ab4;hb=26b0e913dda386b6b2848196689a02a2da6aa40d;hp=195fa27ca4bed06cac80cf1474a8881af0260381;hpb=1a14a38ff77839b2a71fbc3f3c0890ebe62438c7;p=jquery.git diff --git a/test/unit/ajax.js b/test/unit/ajax.js index 195fa27..0464c7b 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -351,9 +351,9 @@ test("serialize()", function() { }); test("jQuery.param()", function() { - expect(18); + expect(19); - equals( !jQuery.ajaxSettings.traditional, true, "traditional flag, falsy by default" ); + equals( !jQuery.ajaxSettings.traditional, true, "traditional flag, falsy by default" ); var params = {foo:"bar", baz:42, quux:"All your base are belong to us"}; equals( jQuery.param(params), "foo=bar&baz=42&quux=All+your+base+are+belong+to+us", "simple" ); @@ -378,6 +378,8 @@ test("jQuery.param()", function() { params = { a:[1,2], b:{ c:3, d:[4,5], e:{ x:[6], y:7, z:[8,9] }, f:true, g:false, h:undefined }, i:[10,11], j:true, k:false, l:[undefined,0], m:"cowboy hat?" }; equals( jQuery.param(params,true), "a=1&a=2&b=%5Bobject+Object%5D&i=10&i=11&j=true&k=false&l=undefined&l=0&m=cowboy+hat%3F", "huge structure, forced traditional" ); + + equals( decodeURIComponent( jQuery.param({ a: [1,2,3], 'b[]': [4,5,6], 'c[d]': [7,8,9], e: { f: [10], g: [11,12], h: 13 } }) ), "a[]=1&a[]=2&a[]=3&b[]=4&b[]=5&b[]=6&c[d][]=7&c[d][]=8&c[d][]=9&e[f][]=10&e[g][]=11&e[g][]=12&e[h]=13", "Make sure params are not double-encoded." ); jQuery.ajaxSetup({ traditional: true }); @@ -892,7 +894,7 @@ test("jQuery.ajax() - script, Remote with scheme-less URL", function() { }); test("jQuery.ajax() - malformed JSON", function() { - expect(1); + expect(2); stop(); @@ -903,8 +905,9 @@ test("jQuery.ajax() - malformed JSON", function() { ok( false, "Success." ); start(); }, - error: function(xhr, msg) { + error: function(xhr, msg, detailedMsg) { equals( "parsererror", msg, "A parse error occurred." ); + ok( /^Invalid JSON/.test(detailedMsg), "Detailed parsererror message provided" ); start(); } });