Added in Ben Alman's proposed event.namespace property (the property holds the namesp...

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

diff --git a/test/unit/event.js b/test/unit/event.js
index a220ebf..786a46e 100644 (file)
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -11,6 +11,17 @@ test("bind(), with data", function() {
        ok( !jQuery.data(jQuery("#firstp")[0], "events"), "Event handler unbound when using data." );
 });
 
+test("click(), with data", function() {
+       expect(3);
+       var handler = function(event) {
+               ok( event.data, "bind() with data, check passed data exists" );
+               equals( event.data.foo, "bar", "bind() with data, Check value of passed data" );
+       };
+       jQuery("#firstp").click({foo: "bar"}, handler).click().unbind("click", handler);
+
+       ok( !jQuery.data(jQuery("#firstp")[0], "events"), "Event handler unbound when using data." );
+});
+
 test("bind(), with data, trigger with data", function() {
        expect(4);
        var handler = function(event, data) {
@@ -373,6 +384,25 @@ test("bind(), with different this object", function() {
        ok( !jQuery.data(jQuery("#firstp")[0], "events"), "Event handler unbound when using different this object and data." );
 });
 
+test("bind(name, false), unbind(name, false)", function() {
+       expect(3);
+
+       var main = 0;
+       jQuery("#main").bind("click", function(e){ main++; });
+       jQuery("#ap").trigger("click");
+       equals( main, 1, "Verify that the trigger happened correctly." );
+
+       main = 0;
+       jQuery("#ap").bind("click", false);
+       jQuery("#ap").trigger("click");
+       equals( main, 0, "Verify that no bubble happened." );
+
+       main = 0;
+       jQuery("#ap").unbind("click", false);
+       jQuery("#ap").trigger("click");
+       equals( main, 1, "Verify that the trigger happened correctly." );
+});
+
 test("bind()/trigger()/unbind() on plain object", function() {
        expect( 2 );
 
@@ -1105,41 +1135,55 @@ test("live with multiple events", function(){
 });
 
 test("live with namespaces", function(){
-       expect(6);
+       expect(12);
 
        var count1 = 0, count2 = 0;
 
-       jQuery("#liveSpan1").live("foo.bar", function(){
+       jQuery("#liveSpan1").live("foo.bar", function(e){
                count1++;
        });
 
-       jQuery("#liveSpan2").live("foo.zed", function(){
+       jQuery("#liveSpan1").live("foo.zed", function(e){
                count2++;
        });
 
        jQuery("#liveSpan1").trigger("foo.bar");
        equals( count1, 1, "Got live foo.bar" );
+       equals( count2, 0, "Got live foo.bar" );
 
-       jQuery("#liveSpan2").trigger("foo.zed");
+       count1 = 0, count2 = 0;
+
+       jQuery("#liveSpan1").trigger("foo.zed");
+       equals( count1, 0, "Got live foo.zed" );
        equals( count2, 1, "Got live foo.zed" );
 
        //remove one
-       jQuery("#liveSpan2").die("foo.zed");
+       count1 = 0, count2 = 0;
+
+       jQuery("#liveSpan1").die("foo.zed");
        jQuery("#liveSpan1").trigger("foo.bar");
 
-       equals( count1, 2, "Got live foo.bar after dieing foo.zed" );
+       equals( count1, 1, "Got live foo.bar after dieing foo.zed" );
+       equals( count2, 0, "Got live foo.bar after dieing foo.zed" );
 
-       jQuery("#liveSpan2").trigger("foo.zed");
-       equals( count2, 1, "Got live foo.zed" );
+       count1 = 0, count2 = 0;
+
+       jQuery("#liveSpan1").trigger("foo.zed");
+       equals( count1, 0, "Got live foo.zed" );
+       equals( count2, 0, "Got live foo.zed" );
 
        //remove the other
        jQuery("#liveSpan1").die("foo.bar");
 
+       count1 = 0, count2 = 0;
+
        jQuery("#liveSpan1").trigger("foo.bar");
-       equals( count1, 2, "Did not respond to foo.bar after dieing it" );
+       equals( count1, 0, "Did not respond to foo.bar after dieing it" );
+       equals( count2, 0, "Did not respond to foo.bar after dieing it" );
 
-       jQuery("#liveSpan2").trigger("foo.zed");
-       equals( count2, 1, "Did not trigger foo.zed again" );
+       jQuery("#liveSpan1").trigger("foo.zed");
+       equals( count1, 0, "Did not trigger foo.zed again" );
+       equals( count2, 0, "Did not trigger foo.zed again" );
 });
 
 test("live with change", function(){
@@ -1685,24 +1729,15 @@ test("delegate with submit", function() {
 });
 
 test("Non DOM element events", function() {
-       expect(3);
-
-       jQuery({})
-               .bind('nonelementglobal', function(e) {
-                       ok( true, "Global event on non-DOM annonymos object triggered" );
-               });
+       expect(1);
 
        var o = {};
 
-       jQuery(o)
-               .bind('nonelementobj', function(e) {
-                       ok( true, "Event on non-DOM object triggered" );
-               }).bind('nonelementglobal', function() {
-                       ok( true, "Global event on non-DOM object triggered" );
-               });
+       jQuery(o).bind('nonelementobj', function(e) {
+               ok( true, "Event on non-DOM object triggered" );
+       });
 
        jQuery(o).trigger('nonelementobj');
-       jQuery.event.trigger('nonelementglobal');
 });
 
 /*