X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=f2e981ec000aee00b67777d237884bdb54fdd308;hb=1518ae1aedaafa820ed689ecf26cf43e92913896;hp=a133a104cba3817b33b2a0e13f0c45f1a9d09f23;hpb=da5706c974f8ef720b3194179366e1096c19269e;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index a133a10..f2e981e 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -210,7 +210,7 @@ test("live/die(Object), delegate/undelegate(String, Object)", function() {
 	expect(6);
 	
 	var clickCounter = 0, mouseoverCounter = 0,
-		$p = jQuery("#firstp"), $a = $p.find("a");
+		$p = jQuery("#firstp"), $a = $p.find("a:first");
 	
 	var events = {
 		click: function( event ) {
@@ -229,20 +229,20 @@ test("live/die(Object), delegate/undelegate(String, Object)", function() {
 	$p.delegate( "a", events, 2 );
 	
 	trigger();
-	equals( clickCounter, 3, "live/delegate(Object)" );
-	equals( mouseoverCounter, 3, "live/delegate(Object)" );
+	equals( clickCounter, 3, "live/delegate" );
+	equals( mouseoverCounter, 3, "live/delegate" );
 	
 	$p.undelegate( "a", events );
 	
 	trigger();
-	equals( clickCounter, 4, "undelegate(Object)" );
-	equals( mouseoverCounter, 4, "undelegate(Object)" );
+	equals( clickCounter, 4, "undelegate" );
+	equals( mouseoverCounter, 4, "undelegate" );
 	
 	$a.die( events );
 	
 	trigger();
-	equals( clickCounter, 4, "die(Object)" );
-	equals( mouseoverCounter, 4, "die(Object)" );
+	equals( clickCounter, 4, "die" );
+	equals( mouseoverCounter, 4, "die" );
 });
 
 test("bind(), iframes", function() {
@@ -255,7 +255,7 @@ test("bind(), iframes", function() {
 });
 
 test("bind(), trigger change on select", function() {
-	expect(3);
+	expect(5);
 	var counter = 0;
 	function selectOnChange(event) {
 		equals( event.data, counter++, "Event.data is not a global event object" );
@@ -443,7 +443,7 @@ test("bind(name, false), unbind(name, false)", function() {
 });
 
 test("bind()/trigger()/unbind() on plain object", function() {
-	expect( 2 );
+	expect( 7 );
 
 	var obj = {};
 
@@ -457,7 +457,12 @@ test("bind()/trigger()/unbind() on plain object", function() {
 		ok( true, "Custom event run." );
 	});
 
-	ok( jQuery(obj).data("events"), "Object has events bound." );
+	var events = jQuery(obj).data("__events__");
+	ok( events, "Object has events bound." );
+	equals( obj.events, undefined, "Events object on plain objects is not events" );
+	equals( typeof events, "function", "'events' expando is a function on plain objects." );
+	equals( obj.test, undefined, "Make sure that test event is not on the plain object." );
+	equals( obj.handle, undefined, "Make sure that the event handler is not on the plain object." );
 
 	// Should trigger 1
 	jQuery(obj).trigger("test");
@@ -469,6 +474,8 @@ test("bind()/trigger()/unbind() on plain object", function() {
 
 	// Make sure it doesn't complain when no events are found
 	jQuery(obj).unbind("test");
+	
+	equals( obj.__events__, undefined, "Make sure events object is removed" );
 });
 
 test("unbind(type)", function() {
@@ -1825,6 +1832,18 @@ test("Non DOM element events", function() {
 	jQuery(o).trigger('nonelementobj');
 });
 
+test("window resize", function() {
+	expect(2);
+
+	jQuery(window).unbind();
+
+	jQuery(window).bind("resize", function(){
+		ok( true, "Resize event fired." );
+	}).resize().unbind("resize");
+
+	ok( !jQuery(window).data("events"), "Make sure all the events are gone." );
+});
+
 /*
 test("jQuery(function($) {})", function() {
 	stop();