X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=45003e888906b5159397652bfead2c04b46ebbaf;hb=4c1e12e889f2a70bfa3603fed9d1cabe67d294e0;hp=002b130e1c31c732ea8cb719a6a77b0ba07ca1eb;hpb=1023cf1d72a3bfe56cbbf8ef89ad96725639e066;p=jquery.git diff --git a/test/unit/core.js b/test/unit/core.js index 002b130..45003e8 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -1361,25 +1361,24 @@ test("addClass(String)", function() { test("removeClass(String) - simple", function() { expect(4); - var div = jQuery("div").addClass("test").removeClass("test"), - pass = true; - for ( var i = 0; i < div.size(); i++ ) { - if ( div.get(i).className.indexOf("test") != -1 ) pass = false; - } - ok( pass, "Remove Class" ); + + var $divs = jQuery('div'); + + $divs.addClass("test").removeClass("test"); + + ok( !$divs.is('.test'), "Remove Class" ); reset(); - var div = jQuery("div").addClass("test").addClass("foo").addClass("bar"); - div.removeClass("test").removeClass("bar").removeClass("foo"); - var pass = true; - for ( var i = 0; i < div.size(); i++ ) { - if ( div.get(i).className.match(/test|bar|foo/) ) pass = false; - } - ok( pass, "Remove multiple classes" ); + + $divs.addClass("test").addClass("foo").addClass("bar"); + $divs.removeClass("test").removeClass("bar").removeClass("foo"); + + ok( !$divs.is('.test,.bar,.foo'), "Remove multiple classes" ); reset(); - var div = jQuery("div:eq(0)").addClass("test").removeClass(""); - ok( div.is('.test'), "Empty string passed to removeClass" ); + + $divs.eq(0).addClass("test").removeClass(""); + ok( $divs.eq(0).is('.test'), "Empty string passed to removeClass" ); // using contents will get regular, text, and comment nodes var j = jQuery("#nonnodes").contents(); @@ -1709,9 +1708,7 @@ 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 - // 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" ); + 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" );