Skip to content

Commit 666b53a

Browse files
committed
Tooltip tests: Refactored and added some tests.
1 parent 2fbd310 commit 666b53a

File tree

2 files changed

+47
-35
lines changed

2 files changed

+47
-35
lines changed

tests/unit/tooltip/tooltip_events.js

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,47 @@ module( "tooltip: events" );
44

55
test( "programmatic triggers", function() {
66
expect( 2 );
7-
var element = $( "#tooltipped1" ).tooltip({
8-
open: function( event, ui ) {
9-
same( event.type, "tooltipopen" );
10-
},
11-
close: function( event, ui ) {
12-
same( event.type, "tooltipclose" );
13-
}
7+
var element = $( "#tooltipped1" ).tooltip();
8+
9+
element.one( "tooltipopen", function( event ) {
10+
ok( !( "originalEvent" in event ), "open" );
11+
});
12+
element.tooltip( "open" );
13+
14+
element.one( "tooltipclose", function( event ) {
15+
ok( !( "originalEvent" in event ), "close" );
1416
});
15-
element.tooltip( "open" ).tooltip( "close" );
17+
element.tooltip( "close" );
1618
});
1719

1820
test( "mouse events", function() {
19-
expect( 4 );
20-
var element = $( "#tooltipped1" ).tooltip({
21-
open: function( event, ui ) {
22-
same( event.type, "tooltipopen" );
23-
same( event.originalEvent.type, "mouseover" );
24-
},
25-
close: function( event, ui ) {
26-
same( event.type, "tooltipclose" );
27-
same( event.originalEvent.type, "mouseleave" );
28-
}
21+
expect( 2 );
22+
var element = $( "#tooltipped1" ).tooltip();
23+
24+
element.one( "tooltipopen", function( event ) {
25+
same( event.originalEvent.type, "mouseover" );
2926
});
30-
element.trigger( "mouseover" ).trigger( "mouseleave" );
27+
element.trigger( "mouseover" );
28+
29+
element.one( "tooltipclose", function( event ) {
30+
same( event.originalEvent.type, "mouseleave" );
31+
});
32+
element.trigger( "mouseleave" );
3133
});
3234

3335
test( "focus events", function() {
34-
expect( 4 );
35-
var element = $( "#tooltipped1" ).tooltip({
36-
open: function( event, ui ) {
37-
same( event.type, "tooltipopen" );
38-
same( event.originalEvent.type, "focusin" );
39-
},
40-
close: function( event, ui ) {
41-
same( event.type, "tooltipclose" );
42-
same( event.originalEvent.type, "blur" );
43-
}
36+
expect( 2 );
37+
var element = $( "#tooltipped1" ).tooltip();
38+
39+
element.one( "tooltipopen", function( event ) {
40+
same( event.originalEvent.type, "focusin" );
41+
});
42+
element.trigger( "focusin" );
43+
44+
element.one( "tooltipclose", function( event ) {
45+
same( event.originalEvent.type, "blur" );
4446
});
45-
element.trigger( "focus" ).trigger( "blur" );
47+
element.trigger( "blur" );
4648
});
4749

4850
}( jQuery ) );

tests/unit/tooltip/tooltip_methods.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,25 @@
33
module( "tooltip: methods" );
44

55
test( "destroy", function() {
6-
var beforeHtml = $( "#tooltipped1" ).parent().html();
7-
var afterHtml = $( "#tooltipped1" ).tooltip().tooltip( "destroy" ).parent().html();
8-
equal( afterHtml, beforeHtml );
6+
domEqual( "#tooltipped1", function() {
7+
$( "#tooltipped1" ).tooltip().tooltip( "destroy" );
8+
});
99
});
1010

11-
test( "open", function() {
11+
test( "open/close", function() {
12+
expect( 3 );
13+
$.fx.off = true;
1214
var element = $( "#tooltipped1" ).tooltip();
15+
equal( $( ".ui-tooltip" ).length, 0, "no tooltip on init" );
16+
$( ".ui-tooltip" ).each(function() {
17+
console.log( $( this ).html() );
18+
});
1319
element.tooltip( "open" );
14-
ok( $( ".ui-tooltip" ).is( ":visible" ) );
20+
var tooltip = $( "#" + element.attr( "aria-describedby" ) );
21+
ok( tooltip.is( ":visible" ) );
22+
element.tooltip( "close" );
23+
ok( tooltip.is( ":hidden" ) );
24+
$.fx.off = false;
1525
});
1626

1727
/*

0 commit comments

Comments
 (0)