]> source.dussan.org Git - jquery.git/commitdiff
projects / jquery.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c9935b6)
Event: Make event aliases optional in unit tests 2693/head
authorDave Methvin <dave.methvin@gmail.com>
Fri, 6 Nov 2015 14:59:14 +0000 (09:59 -0500)
committerDave Methvin <dave.methvin@gmail.com>
Fri, 6 Nov 2015 15:00:46 +0000 (10:00 -0500)
test/data/event/focusElem.html patch | blob | history
test/unit/event.js patch | blob | history

diff --git a/test/data/event/focusElem.html b/test/data/event/focusElem.html
index 10726b4ff67278dee445b39d08be1797489c5c97..a9a9765184fa8bf101c02a2221285d23adeeea89 100644 (file)
--- a/test/data/event/focusElem.html
+++ b/test/data/event/focusElem.html
@@ -9,7 +9,7 @@
 <body>
        <a href="#" id="frame-link"></a>
        <script>
-               jQuery("#frame-link").focus();
+               jQuery( "#frame-link" ).trigger( "focus" );
                window.parent.iframeCallback( true );
        </script>
 </body>
diff --git a/test/unit/event.js b/test/unit/event.js
index e82db243f14023bd66e0c4ac8144363720e752e7..6193075676636bce92da0a476a50a80df73c62a4 100644 (file)
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -900,49 +900,6 @@ QUnit.test( "mouseenter, mouseleave don't catch exceptions", function( assert )
        }
 } );
 
-if ( jQuery.fn.click ) {
-
-       QUnit.test( "trigger() shortcuts", function( assert ) {
-               assert.expect( 5 );
-
-               var counter, clickCounter,
-                       elem = jQuery( "<li><a href='#'>Change location</a></li>" ).prependTo( "#firstUL" );
-               elem.find( "a" ).on( "click", function() {
-                       var close = jQuery( "spanx", this ); // same with jQuery(this).find("span");
-                       assert.equal( close.length, 0, "Context element does not exist, length must be zero" );
-                       assert.ok( !close[ 0 ], "Context element does not exist, direct access to element must return undefined" );
-                       return false;
-               } ).click();
-
-               // manually clean up detached elements
-               elem.remove();
-
-               jQuery( "#check1" ).click( function() {
-                       assert.ok( true, "click event handler for checkbox gets fired twice, see #815" );
-               } ).click();
-
-               counter = 0;
-               jQuery( "#firstp" )[ 0 ].onclick = function() {
-                       counter++;
-               };
-               jQuery( "#firstp" ).click();
-               assert.equal( counter, 1, "Check that click, triggers onclick event handler also" );
-
-               clickCounter = 0;
-               jQuery( "#simon1" )[ 0 ].onclick = function() {
-                       clickCounter++;
-               };
-               jQuery( "#simon1" ).click();
-               assert.equal( clickCounter, 1, "Check that click, triggers onclick event handler on an a tag also" );
-
-               // test that special handlers do not blow up with VML elements (#7071)
-               jQuery( "<xml:namespace ns='urn:schemas-microsoft-com:vml' prefix='v' />" ).appendTo( "head" );
-               jQuery( "<v:oval id='oval' style='width:100pt;height:75pt;' fillcolor='red'> </v:oval>" ).appendTo( "#form" );
-               jQuery( "#oval" ).click().keydown();
-       } );
-
-}
-
 QUnit.test( "trigger() bubbling", function( assert ) {
        assert.expect( 18 );
 
@@ -2778,7 +2735,7 @@ QUnit.test( "preventDefault() on focusin does not throw exception", function( as
                                "Preventing default on focusin throws no exception" );
 
                        done();
-               } ).focus();
+               } ).trigger( "focus" );
 } );
 
 QUnit.test( "Donor event interference", function( assert ) {
@@ -2843,6 +2800,46 @@ QUnit.test( "originalEvent property for Chrome, Safari, Fx & Edge of simulated e
        jQuery( "#donor-input" ).trigger( "focus" );
 } );
 
+
+QUnit[ jQuery.fn.click ? "test" : "skip" ]( "trigger() shortcuts", function( assert ) {
+       assert.expect( 5 );
+
+       var counter, clickCounter,
+               elem = jQuery( "<li><a href='#'>Change location</a></li>" ).prependTo( "#firstUL" );
+       elem.find( "a" ).on( "click", function() {
+               var close = jQuery( "spanx", this ); // same with jQuery(this).find("span");
+               assert.equal( close.length, 0, "Context element does not exist, length must be zero" );
+               assert.ok( !close[ 0 ], "Context element does not exist, direct access to element must return undefined" );
+               return false;
+       } ).click();
+
+       // manually clean up detached elements
+       elem.remove();
+
+       jQuery( "#check1" ).click( function() {
+               assert.ok( true, "click event handler for checkbox gets fired twice, see #815" );
+       } ).click();
+
+       counter = 0;
+       jQuery( "#firstp" )[ 0 ].onclick = function() {
+               counter++;
+       };
+       jQuery( "#firstp" ).click();
+       assert.equal( counter, 1, "Check that click, triggers onclick event handler also" );
+
+       clickCounter = 0;
+       jQuery( "#simon1" )[ 0 ].onclick = function() {
+               clickCounter++;
+       };
+       jQuery( "#simon1" ).click();
+       assert.equal( clickCounter, 1, "Check that click, triggers onclick event handler on an a tag also" );
+
+       // test that special handlers do not blow up with VML elements (#7071)
+       jQuery( "<xml:namespace ns='urn:schemas-microsoft-com:vml' prefix='v' />" ).appendTo( "head" );
+       jQuery( "<v:oval id='oval' style='width:100pt;height:75pt;' fillcolor='red'> </v:oval>" ).appendTo( "#form" );
+       jQuery( "#oval" ).click().keydown();
+} );
+
 QUnit[ jQuery.fn.click ? "test" : "skip" ]( "Event aliases", function( assert ) {
 
        // Explicitly skipping focus/blur events due to their flakiness
jQuery JavaScript Library: https://github.com/jquery/jquery