aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Methvin <dave.methvin@gmail.com>2014-01-09 22:26:25 -0500
committerDave Methvin <dave.methvin@gmail.com>2014-01-09 22:26:25 -0500
commitab1224dd2df0efd67655a142c8a478cdcc7b27ad (patch)
treec62952fef5f046788c6625ea51075c1e149159ab
parent2d6da2da6c82ff2279b01134ae32c2647aa573da (diff)
downloadjquery-ab1224dd2df0efd67655a142c8a478cdcc7b27ad.tar.gz
jquery-ab1224dd2df0efd67655a142c8a478cdcc7b27ad.zip
Tests: Fix test broken by previous cherry-pick
-rw-r--r--bower.json5
-rw-r--r--test/unit/effects.js8
2 files changed, 5 insertions, 8 deletions
diff --git a/bower.json b/bower.json
index 8a93e7ffa..6de48870d 100644
--- a/bower.json
+++ b/bower.json
@@ -20,11 +20,6 @@
"qunit": "~1.12.0",
"sinon": "~1.7.3"
},
- },
- "sinon": {
- "sinon": "**/*.js"
- }
- },
"keywords": [
"jquery",
"javascript",
diff --git a/test/unit/effects.js b/test/unit/effects.js
index 856a9eb9c..acbc776fb 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -1349,11 +1349,11 @@ test( "callbacks that throw exceptions will be removed (#5684)", function() {
var foo = jQuery( "#foo" );
- function testException() {
+ function TestException() {
}
foo.animate({ height: 1 }, 1, function() {
- throw new testException();
+ throw new TestException();
});
// this test thoroughly abuses undocumented methods - please feel free to update
@@ -1362,9 +1362,11 @@ test( "callbacks that throw exceptions will be removed (#5684)", function() {
// make sure that the standard timer loop will NOT run.
jQuery.fx.stop();
- this.clock.tick( 1 );
+ this.clock.tick( 1 );
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" );