Commit c3600e26 authored by Dave Methvin's avatar Dave Methvin

Take 2 on "Fix ajax to always expect an Error object, per #10646."

We can't use jQuery.error to rethrow anymore since it constructs a new Error from its supposedly-string arg. Also, older IE stringifies Error objects into "[object Error]" so I've loosened the unit test criteria.

This reverts commit 586fb059.
parent d8e2b4b6
...@@ -752,10 +752,10 @@ jQuery.extend({ ...@@ -752,10 +752,10 @@ jQuery.extend({
} catch (e) { } catch (e) {
// Propagate exception as error if not done // Propagate exception as error if not done
if ( state < 2 ) { if ( state < 2 ) {
done( -1, e.message ); done( -1, e );
// Simply rethrow otherwise // Simply rethrow otherwise
} else { } else {
jQuery.error( e.message ); throw e;
} }
} }
} }
......
...@@ -1616,7 +1616,7 @@ test("jQuery.ajax() - malformed JSON", function() { ...@@ -1616,7 +1616,7 @@ test("jQuery.ajax() - malformed JSON", function() {
}, },
error: function(xhr, msg, detailedMsg) { error: function(xhr, msg, detailedMsg) {
equal( "parsererror", msg, "A parse error occurred." ); equal( "parsererror", msg, "A parse error occurred." );
ok( /^(Invalid|SyntaxError|exception)/i.test(detailedMsg), "Detailed parsererror message provided" ); ok( /(invalid|error|exception)/i.test(detailedMsg), "Detailed parsererror message provided" );
start(); start();
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment