Skip to content

Commit a0e3da0

Browse files
committed
Effects: Convert tests to new infrastructure
Ref #10119 Ref jquerygh-1528
1 parent fbc5544 commit a0e3da0

File tree

3 files changed

+30
-37
lines changed

3 files changed

+30
-37
lines changed

tests/unit/effects/effects.html

+2-32
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,9 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Effects Test Suite</title>
66

7-
<script src="../../jquery.js"></script>
8-
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
9-
<script src="../../../external/qunit/qunit.js"></script>
10-
<script src="../../../external/jquery-simulate/jquery.simulate.js"></script>
11-
<script src="../testsuite.js"></script>
12-
<script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
13-
<script>
14-
TestHelpers.loadResources({
15-
js: [
16-
"ui/effect.js",
17-
"ui/effect-blind.js",
18-
"ui/effect-bounce.js",
19-
"ui/effect-clip.js",
20-
"ui/effect-drop.js",
21-
"ui/effect-explode.js",
22-
"ui/effect-fade.js",
23-
"ui/effect-fold.js",
24-
"ui/effect-highlight.js",
25-
"ui/effect-puff.js",
26-
"ui/effect-pulsate.js",
27-
"ui/effect-scale.js",
28-
"ui/effect-shake.js",
29-
"ui/effect-size.js",
30-
"ui/effect-slide.js",
31-
"ui/effect-transfer.js"
32-
]
33-
});
7+
<script src="../../lib/css.js"></script>
8+
<script src="../../lib/bootstrap.js" data-modules="effects_core effects_scale">
349
</script>
35-
36-
<script src="effects_core.js"></script>
37-
<script src="effects_scale.js"></script>
38-
39-
<script src="../swarminject.js"></script>
4010
<style>
4111
#qunit-fixture {
4212
width: 1000px;

tests/unit/effects/effects_core.js

+22-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
1-
(function($) {
1+
define( [
2+
"jquery",
3+
"lib/common",
4+
"ui/effect",
5+
"ui/effect-blind",
6+
"ui/effect-bounce",
7+
"ui/effect-clip",
8+
"ui/effect-drop",
9+
"ui/effect-explode",
10+
"ui/effect-fade",
11+
"ui/effect-fold",
12+
"ui/effect-highlight",
13+
"ui/effect-puff",
14+
"ui/effect-pulsate",
15+
"ui/effect-scale",
16+
"ui/effect-shake",
17+
"ui/effect-size",
18+
"ui/effect-slide",
19+
"ui/effect-transfer"
20+
], function( $, common ) {
221

322
function present( value, array, message ) {
423
QUnit.push( jQuery.inArray( value, array ) !== -1, value, array, message );
@@ -242,7 +261,7 @@ test( "createPlaceholder: preserves layout affecting properties", function() {
242261
$.each( $.effects.effect, function( effect ) {
243262
module( "effects." + effect );
244263

245-
TestHelpers.testJshint( "effect-" + effect );
264+
common.testJshint( "effect-" + effect );
246265

247266
if ( effect === "transfer" ) {
248267
return;
@@ -319,4 +338,4 @@ $.each( $.effects.effect, function( effect ) {
319338
});
320339
});
321340

322-
})(jQuery);
341+
} );

tests/unit/effects/effects_scale.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
(function( $ ) {
1+
define( [
2+
"jquery",
3+
"ui/effect-scale"
4+
], function( $ ) {
5+
26
module( "effect.scale: Scale" );
37

48
function run( position, v, h, vo, ho ) {
@@ -65,4 +69,4 @@ $(function() {
6569
}
6670
});
6771

68-
})( jQuery );
72+
} );

0 commit comments

Comments
 (0)