X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=47da9b698ab0c718ff39e2990d3257bda990e56c;hb=b6d70a7ce3795e8c1306a513b89a31de0c5f0a13;hp=334f286c78d37d78d64214780d934dae2bb780b7;hpb=6728e3cf74d02794113deb0af70a5f9a7caa2241;p=jquery.git

diff --git a/test/unit/event.js b/test/unit/event.js
index 334f286..47da9b6 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -8,8 +8,8 @@ test("bind()", function() {
 		ok( event.data.foo == "bar", "bind() with data, Check value of passed data" );
 	};
 	$("#firstp").bind("click", {foo: "bar"}, handler).click().unbind("click", handler);
-	
-	ok( !$("#firstp").get(0).$events, "Event handler unbound when using data." );
+
+	ok( !jQuery.data($("#firstp")[0], "events"), "Event handler unbound when using data." );
 	
 	reset();
 	var handler = function(event, data) {
@@ -108,11 +108,11 @@ test("unbind(event)", function() {
 
 	el.click(function() { return; });
 	el.unbind('change',function(){ return; });
-	for (var ret in el[0].$events['click']) break;
+	for (var ret in jQuery.data(el[0], "events")['click']) break;
 	ok( ret, "Extra handlers weren't accidentally removed." );
 
 	el.unbind('click');
-	ok( !el[0].$events, "Removed the events expando after all handlers are unbound." );
+	ok( !jQuery.data(el[0], "events"), "Removed the events expando after all handlers are unbound." );
 });
 
 test("trigger(event, [data], [fn])", function() {
@@ -160,19 +160,19 @@ test("trigger(event, [data], [fn])", function() {
 	equals( $("#firstp").triggerHandler("click", [1, "2", "abc"], handler2), "test", "Verify handler response" );
 
 	// Build fake click event to pass in
-	var eventObj = jQuery.event.fix({ type: "click", target: document.body });
+	var eventObj = jQuery.event.fix({ type: "foo", target: document.body });
 
 	// Trigger only the handlers (no native), with external event obj
 	// Triggers 5
-	equals( $("#firstp").triggerHandler("foo", [eventObj, 1, "2", "abc"]), "test", "Verify handler response" );
+	equals( $("#firstp").triggerHandler("click", [eventObj, 1, "2", "abc"]), "test", "Verify handler response" );
 
 	// Trigger only the handlers (no native) and extra fn, with external event obj
 	// Triggers 9
-	equals( $("#firstp").triggerHandler("foo", [eventObj, 1, "2", "abc"], handler), "test", "Verify handler response" );
+	equals( $("#firstp").triggerHandler("click", [eventObj, 1, "2", "abc"], handler), "test", "Verify handler response" );
 });
 
 test("toggle(Function, Function)", function() {
-	expect(4);
+	expect(5);
 	var count = 0,
 		fn1 = function(e) { count++; },
 		fn2 = function(e) { count--; },
@@ -180,7 +180,11 @@ test("toggle(Function, Function)", function() {
 		link = $('#mark');
 	link.click(preventDefault).click().toggle(fn1, fn2).click().click().click().click().click();
 	ok( count == 1, "Check for toggle(fn, fn)" );
-	
+
+	$("#firstp").toggle(function () {
+		equals(arguments.length, 4, "toggle correctly passes through additional triggered arguments, see #1701" )
+	}, function() {}).trigger("click", [ 1, 2, 3 ]);
+
 	var first = 0;
 	$("#simon1").one("click", function() {
 		ok( true, "Execute event only once" );