Skip to content

Commit

Permalink
Tests: remove code supporting jenkins and testswarm
Browse files Browse the repository at this point in the history
Closes gh-2256
  • Loading branch information
timmywil committed Jun 4, 2024
1 parent f017426 commit 05d03ee
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 31 deletions.
1 change: 0 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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" ] );

Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": []
Expand Down
9 changes: 1 addition & 8 deletions tests/lib/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
} );

Expand Down Expand Up @@ -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();
} );
Expand Down
8 changes: 0 additions & 8 deletions tests/unit/datepicker/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
15 changes: 5 additions & 10 deletions tests/unit/draggable/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -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" ),
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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" );
}
} );

Expand Down
3 changes: 0 additions & 3 deletions tests/unit/position/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) );

Expand Down Expand Up @@ -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 );
Expand Down

0 comments on commit 05d03ee

Please sign in to comment.