Tweaked some of the tests, added in events and fx tests.

[jquery.git] / src / event / eventTest.js
diff --git a/src/event/eventTest.js b/src/event/eventTest.js

index 8d83216..312b1e5 100644 (file)
--- a/src/event/eventTest.js
+++ b/src/event/eventTest.js
@@ -1,13 +1,15 @@
  module("event");
  
  test("bind()", function() {
-       expect(11);
+       expect(12);
  
         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();
+       $("#firstp").bind("click", {foo: "bar"}, handler).click().unbind("click", handler);
+       
+       ok( !$("#firstp").get(0).$events, "Event handler unbound when using data." );
         
         reset();
         var handler = function(event, data) {
@@ -16,30 +18,27 @@ test("bind()", function() {
                 ok( data, "Check trigger data" );
                 ok( data.bar == "foo", "Check value of trigger data" );
         };
-       $("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]);
+       $("#firstp").bind("click", {foo: "bar"}, handler).trigger("click", [{bar: "foo"}]).unbind(handler);
         
+       reset();
         var handler = function(event) {
                 ok ( !event.data, "Check that no data is added to the event object" );
         };
-       $("#firstp").unbind().bind("click", handler).trigger("click");
+       $("#firstp").bind("click", handler).trigger("click");
+       
         
         // events don't work with iframes, see #939
-       var tmp = document.createElement('iframe');
-       document.body.appendChild( tmp );
-       var doc = tmp.contentWindow.document;
-       doc.open();
-       doc.write("<html><body><input type='text'/></body></html>");
-       doc.close();
+       var doc = document.getElementById("iframe").contentDocument;
+       
+       doc.body.innerHTML = "<input type='text'/>";
          
         var input = doc.getElementsByTagName("input")[0];
          
         $(input).bind("click",function() {
                 ok( true, "Binding to element inside iframe" );
-       });
-        
-       triggerEvent( input, "click" );
+       }).click();
          
-       document.body.removeChild( tmp );
+       //triggerEvent( input, "click" );
         
         var counter = 0;
         function selectOnChange(event) {