X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=002b130e1c31c732ea8cb719a6a77b0ba07ca1eb;hb=0865b073f81513056f46296cd2a236ab2ca35703;hp=165d8d193c92e10a8251c0c756f46c15e764a566;hpb=a27b5d0468acc5dd8cdfcbff9464546b353e3c04;p=jquery.git

diff --git a/test/unit/core.js b/test/unit/core.js
index 165d8d1..002b130 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1684,7 +1684,7 @@ test("contents()", function() {
 });
 
 test("jQuery.makeArray", function(){
-	expect(15);
+	expect(14);
 
 	equals( jQuery.makeArray(jQuery('html>*'))[0].nodeName, "HEAD", "Pass makeArray a jQuery object" );
 
@@ -1708,8 +1708,11 @@ test("jQuery.makeArray", function(){
 
 	ok( !!jQuery.makeArray( document.documentElement.childNodes ).slice(0,1)[0].nodeName, "Pass makeArray a childNodes array" );
 
-	//function, is tricky as it has length
-	equals( jQuery.makeArray( function(){ return 1;} )[0](), 1, "Pass makeArray a function" );
+	// function, is tricky as it has length
+	// NOTE: Due to the conflict with Scriptaculous (http://dev.jquery.com/ticket/3248)
+	// We remove support for functions since jQuery 1.3
+	//equals( jQuery.makeArray( function(){ return 1;} )[0](), 1, "Pass makeArray a function" );
+	
 	//window, also has length
 	equals( jQuery.makeArray(window)[0], window, "Pass makeArray the window" );