X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=786a46ef1a1d31cc973c76227158ac4b1dcbcb99;hb=0a307b332e896b6b480952abb5d3bf03819893c8;hp=a9c88153f629ab849a1345d8be38af2fdeff86a6;hpb=a45372a4c5cfd33c4ff12b145bd79fec2fe0d382;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index a9c8815..786a46e 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -1135,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" );
+
+	count1 = 0, count2 = 0;
 
-	jQuery("#liveSpan2").trigger("foo.zed");
+	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(){
@@ -1715,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');
 });
 
 /*