library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-10-05 11:34:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Landing pull request 525. Fixing tests with qunit.

Browse Source 
More Details:
 - https://github.com/jquery/jquery/pull/525
This commit is contained in:
Corey Frang 2011-10-01 16:49:49 -04:00 committed by timmywil
parent 1ebced1736
commit 46219b57ba
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
test/unit/ajax.js
View File

@ -251,7 +251,9 @@ test( "jQuery.ajax - multiple method signatures introduced in 1.5 ( #8107)", fun
jQuery.ajax("data/name.html").success(function() { ok( true, "With only string URL argument" ); }), jQuery.ajax("data/name.html").success(function() { ok( true, "With only string URL argument" ); }),
jQuery.ajax("data/name.html", {} ).success(function() { ok( true, "With string URL param and map" ); }), jQuery.ajax("data/name.html", {} ).success(function() { ok( true, "With string URL param and map" ); }),
jQuery.ajax({ url: "data/name.html"} ).success(function() { ok( true, "With only map" ); }) jQuery.ajax({ url: "data/name.html"} ).success(function() { ok( true, "With only map" ); })
).then( start, start ); ).always(functionunction() {
start();
});
}); });
@ -402,7 +404,9 @@ test(".ajax() - headers" , function() {
}, },
error: function(){ ok(false, "error"); } error: function(){ ok(false, "error"); }
}).then( start, start ); }).always(function() {
start();
});
}); });
@ -1130,7 +1134,9 @@ test("global ajaxSettings", function() {
test("load(String)", function() { test("load(String)", function() {
expect(1); expect(1);
stop(); // check if load can be called with only url stop(); // check if load can be called with only url
jQuery("#first").load("data/name.html", start); jQuery("#first").load("data/name.html", function() {
start();
});
}); });
test("load('url selector')", function() { test("load('url selector')", function() {
@ -1633,7 +1639,9 @@ test("jQuery.ajax() - script by content-type", function() {
data: { header: "ecma" } data: { header: "ecma" }
}) })
).then( start, start ); ).always(function() {
start();
});
}); });
test("jQuery.ajax() - json by content-type", function() { test("jQuery.ajax() - json by content-type", function() {
@ -1741,7 +1749,7 @@ test("jQuery.post - data", 3, function() {
jQuery.when( jQuery.when(
jQuery.post( url( "data/name.php" ), { xml: "5-2", length: 3 }, function( xml ) { jQuery.post( url( "data/name.php" ), { xml: "5-2", length: 3 }, function( xml ) {
jQuery( "math", xml ).each( function() { jQuery( "math", xml ).each(function() {
equals( jQuery( "calculation", this ).text(), "5-2", "Check for XML" ); equals( jQuery( "calculation", this ).text(), "5-2", "Check for XML" );
equals( jQuery( "result", this ).text(), "3", "Check for XML" ); equals( jQuery( "result", this ).text(), "3", "Check for XML" );
}); });
@ -1760,12 +1768,9 @@ test("jQuery.post - data", 3, function() {
strictEqual( data, "test%5Blength%5D=7&test%5Bfoo%5D=bar", "Check if a sub-object with a length param is serialized correctly"); strictEqual( data, "test%5Blength%5D=7&test%5Bfoo%5D=bar", "Check if a sub-object with a length param is serialized correctly");
} }
}) })
// The more compact then( start, start ) doesn't work in IE7 ).always(function() {
).then( function() {
start(); start();
}, function() { });
start();
} );
}); });
@ -2158,7 +2163,7 @@ test( "jQuery.ajax - statusCode" , function() {
jQuery.ajax( url( uri ) , { jQuery.ajax( url( uri ) , {
complete: function(jqXHR) { complete: function(jqXHR) {
setTimeout( function() { setTimeout(function() {
jqXHR.statusCode( createStatusCodes( "very late binding" , isSuccess ) ); jqXHR.statusCode( createStatusCodes( "very late binding" , isSuccess ) );
countComplete(); countComplete();
} , 100 ); } , 100 );
@ -2169,7 +2174,7 @@ test( "jQuery.ajax - statusCode" , function() {
statusCode: createStatusCodes( "all (options)" , isSuccess ), statusCode: createStatusCodes( "all (options)" , isSuccess ),
complete: function(jqXHR) { complete: function(jqXHR) {
jqXHR.statusCode( createStatusCodes( "all (on complete)" , isSuccess ) ); jqXHR.statusCode( createStatusCodes( "all (on complete)" , isSuccess ) );
setTimeout( function() { setTimeout(function() {
jqXHR.statusCode( createStatusCodes( "all (very late binding)" , isSuccess ) ); jqXHR.statusCode( createStatusCodes( "all (very late binding)" , isSuccess ) );
countComplete(); countComplete();
} , 100 ); } , 100 );
@ -2246,7 +2251,9 @@ test("jQuery.ajax - transitive conversions", function() {
} }
}) })
).then( start , start ); ).always(function() {
start();
});
}); });
@ -2274,7 +2281,9 @@ test("jQuery.ajax - overrideMimeType", function() {
} }
}) })
).then( start , start ); ).always(function() {
start();
});
}); });