Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tests: remove code supporting jenkins and testswarm #2251

Merged
merged 1 commit into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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" ] );

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

Expand Down