X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=9e1ac8922ae62b9761387544f655ea5d0818229f;hb=ba9e0fc177841bd74cc5ea4e52f09cd87d747bf5;hp=f800fd5c002e90962c9ddf892d51b6aaa4fe975a;hpb=f68b46d7abb54cdcd3d1ce1713bc989f992d1448;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index f800fd5..9e1ac89 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -443,28 +443,28 @@ test("unbind(type)", function() {
 	}
 	
 	message = "unbind passing function";
-	$elem.bind('error', error).unbind('error',error).triggerHandler('error');
+	$elem.bind('error1', error).unbind('error1',error).triggerHandler('error1');
 	
 	message = "unbind all from event";
-	$elem.bind('error', error).unbind('error').triggerHandler('error');
+	$elem.bind('error1', error).unbind('error1').triggerHandler('error1');
 	
 	message = "unbind all";
-	$elem.bind('error', error).unbind().triggerHandler('error');
+	$elem.bind('error1', error).unbind().triggerHandler('error1');
 	
 	message = "unbind many with function";
-	$elem.bind('error error2',error)
-		 .unbind('error error2', error )
-		 .trigger('error').triggerHandler('error2');
+	$elem.bind('error1 error2',error)
+		 .unbind('error1 error2', error )
+		 .trigger('error1').triggerHandler('error2');
 
 	message = "unbind many"; // #3538
-	$elem.bind('error error2',error)
-		 .unbind('error error2')
-		 .trigger('error').triggerHandler('error2');
+	$elem.bind('error1 error2',error)
+		 .unbind('error1 error2')
+		 .trigger('error1').triggerHandler('error2');
 	
 	message = "unbind without a type or handler";
-	$elem.bind("error error2.test",error)
+	$elem.bind("error1 error2.test",error)
 		 .unbind()
-		 .trigger("error").triggerHandler("error2");
+		 .trigger("error1").triggerHandler("error2");
 });
 
 test("unbind(eventObject)", function() {
@@ -1297,16 +1297,9 @@ test("live with submit", function() {
 		ev.preventDefault();
 	});
 
-	if ( jQuery.support.submitBubbles ) {
-		jQuery("#testForm input[name=sub1]")[0].click();
-		equals(count1,1 );
-		equals(count2,1);
-	} else {
-		jQuery("#testForm input[name=sub1]")[0].click();
-		jQuery("#testForm input[name=T1]").trigger({type: "keypress", keyCode: 13});
-		equals(count1,2);
-		equals(count2,2);
-	}
+	jQuery("#testForm input[name=sub1]").submit();
+	equals( count1, 1, "Verify form submit." );
+	equals( count2, 1, "Verify body submit." );
 	
 	jQuery("#testForm").die("submit");
 	jQuery("body").die("submit");
@@ -1773,16 +1766,9 @@ test("delegate with submit", function() {
 		ev.preventDefault();
 	});
 
-	if ( jQuery.support.submitBubbles ) {
-		jQuery("#testForm input[name=sub1]")[0].click();
-		equals(count1,1 );
-		equals(count2,1);
-	} else {
-		jQuery("#testForm input[name=sub1]")[0].click();
-		jQuery("#testForm input[name=T1]").trigger({type: "keypress", keyCode: 13});
-		equals(count1,2);
-		equals(count2,2);
-	}
+	jQuery("#testForm input[name=sub1]").submit();
+	equals( count1, 1, "Verify form submit." );
+	equals( count2, 1, "Verify body submit." );
 	
 	jQuery("#body").undelegate();
 	jQuery(document).undelegate();