X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2FeventTest.js;h=84c7b97d9f59fd96e5dab42e23a993d6cb8c224c;hb=042a46386a4e5efe787f963245aa534663559838;hp=7ac3a6efbd52cd1331c60026d131761b7872f357;hpb=15faf783b9c3c454868b5054fdcfb63e8950abf9;p=jquery.git

diff --git a/src/event/eventTest.js b/src/event/eventTest.js
index 7ac3a6e..84c7b97 100644
--- a/src/event/eventTest.js
+++ b/src/event/eventTest.js
@@ -94,13 +94,41 @@ test("unbind(event)", function() {
 });
 
 test("trigger(event, [data]", function() {
-	expect(3);
+	expect(28);
+
 	var handler = function(event, a, b, c) {
-		ok( a == 1, "check passed data" );
-		ok( b == "2", "check passed data" );
-		ok( c == "abc", "check passed data" );
+		equals( event.type, "click", "check passed data" );
+		equals( a, 1, "check passed data" );
+		equals( b, "2", "check passed data" );
+		equals( c, "abc", "check passed data" );
+		return "test";
+	};
+
+	// Simulate a "native" click
+	$("#firstp")[0].click = function(){
+		ok( true, "Native call was triggered" );
 	};
+
+	// Triggers handlrs and native
+	// Trigger 5
 	$("#firstp").bind("click", handler).trigger("click", [1, "2", "abc"]);
+
+	// Triggers handlers, native, and extra fn
+	// Triggers 9
+	$("#firstp").trigger("click", [1, "2", "abc"], handler);
+
+	// Simulate a "native" click
+	$("#firstp")[0].click = function(){
+		ok( false, "Native call was triggered" );
+	};
+
+	// Trigger only the handlers (no native)
+	// Triggers 4
+	equals( $("#firstp").triggerHandler("click", [1, "2", "abc"]), "test", "Verify handler response" );
+
+	// Trigger only the handlers (no native) and extra fn
+	// Triggers 8
+	equals( $("#firstp").triggerHandler("click", [1, "2", "abc"], handler), "test", "Verify handler response" );
 });
 
 test("toggle(Function, Function)", function() {
@@ -123,4 +151,4 @@ test("toggle(Function, Function)", function() {
 		});
 		return false;
 	}).click().click().click();
-});
\ No newline at end of file
+});