Cleaned up a lot of the test suite - reorganized and renamed tests. A…

…dded a new triggerEvent() method to the test runner to help us better test actual event interactions.
jquery · Mar 25, 2007 · d7a8794 · d7a8794
1 parent 00a2fa5
commit d7a8794
Show file tree

Hide file tree

Showing 5 changed files with 174 additions and 148 deletions.
diff --git a/build/test/data/testrunner.js b/build/test/data/testrunner.js
@@ -251,6 +251,26 @@ function url(value) {
  */
 function equals(expected, actual, message) {
 	var result = expected == actual;
-	message = message || result ? "okay" : "failed";
+	message = message || (result ? "okay" : "failed");
 	_config.Test.push( [ result, result ? message + ": " + expected : message + " expected: " + expected + " actual: " + actual ] );
 }
+
+/**
+ * Trigger an event on an element.
+ *
+ * @example triggerEvent( document.body, "click" );
+ *
+ * @param DOMElement elem
+ * @param String type
+ */
+function triggerEvent( elem, type, event ) {
+	if ( jQuery.browser.mozilla ) {
+		event = document.createEvent("MouseEvents");
+		event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView,
+			0, 0, 0, 0, 0, false, false, false, false, 0, null);
+		elem.dispatchEvent( event );
+	} else if ( jQuery.browser.msie || jQuery.browser.opera ) {
+		event = document.createEventObject();
+		elem.fireEvent("on"+type, event);
+	}
+}
diff --git a/src/event/eventTest.js b/src/event/eventTest.js
@@ -1,17 +1,66 @@
 module("event");
 
-test("toggle(Function, Function) - add toggle event and fake a few clicks", function() {
-	expect(1);
-	var count = 0,
-		fn1 = function(e) { count++; },
-		fn2 = function(e) { count--; },
-		preventDefault = function(e) { e.preventDefault() },
-		link = $('#mark');
-	if ( $.browser.msie || $.browser.opera || /konquerer/i.test(navigator.userAgent) )
-		ok( false, "click() on link gets executed in IE/Opera/Konquerer, not intended behaviour!" );
-	else
-		link.click(preventDefault).click().toggle(fn1, fn2).click().click().click().click().click();
-	ok( count == 1, "Check for toggle(fn, fn)" );
+test("bind()", function() {
+	expect(11);
+
+	var handler = function(event) {
+		ok( event.data, "bind() with data, check passed data exists" );
+		ok( event.data.foo == "bar", "bind() with data, Check value of passed data" );
+	}
+	$("#firstp").bind("click", {foo: "bar"}, handler).click();
+
+	reset();
+	var handler = function(event, data) {
+		ok( event.data, "check passed data exists" );
+		ok( event.data.foo == "bar", "Check value of passed data" );
+		ok( data, "Check trigger data" );
+		ok( data.bar == "foo", "Check value of trigger data" );
+	}
+	$("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]);
+
+	// events don't work with iframes, see #939
+    var tmp = document.createElement('iframe');
+    document.body.appendChild( tmp );
+    var doc = tmp.contentDocument;
+    doc.open();
+    doc.write("<html><body><input type='text'/></body></html>");
+    doc.close();
+
+    var input = doc.getElementsByTagName("input")[0];
+
+    input.addEventListener('click', function() {
+    	ok( true, "Event handling via DOM 2 methods" );
+    }, false);
+
+    $(input).bind("click",function() {
+    	ok( true, "Event handling via jQuery's handler" );
+    });
+
+    triggerEvent( input, "click" );
+
+    document.body.removeChild( tmp );
+
+	var counter = 0;
+	function selectOnChange(event) {
+		equals( event.data, counter++, "Event.data is a global event object" );
+	}
+	$("select").each(function(i){
+		$(this).bind('change', i, selectOnChange);
+	}).trigger('change');
+});
+
+test("click()", function() {
+	expect(3);
+	$('<li><a href="#">Change location</a></li>').prependTo('#firstUL').find('a').bind('click', function() {
+	    var close = $('spanx', this); // same with $(this).find('span');
+	    ok( close.length == 0, "Context element does not exist, length must be zero" );
+	    ok( !close[0], "Context element does not exist, direct access to element must return undefined" );
+	    return false;
+	}).click();
+
+	$("#check1").click(function() {
+		ok( true, "click event handler for checkbox gets fired twice, see #815" );
+	}).click();
 });
 
 test("unbind(event)", function() {
@@ -48,67 +97,27 @@ test("trigger(event, [data]", function() {
 	$("#firstp").bind("click", handler).trigger("click", [1, "2", "abc"]);
 });
 
-test("bind() with data", function() {
-	expect(2);
-	var handler = function(event) {
-		ok( event.data, "check passed data exists" );
-		ok( event.data.foo == "bar", "Check value of passed data" );
-	}
-	$("#firstp").bind("click", {foo: "bar"}, handler).click();
-});
-
-test("bind() with data and trigger() with data", function() {
-	expect(4);
-	var handler = function(event, data) {
-		ok( event.data, "check passed data exists" );
-		ok( event.data.foo == "bar", "Check value of passed data" );
-		ok( data, "Check trigger data" );
-		ok( data.bar == "foo", "Check value of trigger data" );
-	}
-	$("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]);
-});
-
-test("toggle(Function,Function) assigned from within one('xxx'), see #1054", function() {
+test("toggle(Function, Function)", function() {
 	expect(4);
+	var count = 0,
+		fn1 = function(e) { count++; },
+		fn2 = function(e) { count--; },
+		preventDefault = function(e) { e.preventDefault() },
+		link = $('#mark');
+	if ( $.browser.msie || $.browser.opera || /konquerer/i.test(navigator.userAgent) )
+		ok( false, "click() on link gets executed in IE/Opera/Konquerer, not intended behaviour!" );
+	else
+		link.click(preventDefault).click().toggle(fn1, fn2).click().click().click().click().click();
+	ok( count == 1, "Check for toggle(fn, fn)" );
+
 	var first = 0;
 	$("#simon1").one("click", function() {
 		ok( true, "Execute event only once" );
 		$(this).toggle(function() {
-			ok( first++ == 0 );
+			ok( first++ == 0, "toggle(Function,Function) assigned from within one('xxx'), see #1054" );
 		}, function() {
-			ok( first == 1 );
+			ok( first == 1, "toggle(Function,Function) assigned from within one('xxx'), see #1054" );
 		});
 		return false;
 	}).click().click().click();
-	ok( false, "Seems like this doesn't work (that is, it doesn't fail) when triggering the event programmatically" );
-});
-
-test("events don't work with iframes, see #939", function() {
-	expect(2);
-	var iframe = document.getElementById('iframe');
-    var doc = iframe.contentDocument;
-    doc.addEventListener('click', function() {
-    	ok( true, "Event handling via DOM 2 methods" );
-    }, false);
-    $(doc).click(function() {
-    	ok( true, "Event handling via jQuery's handler" );
-    }).click();
-});
-
-test("Event.data is a global event object", function() {
-	expect(3);
-	var counter = 0;
-	function selectOnChange(event) {
-		equals( event.data, counter++ );
-	}
-	$("select").each(function(i){
-		$(this).bind('change', i, selectOnChange);
-	}).trigger('change');
-});
-
-test("click event handler for checkbox gets fired twice, see #815", function() {
-	expect(1);
-	$("#check1").click(function() {
-		ok( true );
-	}).click();
 });
diff --git a/src/fx/fxTest.js b/src/fx/fxTest.js
@@ -1,17 +1,18 @@
 module("fx");
 
-test("animate(Hash, Object, Function) - assert that animate doesn't modify its arguments", function() {
+test("animate(Hash, Object, Function)", function() {
 	expect(1);
 	stop();
 	var hash = {opacity: 'show'};
 	var hashCopy = $.extend({}, hash);
-	$('#foo').animate(hash, 'fast', function() {
+	$('#foo').animate(hash, 0, function() {
 		ok( hash.opacity == hashCopy.opacity, 'Check if animate changed the hash parameter' );
 		start();
 	});
 });
 
 test("toggle()", function() {
+	expect(3);
 	var x = $("#foo");
 	ok( x.is(":visible") );
 	x.toggle();