Tooltip: Update events test to cover correct behaviour

diff --git a/tests/unit/tooltip/tooltip_events.js b/tests/unit/tooltip/tooltip_events.js
index fc5f1acc5c22e95d4b5e09dc21df832755c5c0c0..de16471aedf09205f15affe8e96b6c550ac494d2 100644 (file)
--- a/tests/unit/tooltip/tooltip_events.js
+++ b/tests/unit/tooltip/tooltip_events.js
@@ -26,14 +26,15 @@ test( "mouse events", function() {
        expect( 2 );
        var element = $( "#tooltipped1" ).tooltip();
 
-       element.one( "tooltipopen", function( event ) {
+       element.bind( "tooltipopen", function( event ) {
                deepEqual( event.originalEvent.type, "mouseover" );
        });
        element.trigger( "mouseover" );
 
-       element.one( "tooltipclose", function( event ) {
+       element.bind( "tooltipclose", function( event ) {
                deepEqual( event.originalEvent.type, "mouseleave" );
        });
+       element.trigger( "focusout" );
        element.trigger( "mouseleave" );
 });
 
@@ -41,43 +42,16 @@ test( "focus events", function() {
        expect( 2 );
        var element = $( "#tooltipped1" ).tooltip();
 
-       element.one( "tooltipopen", function( event ) {
+       element.bind( "tooltipopen", function( event ) {
                deepEqual( event.originalEvent.type, "focusin" );
        });
        element.trigger( "focusin" );
 
-       element.one( "tooltipclose", function( event ) {
-               deepEqual( event.originalEvent.type, "focusout" );
-       });
-       element.trigger( "focusout" );
-});
-
-asyncTest( "mixed events", function() {
-       expect( 2 );
-       var element = $( "#tooltipped1" ).tooltip();
-
-       element.one( "tooltipopen", function( event ) {
-               deepEqual( event.originalEvent.type, "focusin" );
-       });
-       element.simulate( "focus" );
-
-       element.one( "tooltipopen", function() {
-               ok( false, "open triggered while already open" );
-       });
-       element.trigger( "mouseover" );
-
        element.bind( "tooltipclose", function( event ) {
-               ok( false, "close triggered while still focused" );
-       });
-       element.trigger( "mouseleave" );
-       element.unbind( "tooltipclose" );
-
-       // blurring is async in IE
-       element.one( "tooltipclose", function( event ) {
                deepEqual( event.originalEvent.type, "focusout" );
-               start();
        });
-       element.simulate( "blur" );
+       element.trigger( "mouseleave" );
+       element.trigger( "focusout" );
 });
 
 }( jQuery ) );