Tests: remove code supporting jenkins and testswarm

Closes gh-2256
This commit is contained in:
Timmy Willison 2024-05-15 15:19:23 -04:00
parent f0174261a4
commit 05d03ee38d
6 changed files with 6 additions and 31 deletions

View File

@ -511,7 +511,6 @@ grunt.registerTask( "lint", [
] ); ] );
grunt.registerTask( "build", [ "requirejs", "concat" ] ); grunt.registerTask( "build", [ "requirejs", "concat" ] );
grunt.registerTask( "default", [ "lint", "build" ] ); grunt.registerTask( "default", [ "lint", "build" ] );
grunt.registerTask( "jenkins", [ "build" ] );
grunt.registerTask( "sizer", [ "requirejs:js", "uglify:main", "compare_size:all" ] ); grunt.registerTask( "sizer", [ "requirejs:js", "uglify:main", "compare_size:all" ] );
grunt.registerTask( "sizer_all", [ "requirejs:js", "uglify", "compare_size" ] ); grunt.registerTask( "sizer_all", [ "requirejs:js", "uglify", "compare_size" ] );

View File

@ -77,7 +77,6 @@
"load-grunt-tasks": "5.1.0", "load-grunt-tasks": "5.1.0",
"rimraf": "4.4.1", "rimraf": "4.4.1",
"selenium-webdriver": "4.18.1", "selenium-webdriver": "4.18.1",
"testswarm": "1.1.2",
"yargs": "17.7.2" "yargs": "17.7.2"
}, },
"keywords": [] "keywords": []

View File

@ -14,14 +14,12 @@ requirejs.config( {
"qunit-assert-classes": "../../lib/vendor/qunit-assert-classes/qunit-assert-classes", "qunit-assert-classes": "../../lib/vendor/qunit-assert-classes/qunit-assert-classes",
"qunit-assert-close": "../../lib/vendor/qunit-assert-close/qunit-assert-close", "qunit-assert-close": "../../lib/vendor/qunit-assert-close/qunit-assert-close",
"qunit": "../../../external/qunit/qunit", "qunit": "../../../external/qunit/qunit",
"testswarm": "https://swarm.jquery.org/js/inject.js?" + ( new Date() ).getTime(),
"ui": "../../../ui" "ui": "../../../ui"
}, },
shim: { shim: {
"globalize/ja-JP": [ "globalize" ], "globalize/ja-JP": [ "globalize" ],
"jquery-simulate": [ "jquery" ], "jquery-simulate": [ "jquery" ],
"qunit-assert-close": [ "qunit" ], "qunit-assert-close": [ "qunit" ]
"testswarm": [ "qunit" ]
} }
} ); } );
@ -67,11 +65,6 @@ function requireTests( dependencies, noBackCompat ) {
dependencies = preDependencies.concat( dependencies ); dependencies = preDependencies.concat( dependencies );
// Load the TestSwarm injector, if necessary
if ( parseUrl().swarmURL ) {
dependencies.push( "testswarm" );
}
requireModules( dependencies, function( QUnit ) { requireModules( dependencies, function( QUnit ) {
QUnit.start(); QUnit.start();
} ); } );

View File

@ -98,14 +98,6 @@ QUnit.test( "change", function( assert ) {
} ); } );
( function() { ( 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 ) { QUnit.test( "invocation", function( assert ) {
var ready = assert.async(); var ready = assert.async();
var button, image, var button, image,

View File

@ -1173,9 +1173,7 @@ QUnit.test( "#6817: auto scroll goes double distance when dragging", function( a
scroll: true, scroll: true,
stop: function( e, ui ) { stop: function( e, ui ) {
assert.equal( ui.offset.top, newY, "offset of item matches pointer position after scroll" ); assert.equal( ui.offset.top, newY, "offset of item matches pointer position after scroll" );
assert.equal( ui.offset.top - offsetBefore.top, distance, 1, "offset of item only moves expected distance 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" );
} }
} ), } ),
scrollSensitivity = element.draggable( "option", "scrollSensitivity" ), scrollSensitivity = element.draggable( "option", "scrollSensitivity" ),
@ -1231,9 +1229,8 @@ QUnit.test( "snap, snapMode, and snapTolerance", function( assert ) {
moves: 1 moves: 1
} ); } );
// TODO: fix IE8 testswarm IFRAME positioning bug so assert.close can be turned back to equal assert.equal( element.offset().left, newX, 1, "doesn't snap outside the snapTolerance" );
assert.close( element.offset().left, newX, 1, "doesn't snap outside the snapTolerance" ); assert.equal( element.offset().top, newY, 1, "doesn't snap outside the snapTolerance" );
assert.close( element.offset().top, newY, 1, "doesn't snap outside the snapTolerance" );
newX += 3; 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" );
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 { } else {
assert.equal( element.offset().left, newX, 1, "doesn't snap to a removed element" );
// TODO: fix IE8 testswarm IFRAME positioning bug so assert.close can be turned back to equal assert.equal( element.offset().top, newY, 1, "doesn't snap to a removed element" );
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" );
} }
} ); } );

View File

@ -396,8 +396,6 @@ QUnit.test( "collision: fit, no collision", function( assert ) {
}, "with offset" ); }, "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 ) { QUnit.test( "collision: fit, collision", function( assert ) {
assert.expect( 2 + ( scrollTopSupport() ? 1 : 0 ) ); assert.expect( 2 + ( scrollTopSupport() ? 1 : 0 ) );
@ -428,7 +426,6 @@ QUnit.test( "collision: fit, collision", function( assert ) {
win.scrollTop( 0 ).scrollLeft( 0 ); win.scrollTop( 0 ).scrollLeft( 0 );
} }
} ); } );
}
QUnit.test( "collision: flip, no collision", function( assert ) { QUnit.test( "collision: flip, no collision", function( assert ) {
assert.expect( 2 ); assert.expect( 2 );