aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Methvin <dave.methvin@gmail.com>2011-08-29 13:50:13 -0400
committerDave Methvin <dave.methvin@gmail.com>2011-08-29 13:50:13 -0400
commitd284b36b88b616aefc5c1645035eba4c492c2e9b (patch)
tree408952f04a0673c3d71199d58c5ed5067d60dee9
parent20a1bd00eaae42dc729ef8f8224cceffc67ee90a (diff)
parentf37fc9966e40b73dd4018872343b4b4ea36c4d46 (diff)
downloadjquery-d284b36b88b616aefc5c1645035eba4c492c2e9b.tar.gz
jquery-d284b36b88b616aefc5c1645035eba4c492c2e9b.zip
Merge branch 'master' of github.com:jquery/jquery
-rw-r--r--test/unit/ajax.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index ed6acda92..f871da723 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -2096,10 +2096,10 @@ test( "jQuery.ajax - statusText" , 4, function() {
stop();
jQuery.ajax( url( "data/statusText.php?status=200&text=Hello" ) ).done(function( _, statusText, jqXHR ) {
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 ) {
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();
});
});