From ab1224dd2df0efd67655a142c8a478cdcc7b27ad Mon Sep 17 00:00:00 2001 From: Dave Methvin Date: Thu, 9 Jan 2014 22:26:25 -0500 Subject: [PATCH] Tests: Fix test broken by previous cherry-pick --- bower.json | 5 ----- test/unit/effects.js | 8 +++++--- 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 @@ -19,11 +19,6 @@ "requirejs": "~2.1.8", "qunit": "~1.12.0", "sinon": "~1.7.3" - }, - }, - "sinon": { - "sinon": "**/*.js" - } }, "keywords": [ "jquery", 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" );