diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/bootstrap.js | 9 | ||||
| -rw-r--r-- | tests/unit/draggable/options.js | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/tests/lib/bootstrap.js b/tests/lib/bootstrap.js index b86444139..c32d9765e 100644 --- a/tests/lib/bootstrap.js +++ b/tests/lib/bootstrap.js @@ -14,14 +14,12 @@ requirejs.config( { "qunit-assert-classes": "../../lib/vendor/qunit-assert-classes/qunit-assert-classes", "qunit-assert-close": "../../lib/vendor/qunit-assert-close/qunit-assert-close", "qunit": "../../../external/qunit/qunit", - "testswarm": "https://swarm.jquery.org/js/inject.js?" + ( new Date() ).getTime(), "ui": "../../../ui" }, shim: { "globalize/ja-JP": [ "globalize" ], "jquery-simulate": [ "jquery" ], - "qunit-assert-close": [ "qunit" ], - "testswarm": [ "qunit" ] + "qunit-assert-close": [ "qunit" ] } } ); @@ -69,11 +67,6 @@ function requireTests( dependencies, options ) { dependencies = preDependencies.concat( dependencies ); - // Load the TestSwarm injector, if necessary - if ( parseUrl().swarmURL ) { - dependencies.push( "testswarm" ); - } - requireModules( dependencies, function( QUnit ) { QUnit.start(); } ); diff --git a/tests/unit/draggable/options.js b/tests/unit/draggable/options.js index f97696920..41dcf5d53 100644 --- a/tests/unit/draggable/options.js +++ b/tests/unit/draggable/options.js @@ -1159,9 +1159,7 @@ QUnit.test( "#6817: auto scroll goes double distance when dragging", function( a scroll: true, stop: function( e, ui ) { assert.equal( ui.offset.top, newY, "offset of item matches pointer position after scroll" ); - - // TODO: fix IE8 testswarm IFRAME positioning bug so assert.close can be turned back to equal - assert.close( ui.offset.top - offsetBefore.top, distance, 1, "offset of item only moves expected distance after scroll" ); + assert.equal( ui.offset.top - offsetBefore.top, distance, 1, "offset of item only moves expected distance after scroll" ); } } ), scrollSensitivity = element.draggable( "option", "scrollSensitivity" ), @@ -1217,9 +1215,8 @@ QUnit.test( "snap, snapMode, and snapTolerance", function( assert ) { moves: 1 } ); - // TODO: fix IE8 testswarm IFRAME positioning bug so assert.close can be turned back to equal - assert.close( element.offset().left, newX, 1, "doesn't snap outside the snapTolerance" ); - assert.close( element.offset().top, newY, 1, "doesn't snap outside the snapTolerance" ); + assert.equal( element.offset().left, newX, 1, "doesn't snap outside the snapTolerance" ); + assert.equal( element.offset().top, newY, 1, "doesn't snap outside the snapTolerance" ); newX += 3; |