Merge branch 'master' of github.com:dmethvin/jquery

Conflicts: version.txt
jquery · Sep 1, 2011 · 5e2ec36 · 5e2ec36
2 parents c2531e2 + d284b36
commit 5e2ec36
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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();
 		});
 	});