Added a new extra fn arg to trigger (so you don't have to simulate the trigger yourse...

[jquery.git] / src / event / eventTest.js

diff --git a/src/event/eventTest.js b/src/event/eventTest.js
index d913b56..84c7b97 100644 (file)
--- a/src/event/eventTest.js
+++ b/src/event/eventTest.js
@@ -48,7 +48,7 @@ test("bind()", function() {
 });
 
 test("click()", function() {
-       expect(3);
+       expect(4);
        $('<li><a href="#">Change location</a></li>').prependTo('#firstUL').find('a').bind('click', function() {
            var close = $('spanx', this); // same with $(this).find('span');
            ok( close.length == 0, "Context element does not exist, length must be zero" );
@@ -59,6 +59,13 @@ test("click()", function() {
        $("#check1").click(function() {
                ok( true, "click event handler for checkbox gets fired twice, see #815" );
        }).click();
+       
+       var counter = 0;
+       $('#firstp')[0].onclick = function(event) {
+               counter++;
+       };
+       $('#firstp').click();
+       ok( counter == 1, "Check that click, triggers onclick event handler also" );
 });
 
 test("unbind(event)", function() {
@@ -87,13 +94,41 @@ test("unbind(event)", function() {
 });
 
 test("trigger(event, [data]", function() {
-       expect(3);
+       expect(28);
+
        var handler = function(event, a, b, c) {
-               ok( a == 1, "check passed data" );
-               ok( b == "2", "check passed data" );
-               ok( c == "abc", "check passed data" );
+               equals( event.type, "click", "check passed data" );
+               equals( a, 1, "check passed data" );
+               equals( b, "2", "check passed data" );
+               equals( c, "abc", "check passed data" );
+               return "test";
+       };
+
+       // Simulate a "native" click
+       $("#firstp")[0].click = function(){
+               ok( true, "Native call was triggered" );
        };
+
+       // Triggers handlrs and native
+       // Trigger 5
        $("#firstp").bind("click", handler).trigger("click", [1, "2", "abc"]);
+
+       // Triggers handlers, native, and extra fn
+       // Triggers 9
+       $("#firstp").trigger("click", [1, "2", "abc"], handler);
+
+       // Simulate a "native" click
+       $("#firstp")[0].click = function(){
+               ok( false, "Native call was triggered" );
+       };
+
+       // Trigger only the handlers (no native)
+       // Triggers 4
+       equals( $("#firstp").triggerHandler("click", [1, "2", "abc"]), "test", "Verify handler response" );
+
+       // Trigger only the handlers (no native) and extra fn
+       // Triggers 8
+       equals( $("#firstp").triggerHandler("click", [1, "2", "abc"], handler), "test", "Verify handler response" );
 });
 
 test("toggle(Function, Function)", function() {
@@ -116,4 +151,4 @@ test("toggle(Function, Function)", function() {
                });
                return false;
        }).click().click().click();
-});
\ No newline at end of file
+});