Tests: remove code supporting jenkins and testswarm

Close gh-2251

diff --git a/Gruntfile.js b/Gruntfile.js
index ac61e3ad308acd6902a6868a900c74cedc6abd99..d737dbef7ed3577098f273105c3db85f1125bfa1 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -397,7 +397,6 @@ grunt.registerTask( "lint", [
 ] );
 grunt.registerTask( "build", [ "requirejs", "concat" ] );
 grunt.registerTask( "default", [ "lint", "build" ] );
-grunt.registerTask( "jenkins", [ "build" ] );
 grunt.registerTask( "sizer", [ "requirejs:js", "uglify:main", "compare_size:all" ] );
 grunt.registerTask( "sizer_all", [ "requirejs:js", "uglify", "compare_size" ] );
 

diff --git a/package.json b/package.json
index 10992945807df6b944be2bce7c01a92eee41ff44..76ae6b05d491374665467c7d0b210147e206892c 100644 (file)
--- a/package.json
+++ b/package.json
@@ -77,7 +77,6 @@
                "load-grunt-tasks": "5.1.0",
                "rimraf": "4.4.1",
                "selenium-webdriver": "4.18.1",
-               "testswarm": "1.1.2",
                "yargs": "17.7.2"
        },
        "keywords": []

diff --git a/tests/lib/bootstrap.js b/tests/lib/bootstrap.js
index b86444139338918ca0a59e4e1d30000dd9a46d75..c32d9765e6ba5261191905338802eb46c50a58fc 100644 (file)
--- 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 f97696920bd0ade4e8ce606ba0e3f4d171a5cbe0..41dcf5d5343a7cabcf0f5ad3936feffa10743a7c 100644 (file)
--- 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;