mirror of
https://github.com/jquery/jquery.git
synced 2024-10-05 11:34:18 +00:00
Merge branch 'master' of github.com:dmethvin/jquery
Conflicts: version.txt
This commit is contained in:
commit
5e2ec36737
@ -2096,10 +2096,10 @@ test( "jQuery.ajax - statusText" , 4, function() {
|
|||||||
stop();
|
stop();
|
||||||
jQuery.ajax( url( "data/statusText.php?status=200&text=Hello" ) ).done(function( _, statusText, jqXHR ) {
|
jQuery.ajax( url( "data/statusText.php?status=200&text=Hello" ) ).done(function( _, statusText, jqXHR ) {
|
||||||
strictEqual( statusText, "success", "callback status text ok for success" );
|
strictEqual( statusText, "success", "callback status text ok for success" );
|
||||||
strictEqual( jqXHR.statusText, "Hello", "jqXHR status text ok for success" );
|
ok( jqXHR.statusText === "Hello" || jQuery.browser.safari && jqXHR.statusText === "OK", "jqXHR status text ok for success (" + jqXHR.statusText + ")" );
|
||||||
jQuery.ajax( url( "data/statusText.php?status=404&text=World" ) ).fail(function( jqXHR, statusText ) {
|
jQuery.ajax( url( "data/statusText.php?status=404&text=World" ) ).fail(function( jqXHR, statusText ) {
|
||||||
strictEqual( statusText, "error", "callback status text ok for error" );
|
strictEqual( statusText, "error", "callback status text ok for error" );
|
||||||
strictEqual( jqXHR.statusText, "World", "jqXHR status text ok for error" );
|
ok( jqXHR.statusText === "World" || jQuery.browser.safari && jqXHR.statusText === "Not Found", "jqXHR status text ok for error (" + jqXHR.statusText + ")" );
|
||||||
start();
|
start();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user