jquery core: closes #3248, #3079, #3026, #3176, #3202, #3129. jQuery.makeArray doesn...

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

diff --git a/test/unit/core.js b/test/unit/core.js
index 165d8d1..002b130 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1684,7 +1684,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 +1708,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