testrunner: fixing tests that were broken due to recent updates to qunit.

[jquery.git] / test / unit / core.js

diff --git a/test/unit/core.js b/test/unit/core.js
index 165d8d1..686899e 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1361,25 +1361,24 @@ test("addClass(String)", function() {
 \r
 test("removeClass(String) - simple", function() {\r
        expect(4);\r
-       var div = jQuery("div").addClass("test").removeClass("test"),\r
-               pass = true;\r
-       for ( var i = 0; i < div.size(); i++ ) {\r
-               if ( div.get(i).className.indexOf("test") != -1 ) pass = false;\r
-       }\r
-       ok( pass, "Remove Class" );\r
+       \r
+       var $divs = jQuery('div');\r
+       \r
+       $divs.addClass("test").removeClass("test");\r
+               \r
+       ok( !$divs.is('.test'), "Remove Class" );\r
 \r
        reset();\r
-       var div = jQuery("div").addClass("test").addClass("foo").addClass("bar");\r
-       div.removeClass("test").removeClass("bar").removeClass("foo");\r
-       var pass = true;\r
-       for ( var i = 0; i < div.size(); i++ ) {\r
-        if ( div.get(i).className.match(/test|bar|foo/) ) pass = false;\r
-       }\r
-       ok( pass, "Remove multiple classes" );\r
+       \r
+       $divs.addClass("test").addClass("foo").addClass("bar");\r
+       $divs.removeClass("test").removeClass("bar").removeClass("foo");\r
+       \r
+       ok( !$divs.is('.test,.bar,.foo'), "Remove multiple classes" );\r
 \r
        reset();\r
-       var div = jQuery("div:eq(0)").addClass("test").removeClass("");\r
-       ok( div.is('.test'), "Empty string passed to removeClass" );\r
+       \r
+       $divs.eq(0).addClass("test").removeClass("");\r
+       ok( $divs.eq(0).is('.test'), "Empty string passed to removeClass" );\r
 \r
        // using contents will get regular, text, and comment nodes\r
        var j = jQuery("#nonnodes").contents();\r
@@ -1684,7 +1683,7 @@ test("contents()", function() {
 });\r
 \r
 test("jQuery.makeArray", function(){\r
-       expect(15);\r
+       expect(14);\r
 \r
        equals( jQuery.makeArray(jQuery('html>*'))[0].nodeName, "HEAD", "Pass makeArray a jQuery object" );\r
 \r
@@ -1708,8 +1707,11 @@ test("jQuery.makeArray", function(){
 \r
        ok( !!jQuery.makeArray( document.documentElement.childNodes ).slice(0,1)[0].nodeName, "Pass makeArray a childNodes array" );\r
 \r
-       //function, is tricky as it has length\r
-       equals( jQuery.makeArray( function(){ return 1;} )[0](), 1, "Pass makeArray a function" );\r
+       // function, is tricky as it has length\r
+       // NOTE: Due to the conflict with Scriptaculous (http://dev.jquery.com/ticket/3248)\r
+       // We remove support for functions since jQuery 1.3\r
+       //equals( jQuery.makeArray( function(){ return 1;} )[0](), 1, "Pass makeArray a function" );\r
+       \r
        //window, also has length\r
        equals( jQuery.makeArray(window)[0], window, "Pass makeArray the window" );\r
 \r