Skip to content

Commit 8bda52c

Browse files
scottgonzalezscottgonzalez
committed
Spinner: Convert tests to new infrastructure
Ref #10119 Ref gh-1528
1 parent 23a7a11 commit 8bda52c

File tree

8 files changed

+48
-43
lines changed

8 files changed

+48
-43
lines changed

‎tests/lib/bootstrap.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
window.requirejs = {
44
paths: {
5+
"globalize": "../../../external/globalize/globalize",
6+
"globalize/ja-JP": "../../../external/globalize/globalize.culture.ja-JP",
57
"jquery": jqueryUrl(),
68
"jquery-simulate": "../../../external/jquery-simulate/jquery.simulate",
79
"jshint": "../../../external/jshint/jshint",
@@ -12,6 +14,7 @@ window.requirejs = {
1214
"ui": "../../../ui"
1315
},
1416
shim: {
17+
"globalize/ja-JP": [ "globalize" ],
1518
"jquery-simulate": [ "jquery" ],
1619
"qunit-assert-classes": [ "qunit" ]
1720
}

‎tests/unit/spinner/spinner.html

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,8 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Spinner Test Suite</title>
66

7-
<script src="../../jquery.js"></script>
8-
<script src="../../../external/globalize/globalize.js"></script>
9-
<script src="../../../external/globalize/globalize.culture.ja-JP.js"></script>
10-
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
11-
<script src="../../../external/qunit/qunit.js"></script>
12-
<script src="../../../external/jquery-simulate/jquery.simulate.js"></script>
13-
<script src="../testsuite.js"></script>
14-
<script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
15-
<script>
16-
TestHelpers.loadResources({
17-
css: [ "core", "button", "spinner" ],
18-
js: [
19-
"ui/core.js",
20-
"ui/widget.js",
21-
"ui/button.js",
22-
"ui/spinner.js"
23-
]
24-
});
25-
</script>
26-
27-
<script src="spinner_test_helpers.js"></script>
28-
<script src="spinner_common.js"></script>
29-
<script src="spinner_core.js"></script>
30-
<script src="spinner_events.js"></script>
31-
<script src="spinner_methods.js"></script>
32-
<script src="spinner_options.js"></script>
33-
34-
<script src="../swarminject.js"></script>
7+
<script src="../../lib/css.js" data-modules="core button spinner"></script>
8+
<script src="../../lib/bootstrap.js" data-widget="spinner"></script>
359
</head>
3610
<body>
3711

‎tests/unit/spinner/spinner_common.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
TestHelpers.commonWidgetTests( "spinner", {
1+
define( [
2+
"lib/common",
3+
"ui/spinner"
4+
], function( common ) {
5+
6+
common.testWidget( "spinner", {
27
defaults: {
38
classes: {
49
"ui-spinner": "ui-corner-all",
@@ -26,3 +31,5 @@ TestHelpers.commonWidgetTests( "spinner", {
2631
stop: null
2732
}
2833
});
34+
35+
} );

‎tests/unit/spinner/spinner_core.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
(function( $ ) {
1+
define( [
2+
"jquery",
3+
"./spinner_test_helpers",
4+
"ui/spinner"
5+
], function( $, spinnerTestHelpers ) {
26

3-
var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp;
7+
var simulateKeyDownUp = spinnerTestHelpers.simulateKeyDownUp;
48

59
module( "spinner: core" );
610

@@ -250,4 +254,4 @@ test( "precision", function() {
250254
equal( element.val(), "0.05", "precision from min" );
251255
});
252256

253-
})( jQuery );
257+
} );

‎tests/unit/spinner/spinner_events.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
(function( $ ) {
1+
define( [
2+
"jquery",
3+
"./spinner_test_helpers",
4+
"ui/spinner"
5+
], function( $, spinnerTestHelpers ) {
26

3-
var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp;
7+
var simulateKeyDownUp = spinnerTestHelpers.simulateKeyDownUp;
48

59
module( "spinner: events" );
610

@@ -256,4 +260,4 @@ asyncTest( "change", function() {
256260
setTimeout( step1 );
257261
});
258262

259-
})( jQuery );
263+
} );

‎tests/unit/spinner/spinner_methods.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
(function( $ ) {
1+
define( [
2+
"jquery",
3+
"./spinner_test_helpers",
4+
"ui/spinner"
5+
], function( $, spinnerTestHelpers ) {
26

3-
var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp;
7+
var simulateKeyDownUp = spinnerTestHelpers.simulateKeyDownUp;
48

59
module( "spinner: methods" );
610

7-
test( "destroy", function() {
11+
test( "destroy", function( assert ) {
812
expect( 1 );
9-
domEqual( "#spin", function() {
13+
assert.domEqual( "#spin", function() {
1014
$( "#spin" ).spinner().spinner( "destroy" );
1115
});
1216
});
@@ -204,4 +208,4 @@ test( "widget", function() {
204208
strictEqual( widgetElement[ 0 ], element.parent()[ 0 ], "parent element" );
205209
});
206210

207-
})( jQuery );
211+
} );

‎tests/unit/spinner/spinner_options.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
(function( $ ) {
1+
define( [
2+
"jquery",
3+
"ui/spinner",
4+
"globalize",
5+
"globalize/ja-JP"
6+
], function( $ ) {
27

38
module( "spinner: options" );
49

@@ -263,4 +268,4 @@ test( "step, string", function() {
263268
equal( element.val(), "$0.70", "stepUp" );
264269
});
265270

266-
})( jQuery );
271+
} );

‎tests/unit/spinner/spinner_test_helpers.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
TestHelpers.spinner = {
1+
define( function() {
2+
3+
return {
24
simulateKeyDownUp: function( element, keyCode, shift ) {
35
element
46
.simulate( "keydown", { keyCode: keyCode, shiftKey: shift || false } )
57
.simulate( "keyup", { keyCode: keyCode, shiftKey: shift || false } );
68
}
79
};
10+
11+
} );

0 commit comments

Comments
 (0)