Tests: Fix test broken by previous cherry-pick

This commit is contained in:
Dave Methvin 2014-01-09 22:26:25 -05:00
parent 2d6da2da6c
commit ab1224dd2d
2 changed files with 5 additions and 8 deletions

View File

@ -19,11 +19,6 @@
"requirejs": "~2.1.8", "requirejs": "~2.1.8",
"qunit": "~1.12.0", "qunit": "~1.12.0",
"sinon": "~1.7.3" "sinon": "~1.7.3"
},
},
"sinon": {
"sinon": "**/*.js"
}
}, },
"keywords": [ "keywords": [
"jquery", "jquery",

View File

@ -1349,11 +1349,11 @@ test( "callbacks that throw exceptions will be removed (#5684)", function() {
var foo = jQuery( "#foo" ); var foo = jQuery( "#foo" );
function testException() { function TestException() {
} }
foo.animate({ height: 1 }, 1, function() { foo.animate({ height: 1 }, 1, function() {
throw new testException(); throw new TestException();
}); });
// this test thoroughly abuses undocumented methods - please feel free to update // this test thoroughly abuses undocumented methods - please feel free to update
@ -1365,6 +1365,8 @@ test( "callbacks that throw exceptions will be removed (#5684)", function() {
this.clock.tick( 1 ); this.clock.tick( 1 );
raises( jQuery.fx.tick, TestException, "Exception was thrown" ); raises( jQuery.fx.tick, TestException, "Exception was thrown" );
// the second call shouldn't
jQuery.fx.tick();
ok( true, "Test completed without throwing a second exception" ); ok( true, "Test completed without throwing a second exception" );