Tests: remove code supporting jenkins and testswarm

Closes gh-2256

diff --git a/Gruntfile.js b/Gruntfile.js
index d6707becadac37cb7d8ae1a7d4b7a747a1f14f31..174db85cd0d7db83c8009657a3d1034855ed1837 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -511,7 +511,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 081eb81d1d815d66f15cf01954b8df35ba243320..926a1ce6e9a7e151d6ea93297e81755673cfa35b 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 fd9b1eb654bd19a5edfc78767f320cae770b8500..acc79d37917d1e5bf664dd5bd050921817363b19 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" ]
        }
 } );
 
@@ -67,11 +65,6 @@ function requireTests( dependencies, noBackCompat ) {
 
        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/datepicker/options.js b/tests/unit/datepicker/options.js
index bf2fccc1f04c542ba4ef3915df95197f9c6f477f..6615f2351e69366a6b5af03aaf21959c13c90c54 100644 (file)
--- a/tests/unit/datepicker/options.js
+++ b/tests/unit/datepicker/options.js
@@ -98,14 +98,6 @@ QUnit.test( "change", function( assert ) {
 } );
 
 ( function() {
-       var url = window.location.search;
-       url = decodeURIComponent( url.slice( url.indexOf( "swarmURL=" ) + 9 ) );
-
-       // TODO: This test occassionally fails in IE in TestSwarm
-       if ( $.ui.ie && url && url.indexOf( "http" ) === 0 ) {
-               return;
-       }
-
        QUnit.test( "invocation", function( assert ) {
                var ready = assert.async();
                var button, image,

diff --git a/tests/unit/draggable/options.js b/tests/unit/draggable/options.js
index c98c9f9d81fc37e0dc5e1fe2a672bb23861d7883..129c23692ba0eab564b453df719c3e9957e7c4bb 100644 (file)
--- a/tests/unit/draggable/options.js
+++ b/tests/unit/draggable/options.js
@@ -1173,9 +1173,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" ),
@@ -1231,9 +1229,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;
 
@@ -1362,10 +1359,8 @@ QUnit.test( "#8459: element can snap to an element that was removed during drag"
                assert.ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
                assert.ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
        } else {
-
-               // 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 to a removed element" );
-               assert.close( element.offset().top, newY, 1, "doesn't snap to a removed element" );
+               assert.equal( element.offset().left, newX, 1, "doesn't snap to a removed element" );
+               assert.equal( element.offset().top, newY, 1, "doesn't snap to a removed element" );
        }
 } );
 

diff --git a/tests/unit/position/core.js b/tests/unit/position/core.js
index 9483e716de702b921247b8fd0fe76468344ad0cb..ae016f34c343dedd42a82620e38e44e2bf7b4b63 100644 (file)
--- a/tests/unit/position/core.js
+++ b/tests/unit/position/core.js
@@ -396,8 +396,6 @@ QUnit.test( "collision: fit, no collision", function( assert ) {
        }, "with offset" );
 } );
 
-// Currently failing in IE8 due to the iframe used by TestSwarm
-if ( !/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() ) ) {
 QUnit.test( "collision: fit, collision", function( assert ) {
        assert.expect( 2 + ( scrollTopSupport() ? 1 : 0 ) );
 
@@ -428,7 +426,6 @@ QUnit.test( "collision: fit, collision", function( assert ) {
                win.scrollTop( 0 ).scrollLeft( 0 );
        }
 } );
-}
 
 QUnit.test( "collision: flip, no collision", function( assert ) {
        assert.expect( 2 );