aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimmy Willison <timmywil@users.noreply.github.com>2024-05-15 15:19:23 -0400
committerTimmy Willison <timmywil@users.noreply.github.com>2024-06-04 09:50:24 -0400
commit05d03ee38d29f2ac830bee7c1e16a8e9151706f7 (patch)
tree4dff9b2f1be4ffd8ca0b9da9d0e1a660424716e5
parentf0174261a47661b2dd39ed5bb0d6bd28bd60029e (diff)
downloadjquery-ui-05d03ee38d29f2ac830bee7c1e16a8e9151706f7.tar.gz
jquery-ui-05d03ee38d29f2ac830bee7c1e16a8e9151706f7.zip
Tests: remove code supporting jenkins and testswarm
Closes gh-2256
-rw-r--r--Gruntfile.js1
-rw-r--r--package.json1
-rw-r--r--tests/lib/bootstrap.js9
-rw-r--r--tests/unit/datepicker/options.js8
-rw-r--r--tests/unit/draggable/options.js15
-rw-r--r--tests/unit/position/core.js3
6 files changed, 6 insertions, 31 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index d6707beca..174db85cd 100644
--- 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 081eb81d1..926a1ce6e 100644
--- 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 fd9b1eb65..acc79d379 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" ]
}
} );
@@ -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 bf2fccc1f..6615f2351 100644
--- 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 c98c9f9d8..129c23692 100644
--- 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 9483e716d..ae016f34c 100644
--- 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 );