Skip to content

Commit a2da340

Browse files
scottgonzalezscottgonzalez
committed
Tooltip: Convert tests to new infrastructure
Ref #10119 Ref jquerygh-1528
1 parent 7d48112 commit a2da340

9 files changed

+48
-69
lines changed

‎tests/unit/tooltip/tooltip.html

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

7-
<script src="../../jquery.js"></script>
8-
<script>
9-
$.uiBackCompat = false;
10-
</script>
11-
<link rel="stylesheet" href="../../../external/qunit/qunit.css">
12-
<script src="../../../external/qunit/qunit.js"></script>
13-
<script src="../../../external/jquery-simulate/jquery.simulate.js"></script>
14-
<script src="../testsuite.js"></script>
15-
<script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
16-
<script>
17-
TestHelpers.loadResources({
18-
css: [ "core", "tooltip" ],
19-
js: [
20-
"ui/core.js",
21-
"ui/widget.js",
22-
"ui/position.js",
23-
"ui/tooltip.js"
24-
]
25-
});
26-
</script>
27-
28-
<script src="tooltip_common.js"></script>
29-
<script src="tooltip_core.js"></script>
30-
<script src="tooltip_events.js"></script>
31-
<script src="tooltip_methods.js"></script>
32-
<script src="tooltip_options.js"></script>
33-
34-
<script src="../swarminject.js"></script>
7+
<script src="../../lib/css.js" data-modules="core tooltip"></script>
8+
<script src="../../lib/bootstrap.js" data-widget="tooltip" data-no-back-compat="true"></script>
359
</head>
3610
<body>
3711

‎tests/unit/tooltip/tooltip_common.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
TestHelpers.commonWidgetTests( "tooltip", {
1+
define( [
2+
"lib/common",
3+
"ui/tooltip"
4+
], function( common ) {
5+
6+
common.testWidget( "tooltip", {
27
defaults: {
38
classes: {
49
"ui-tooltip": "ui-corner-all ui-widget-shadow"
@@ -21,3 +26,5 @@ TestHelpers.commonWidgetTests( "tooltip", {
2126
open: null
2227
}
2328
});
29+
30+
} );

‎tests/unit/tooltip/tooltip_common_deprecated.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
TestHelpers.commonWidgetTests( "tooltip", {
1+
define( [
2+
"lib/common",
3+
"ui/tooltip"
4+
], function( common ) {
5+
6+
common.testWidget( "tooltip", {
27
defaults: {
38
classes: {
49
"ui-tooltip": "ui-corner-all ui-widget-shadow"
@@ -22,3 +27,5 @@ TestHelpers.commonWidgetTests( "tooltip", {
2227
open: null
2328
}
2429
});
30+
31+
} );

‎tests/unit/tooltip/tooltip_core.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
(function( $ ) {
1+
define( [
2+
"jquery",
3+
"ui/tooltip"
4+
], function( $ ) {
25

36
module( "tooltip: core" );
47

@@ -218,4 +221,4 @@ asyncTest( "multiple active delegated tooltips", function() {
218221
step1();
219222
});
220223

221-
}( jQuery ) );
224+
} );

‎tests/unit/tooltip/tooltip_deprecated.html

+2-26
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,8 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Tooltip 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-
css: [ "core", "tooltip" ],
16-
js: [
17-
"ui/core.js",
18-
"ui/widget.js",
19-
"ui/position.js",
20-
"ui/tooltip.js"
21-
]
22-
});
23-
</script>
24-
25-
<script src="tooltip_common_deprecated.js"></script>
26-
<script src="tooltip_core.js"></script>
27-
<script src="tooltip_events.js"></script>
28-
<script src="tooltip_methods.js"></script>
29-
<script src="tooltip_options.js"></script>
30-
<script src="tooltip_deprecated.js"></script>
31-
32-
<script src="../swarminject.js"></script>
7+
<script src="../../lib/css.js" data-modules="core tooltip"></script>
8+
<script src="../../lib/bootstrap.js" data-widget="tooltip" data-deprecated="true"></script>
339
</head>
3410
<body>
3511

‎tests/unit/tooltip/tooltip_deprecated.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
(function( $ ) {
1+
define( [
2+
"jquery",
3+
"ui/tooltip"
4+
], function( $ ) {
25

36
module( "tooltip: (deprecated) options" );
47

@@ -10,4 +13,4 @@ test( "tooltipClass", function( assert ) {
1013
assert.hasClasses( $( "#" + element.data( "ui-tooltip-id" ) ), "custom" );
1114
});
1215

13-
}( jQuery ) );
16+
} );

‎tests/unit/tooltip/tooltip_events.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
(function( $ ) {
1+
define( [
2+
"jquery",
3+
"ui/tooltip"
4+
], function( $ ) {
25

36
module( "tooltip: events" );
47

@@ -54,4 +57,4 @@ test( "focus events", function() {
5457
element.trigger( "focusout" );
5558
});
5659

57-
}( jQuery ) );
60+
} );

‎tests/unit/tooltip/tooltip_methods.js

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
(function( $ ) {
1+
define( [
2+
"jquery",
3+
"ui/tooltip"
4+
], function( $ ) {
25

36
module( "tooltip: methods" );
47

5-
test( "destroy", function() {
8+
test( "destroy", function( assert ) {
69
expect( 3 );
710
var element = $( "#tooltipped1" );
811

9-
domEqual( "#tooltipped1", function() {
12+
assert.domEqual( "#tooltipped1", function() {
1013
element.tooltip().tooltip( "destroy" );
1114
});
1215

1316
// make sure that open tooltips are removed on destroy
14-
domEqual( "#tooltipped1", function() {
17+
assert.domEqual( "#tooltipped1", function() {
1518
element
1619
.tooltip()
1720
.tooltip( "open", $.Event( "mouseover", { target: element[0] }) )
@@ -133,4 +136,4 @@ test( "preserve changes to title attributes on close and destroy", function() {
133136
} );
134137
});
135138

136-
}( jQuery ) );
139+
} );

‎tests/unit/tooltip/tooltip_options.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
(function( $ ) {
1+
define( [
2+
"jquery",
3+
"ui/tooltip"
4+
], function( $ ) {
25

36
module( "tooltip: options" );
47

@@ -209,4 +212,4 @@ test( "track and programmatic focus", function() {
209212
equal( "inputtitle", $( ".ui-tooltip" ).text() );
210213
});
211214

212-
}( jQuery ) );
215+
} );

0 commit comments

Comments
 (0)