Re-arranged many of the selector tests, breaking them into smaller test groups and...

[jquery.git] / test / unit / event.js

diff --git a/test/unit/event.js b/test/unit/event.js
index d2da8e2..65b08af 100644 (file)
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -192,6 +192,10 @@ test("bind(), multi-namespaced events", function() {
        jQuery("#firstp").bind("click.test.abc",function(e){
                check("click.test.abc", "Namespaced click triggered");
        });
+       
+       // Those would not trigger/unbind (#5303)
+       jQuery("#firstp").trigger("click.a.test");
+       jQuery("#firstp").unbind("click.a.test");
 
        // Trigger both bound fn (1)
        jQuery("#firstp").trigger("click.test.abc");
@@ -532,7 +536,7 @@ test("jQuery.Event.currentTarget", function(){
 });
 
 test("toggle(Function, Function, ...)", function() {
-       expect(11);
+       expect(16);
        
        var count = 0,
                fn1 = function(e) { count++; },
@@ -585,6 +589,22 @@ test("toggle(Function, Function, ...)", function() {
        $div.unbind('click',fns[0]);
        var data = jQuery.data( $div[0], 'events' );
        ok( !data, "Unbinding one function from toggle unbinds them all");
+
+       // Test Multi-Toggles
+       var a = [], b = [];
+       $div = jQuery("<div/>");
+       $div.toggle(function(){ a.push(1); }, function(){ a.push(2); });
+       $div.click();
+       same( a, [1], "Check that a click worked." );
+
+       $div.toggle(function(){ b.push(1); }, function(){ b.push(2); });
+       $div.click();
+       same( a, [1,2], "Check that a click worked with a second toggle." );
+       same( b, [1], "Check that a click worked with a second toggle." );
+
+       $div.click();
+       same( a, [1,2,1], "Check that a click worked with a second toggle, second click." );
+       same( b, [1,2], "Check that a click worked with a second toggle, second click." );
 });
 
 test(".live()/.die()", function() {
@@ -773,15 +793,17 @@ test(".live()/.die()", function() {
 
        jQuery('span#liveSpan1 a').click();
        equals( lived, 1, "Verify that only one first handler occurred." );
-       equals( livee, 0, "Verify that second handler don't." );
+       equals( livee, 0, "Verify that second handler doesn't." );
 
        // and one pair in inverse
-       jQuery('#liveHandlerOrder span#liveSpan2').live('click', function(){ livee++; });
-       jQuery('#liveHandlerOrder span#liveSpan2 a').live('click', function(){ lived++; return false; });
+       jQuery('span#liveSpan2').live('click', function(){ livee++; });
+       jQuery('span#liveSpan2 a').live('click', function(){ lived++; return false; });
 
+       lived = 0;
+       livee = 0;
        jQuery('span#liveSpan2 a').click();
-       equals( lived, 2, "Verify that only one first handler occurred." );
-       equals( livee, 0, "Verify that second handler don't." );
+       equals( lived, 1, "Verify that only one first handler occurred." );
+       equals( livee, 0, "Verify that second handler doesn't." );
        
        // Cleanup
        jQuery("span#liveSpan1 a, span#liveSpan1, span#liveSpan2 a, span#liveSpan2").die("click");