From d7a8794eb574a870fde9a8afdfd452e52804f65d Mon Sep 17 00:00:00 2001 From: John Resig Date: Sun, 25 Mar 2007 18:06:18 +0000 Subject: [PATCH] Cleaned up a lot of the test suite - reorganized and renamed tests. Added a new triggerEvent() method to the test runner to help us better test actual event interactions. --- build/test/data/testrunner.js | 22 ++++++- src/event/eventTest.js | 141 ++++++++++++++++++++++------------------- src/fx/fxTest.js | 5 +- src/jquery/coreTest.js | 141 ++++++++++++++++++++--------------------- src/selector/selectorTest.js | 13 ++-- 5 files changed, 174 insertions(+), 148 deletions(-) diff --git a/build/test/data/testrunner.js b/build/test/data/testrunner.js index 72238e3..304f938 100644 --- 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 index 8273244..0ad4ffb 100644 --- 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(""); + 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); + $('

').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(); }); \ No newline at end of file diff --git a/src/fx/fxTest.js b/src/fx/fxTest.js index 23de82a..f7fb865 100644 --- 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(); diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js index a793f17..da5b7fc 100644 --- a/src/jquery/coreTest.js +++ b/src/jquery/coreTest.js @@ -11,12 +11,27 @@ test("Basic requirements", function() { ok( $, "$()" ); }); -test("$()", function() { +test("$()", function() { + expect(3); + var main = $("#main"); isSet( $("div p", main).get(), q("sndp", "en", "sap"), "Basic selector with jQuery object as context" ); // make sure this is handled - $('

\r\n

'); + $('

\r\n

'); + ok( true, "Check for \\r and \\n in jQuery()" ); + + var pass = true; + try { + var f = document.getElementById("iframe").contentDocument; + f.open(); + f.write(""); + f.close(); + $("

Testing

").appendTo(f.body); + } catch(e){ + pass = false; + } + ok( pass, "$('<tag>') needs optional document parameter to ease cross-frame DOM wrangling, see #968" ); }); test("isFunction", function() { @@ -90,37 +105,42 @@ test("isFunction", function() { // Recursive function calls have lengths and array-like properties function callme(callback){ - function fn(response){ - callback(response); - } + function fn(response){ + callback(response); + } ok( jQuery.isFunction(fn), "Recursive Function Call" ); - fn({ some: "data" }); + fn({ some: "data" }); }; callme(function(){ - callme(function(){}); + callme(function(){}); }); }); -test("length", function() { +test("length", function() { + expect(1); ok( $("div").length == 2, "Get Number of Elements Found" ); }); -test("size()", function() { +test("size()", function() { + expect(1); ok( $("div").size() == 2, "Get Number of Elements Found" ); }); -test("get()", function() { +test("get()", function() { + expect(1); isSet( $("div").get(), q("main","foo"), "Get All Elements" ); }); -test("get(Number)", function() { +test("get(Number)", function() { + expect(1); ok( $("div").get(0) == document.getElementById("main"), "Get A Single Element" ); }); -test("add(String|Element|Array)", function() { +test("add(String|Element|Array)", function() { + expect(7); isSet( $("#sndp").add("#en").add("#sap").get(), q("sndp", "en", "sap"), "Check elements from document" ); isSet( $("#sndp").add( $("#en")[0] ).add( $("#sap") ).get(), q("sndp", "en", "sap"), "Check elements from document" ); ok( $([]).add($("#form")[0].elements).length > 13, "Check elements from array" ); @@ -301,13 +321,14 @@ test("css(String, Object)", function() { ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" ); }); -test("text()", function() { +test("text()", function() { + expect(1); var expected = "This link has class=\"blog\": Simon Willison's Weblog"; ok( $('#sap').text() == expected, 'Check for merged text of more then one element.' ); }); test("wrap(String|Element)", function() { - expect(4); + expect(7); var defaultText = 'Try them out:' var result = $('#first').wrap('

').text(); ok( defaultText == result, 'Check for wrapping of on-the-fly html' ); @@ -317,7 +338,21 @@ test("wrap(String|Element)", function() { var defaultText = 'Try them out:' var result = $('#first').wrap(document.getElementById('empty')).parent(); ok( result.is('ol'), 'Check for element wrapping' ); - ok( result.text() == defaultText, 'Check for element wrapping' ); + ok( result.text() == defaultText, 'Check for element wrapping' ); + + reset(); + stop(); + $('#check1').click(function() { + var checkbox = this; + ok( !checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" ); + $(checkbox).wrap( '' ); + ok( !checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" ); + // use a fade in to check state after this event handler has finished + $("#c1").fadeIn(function() { + ok( checkbox.checked, "Checkbox's state is erased after wrap() action, see #769" ); + start(); + }); + }).click(); }); test("append(String|Element|Array<Element>|jQuery)", function() { @@ -538,7 +573,8 @@ test("end()", function() { ok( 'Yahoo' == $('#yahoo').text(), 'Check for non-destructive behaviour' ); }); -test("find(String)", function() { +test("find(String)", function() { + expect(1); ok( 'Yahoo' == $('#foo').find('.blogTest').text(), 'Check for find' ); }); @@ -624,14 +660,16 @@ test("val(String)", function() { }); test("html(String)", function() { - expect(1); + expect(2); var div = $("div"); div.html("test"); var pass = true; for ( var i = 0; i < div.size(); i++ ) { if ( div.get(i).childNodes.length == 0 ) pass = false; } - ok( pass, "Set HTML" ); + ok( pass, "Set HTML" ); + + $("#main").html('').evalScripts(); }); test("filter()", function() { @@ -649,7 +687,6 @@ test("not()", function() { isSet( $("p").not($("#ap, #sndp, .result")).get(), q("firstp", "en", "sap", "first"), "not(jQuery)" ); }); - test("siblings([String])", function() { expect(4); isSet( $("#en").siblings().get(), q("sndp", "sap"), "Check for siblings" ); @@ -700,7 +737,8 @@ test("show()", function() { ok( pass, "Show" ); }); -test("addClass(String)", function() { +test("addClass(String)", function() { + expect(1); var div = $("div"); div.addClass("test"); var pass = true; @@ -711,17 +749,15 @@ test("addClass(String)", function() { }); test("removeClass(String) - simple", function() { - expect(1); + expect(2); var div = $("div").addClass("test").removeClass("test"), pass = true; for ( var i = 0; i < div.size(); i++ ) { if ( div.get(i).className.indexOf("test") != -1 ) pass = false; } - ok( pass, "Remove Class" ); -}); - -test("removeClass(String) - add three classes and remove again", function() { - expect(1); + ok( pass, "Remove Class" ); + + reset(); var div = $("div").addClass("test").addClass("foo").addClass("bar"); div.removeClass("test").removeClass("bar").removeClass("foo"); var pass = true; @@ -741,7 +777,8 @@ test("toggleClass(String)", function() { ok( !e.is(".test"), "Assert class not present" ); }); -test("removeAttr(String", function() { +test("removeAttr(String", function() { + expect(1); ok( $('#mark').removeAttr("class")[0].className == "", "remove class" ); }); @@ -789,7 +826,8 @@ test("$.className", function() { ok( c.has(x, "bar"), "Check has2" ); }); -test("remove()", function() { +test("remove()", function() { + expect(4); $("#ap").children().remove(); ok( $("#ap").text().length > 10, "Check text is not removed" ); ok( $("#ap").children().length == 0, "Check remove" ); @@ -800,55 +838,16 @@ test("remove()", function() { ok( $("#ap").children().length == 1, "Check filtered remove" ); }); -test("empty()", function() { +test("empty()", function() { + expect(2); ok( $("#ap").children().empty().text().length == 0, "Check text is removed" ); ok( $("#ap").children().length == 4, "Check elements are not removed" ); }); -test("eq(), gt(), lt(), contains()", function() { +test("eq(), gt(), lt(), contains()", function() { + expect(4); ok( $("#ap a").eq(1)[0].id == "groups", "eq()" ); isSet( $("#ap a").gt(0).get(), q("groups", "anchor1", "mark"), "gt()" ); isSet( $("#ap a").lt(3).get(), q("google", "groups", "anchor1"), "lt()" ); isSet( $("#foo a").contains("log").get(), q("anchor2", "simon"), "contains()" ); -}); - -test("click() context", function() { - $('

Change location

').prependTo('#firstUL').find('a').bind('click', function() { - var close = $('spanx', this); // same with $(this).find('span'); - ok( close.length == 0, "Element does not exist, length must be zero" ); - ok( !close[0], "Element does not exist, direct access to element must return undefined" ); - //console.log( close[0]); // it's the and not a element - return false; - }).click(); -}); - -test("$().html().evalScripts() Eval's Scripts Twice in Firefox, see #975", function() { - expect(1); - $("#main").html('').evalScripts(); -}); - -test("$('') needs optional document parameter to ease cross-frame DOM wrangling, see #968", function() { - var f = frames["iframe"].document; - f.open(); - f.write(""); - f.close(); - $("

Testing

").appendTo(f.body); - ok( true, "passed" ); -}); - -test("Checkbox's state is erased after wrap() action (IE 6), see #769", function() { - expect(3); - stop(); - $('#check1').click(function() { - var checkbox = this; - ok( !checkbox.checked ); - $(checkbox).wrap( '' ); - ok( !checkbox.checked ); - // use a fade in to check state after this event handler has finished - $("#c1").fadeIn(function() { - ok( checkbox.checked ); - start(); - }); - }).click(); - }); \ No newline at end of file diff --git a/src/selector/selectorTest.js b/src/selector/selectorTest.js index d3004f0..8200595 100644 --- a/src/selector/selectorTest.js +++ b/src/selector/selectorTest.js @@ -1,13 +1,16 @@ module("selector"); test("element", function() { - expect(6); + expect(8); ok( $("*").size() >= 30, "Select all" ); t( "Element Selector", "div", ["main","foo"] ); t( "Element Selector", "body", ["body"] ); t( "Element Selector", "html", ["html"] ); t( "Parent Element", "div div", ["foo"] ); ok( $("param", "#object1").length == 2, "Object/param as context" ); + + ok( $("#length").length, '<input name="length"> cannot be found under IE, see #945' ); + ok( $("#lengthtest input").length, '<input name="length"> cannot be found under IE, see #945' ); }); test("broken", function() { @@ -199,10 +202,4 @@ test("basic xpath", function() { $("#foo").each(function() { isSet( $("/p", this).get(), q("sndp", "en", "sap"), "Check XPath context" ); }); -}); - -test('<input name="length"> cannot be found under IE, see #945', function() { - expect(2); - ok( $("#length").length ); - ok( $("#lengthtest input").length ); -}); +}); \ No newline at end of file -- 1.7.10.4