X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fevent.js;h=71ea774b60626791eab28f75d889cf0195d98896;hb=ba48be3ada51aee683ce5992c5f00a8458f385f8;hp=0ec0f5966b2e1f757ed9fdf1689a167350fcc2cc;hpb=5d033dba02fc1ffe1398cdaf0e9d402fc75e13f0;p=jquery.git diff --git a/test/unit/event.js b/test/unit/event.js index 0ec0f59..71ea774 100644 --- a/test/unit/event.js +++ b/test/unit/event.js @@ -4,7 +4,7 @@ test("bind(), with data", function() { expect(3); 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" ); + equals( event.data.foo, "bar", "bind() with data, Check value of passed data" ); }; $("#firstp").bind("click", {foo: "bar"}, handler).click().unbind("click", handler); @@ -15,9 +15,9 @@ test("bind(), with data, 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" ); + equals( event.data.foo, "bar", "Check value of passed data" ); ok( data, "Check trigger data" ); - ok( data.bar == "foo", "Check value of trigger data" ); + equals( data.bar, "foo", "Check value of trigger data" ); }; $("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]).unbind("click", handler); }); @@ -33,8 +33,8 @@ test("bind(), multiple events at once", function() { mouseoverCounter += 1; }; $("#firstp").bind("click mouseover", handler).trigger("click").trigger("mouseover"); - ok( clickCounter == 1, "bind() with multiple events at once" ); - ok( mouseoverCounter == 1, "bind() with multiple events at once" ); + equals( clickCounter, 1, "bind() with multiple events at once" ); + equals( mouseoverCounter, 1, "bind() with multiple events at once" ); }); test("bind(), no data", function() { @@ -116,7 +116,7 @@ test("click()", function() { expect(5); $('
  • Change location
  • ').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" ); + equals( 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(); @@ -130,14 +130,14 @@ test("click()", function() { counter++; }; $('#firstp').click(); - ok( counter == 1, "Check that click, triggers onclick event handler also" ); + equals( counter, 1, "Check that click, triggers onclick event handler also" ); var clickCounter = 0; $('#simon1')[0].onclick = function(event) { clickCounter++; }; $('#simon1').click(); - ok( clickCounter == 1, "Check that click, triggers onclick event handler on an a tag also" ); + equals( clickCounter, 1, "Check that click, triggers onclick event handler on an a tag also" ); }); test("unbind(event)", function() { @@ -165,7 +165,7 @@ test("unbind(event)", function() { ok( !jQuery.data(el[0], "events"), "Removed the events expando after all handlers are unbound." ); reset(); - var clickCounter = mouseoverCounter = 0; + var clickCounter = (mouseoverCounter = 0); var handler = function(event) { if (event.type == "click") clickCounter += 1; @@ -173,8 +173,8 @@ test("unbind(event)", function() { mouseoverCounter += 1; }; $("#firstp").bind("click mouseover", handler).unbind("click mouseover", handler).trigger("click").trigger("mouseover"); - ok( clickCounter == 0, "unbind() with multiple events at once" ); - ok( mouseoverCounter == 0, "unbind() with multiple events at once" ); + equals( clickCounter, 0, "unbind() with multiple events at once" ); + equals( mouseoverCounter, 0, "unbind() with multiple events at once" ); }); test("trigger(event, [data], [fn])", function() { @@ -271,15 +271,16 @@ test("trigger(event, [data], [fn])", function() { equals( $("#firstp").triggerHandler("click", [1, "2", "abc"], handler4), "test", "Verify triggerHandler return is not overwritten by extra function" ); }); -test("toggle(Function, Function)", function() { - expect(5); +test("toggle(Function, Function, ...)", function() { + expect(11); + var count = 0, fn1 = function(e) { count++; }, fn2 = function(e) { count--; }, preventDefault = function(e) { e.preventDefault() }, link = $('#mark'); link.click(preventDefault).click().toggle(fn1, fn2).click().click().click().click().click(); - ok( count == 1, "Check for toggle(fn, fn)" ); + equals( count, 1, "Check for toggle(fn, fn)" ); $("#firstp").toggle(function () { equals(arguments.length, 4, "toggle correctly passes through additional triggered arguments, see #1701" ) @@ -289,12 +290,41 @@ test("toggle(Function, Function)", function() { $("#simon1").one("click", function() { ok( true, "Execute event only once" ); $(this).toggle(function() { - ok( first++ == 0, "toggle(Function,Function) assigned from within one('xxx'), see #1054" ); + equals( first++, 0, "toggle(Function,Function) assigned from within one('xxx'), see #1054" ); }, function() { - ok( first == 1, "toggle(Function,Function) assigned from within one('xxx'), see #1054" ); + equals( first, 1, "toggle(Function,Function) assigned from within one('xxx'), see #1054" ); }); return false; }).click().click().click(); + + var turn = 0; + var fns = [ + function(){ + turn = 1; + }, + function(){ + turn = 2; + }, + function(){ + turn = 3; + } + ]; + + var $div = $("
     
    ").toggle( fns[0], fns[1], fns[2] ); + $div.click(); + equals( turn, 1, "Trying toggle with 3 functions, attempt 1 yields 1"); + $div.click(); + equals( turn, 2, "Trying toggle with 3 functions, attempt 2 yields 2"); + $div.click(); + equals( turn, 3, "Trying toggle with 3 functions, attempt 3 yields 3"); + $div.click(); + equals( turn, 1, "Trying toggle with 3 functions, attempt 4 yields 1"); + $div.click(); + equals( turn, 2, "Trying toggle with 3 functions, attempt 5 yields 2"); + + $div.unbind('click',fns[0]); + var data = $.data( $div[0], 'events' ); + ok( !data, "Unbinding one function from toggle unbinds them all"); }); test("jQuery(function($) {})", function() { @@ -304,3 +334,11 @@ test("jQuery(function($) {})", function() { start(); }); }); + +test("event properties", function() { + stop(); + $("#simon1").click(function(event) { + ok( event.timeStamp, "assert event.timeStamp is present" ); + start(); + }).click(); +}); \ No newline at end of file