Skip to content

Commit 1d9bdbd

Browse files
committed
Tests: remove code supporting jenkins and testswarm
Close jquerygh-2251
1 parent f017426 commit 1d9bdbd

File tree

6 files changed

+6
-31
lines changed

6 files changed

+6
-31
lines changed

Gruntfile.js

-1
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,6 @@ grunt.registerTask( "lint", [
511511
] );
512512
grunt.registerTask( "build", [ "requirejs", "concat" ] );
513513
grunt.registerTask( "default", [ "lint", "build" ] );
514-
grunt.registerTask( "jenkins", [ "build" ] );
515514
grunt.registerTask( "sizer", [ "requirejs:js", "uglify:main", "compare_size:all" ] );
516515
grunt.registerTask( "sizer_all", [ "requirejs:js", "uglify", "compare_size" ] );
517516

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
"load-grunt-tasks": "5.1.0",
7878
"rimraf": "4.4.1",
7979
"selenium-webdriver": "4.18.1",
80-
"testswarm": "1.1.2",
8180
"yargs": "17.7.2"
8281
},
8382
"keywords": []

tests/lib/bootstrap.js

+1-8
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@ requirejs.config( {
1414
"qunit-assert-classes": "../../lib/vendor/qunit-assert-classes/qunit-assert-classes",
1515
"qunit-assert-close": "../../lib/vendor/qunit-assert-close/qunit-assert-close",
1616
"qunit": "../../../external/qunit/qunit",
17-
"testswarm": "https://swarm.jquery.org/js/inject.js?" + ( new Date() ).getTime(),
1817
"ui": "../../../ui"
1918
},
2019
shim: {
2120
"globalize/ja-JP": [ "globalize" ],
2221
"jquery-simulate": [ "jquery" ],
23-
"qunit-assert-close": [ "qunit" ],
24-
"testswarm": [ "qunit" ]
22+
"qunit-assert-close": [ "qunit" ]
2523
}
2624
} );
2725

@@ -67,11 +65,6 @@ function requireTests( dependencies, noBackCompat ) {
6765

6866
dependencies = preDependencies.concat( dependencies );
6967

70-
// Load the TestSwarm injector, if necessary
71-
if ( parseUrl().swarmURL ) {
72-
dependencies.push( "testswarm" );
73-
}
74-
7568
requireModules( dependencies, function( QUnit ) {
7669
QUnit.start();
7770
} );

tests/unit/datepicker/options.js

-8
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,6 @@ QUnit.test( "change", function( assert ) {
9898
} );
9999

100100
( function() {
101-
var url = window.location.search;
102-
url = decodeURIComponent( url.slice( url.indexOf( "swarmURL=" ) + 9 ) );
103-
104-
// TODO: This test occassionally fails in IE in TestSwarm
105-
if ( $.ui.ie && url && url.indexOf( "http" ) === 0 ) {
106-
return;
107-
}
108-
109101
QUnit.test( "invocation", function( assert ) {
110102
var ready = assert.async();
111103
var button, image,

tests/unit/draggable/options.js

+5-10
Original file line numberDiff line numberDiff line change
@@ -1173,9 +1173,7 @@ QUnit.test( "#6817: auto scroll goes double distance when dragging", function( a
11731173
scroll: true,
11741174
stop: function( e, ui ) {
11751175
assert.equal( ui.offset.top, newY, "offset of item matches pointer position after scroll" );
1176-
1177-
// TODO: fix IE8 testswarm IFRAME positioning bug so assert.close can be turned back to equal
1178-
assert.close( ui.offset.top - offsetBefore.top, distance, 1, "offset of item only moves expected distance after scroll" );
1176+
assert.equal( ui.offset.top - offsetBefore.top, distance, 1, "offset of item only moves expected distance after scroll" );
11791177
}
11801178
} ),
11811179
scrollSensitivity = element.draggable( "option", "scrollSensitivity" ),
@@ -1231,9 +1229,8 @@ QUnit.test( "snap, snapMode, and snapTolerance", function( assert ) {
12311229
moves: 1
12321230
} );
12331231

1234-
// TODO: fix IE8 testswarm IFRAME positioning bug so assert.close can be turned back to equal
1235-
assert.close( element.offset().left, newX, 1, "doesn't snap outside the snapTolerance" );
1236-
assert.close( element.offset().top, newY, 1, "doesn't snap outside the snapTolerance" );
1232+
assert.equal( element.offset().left, newX, 1, "doesn't snap outside the snapTolerance" );
1233+
assert.equal( element.offset().top, newY, 1, "doesn't snap outside the snapTolerance" );
12371234

12381235
newX += 3;
12391236

@@ -1362,10 +1359,8 @@ QUnit.test( "#8459: element can snap to an element that was removed during drag"
13621359
assert.ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
13631360
assert.ok( true, "Opera <12.14 and Safari <6.0 report wrong values for $.contains in jQuery < 1.8" );
13641361
} else {
1365-
1366-
// TODO: fix IE8 testswarm IFRAME positioning bug so assert.close can be turned back to equal
1367-
assert.close( element.offset().left, newX, 1, "doesn't snap to a removed element" );
1368-
assert.close( element.offset().top, newY, 1, "doesn't snap to a removed element" );
1362+
assert.equal( element.offset().left, newX, 1, "doesn't snap to a removed element" );
1363+
assert.equal( element.offset().top, newY, 1, "doesn't snap to a removed element" );
13691364
}
13701365
} );
13711366

tests/unit/position/core.js

-3
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,6 @@ QUnit.test( "collision: fit, no collision", function( assert ) {
396396
}, "with offset" );
397397
} );
398398

399-
// Currently failing in IE8 due to the iframe used by TestSwarm
400-
if ( !/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() ) ) {
401399
QUnit.test( "collision: fit, collision", function( assert ) {
402400
assert.expect( 2 + ( scrollTopSupport() ? 1 : 0 ) );
403401

@@ -428,7 +426,6 @@ QUnit.test( "collision: fit, collision", function( assert ) {
428426
win.scrollTop( 0 ).scrollLeft( 0 );
429427
}
430428
} );
431-
}
432429

433430
QUnit.test( "collision: flip, no collision", function( assert ) {
434431
assert.expect( 2 );

0 commit comments

Comments
 (0)