Fixed the number of expected class tests from a previous commit. Thanks to @bugbegone...

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

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index fd5b203..0372721 100644 (file)
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -4,7 +4,7 @@ var bareObj = function(value) { return value; };
 var functionReturningObj = function(value) { return (function() { return value; }); };
 
 test("attr(String)", function() {
-       expect(28);
+       expect(30);
 
        // This one sometimes fails randomly ?!
        equals( jQuery('#text1').attr('value'), "Test", 'Check for value attribute' );
@@ -30,7 +30,8 @@ test("attr(String)", function() {
        equals( jQuery('#foo').attr('nodeName').toUpperCase(), 'DIV', 'Check for nodeName attribute' );
        equals( jQuery('#foo').attr('tagName').toUpperCase(), 'DIV', 'Check for tagName attribute' );
 
-       jQuery('<a id="tAnchor5"></a>').attr('href', '#5').appendTo('#main'); // using innerHTML in IE causes href attribute to be serialized to the full path
+       // using innerHTML in IE causes href attribute to be serialized to the full path
+       jQuery('<a/>').attr({ 'id': 'tAnchor5', 'href': '#5' }).appendTo('#main');
        equals( jQuery('#tAnchor5').attr('href'), "#5", 'Check for non-absolute href (an anchor)' );
 
        equals( jQuery("<option/>").attr("selected"), false, "Check selected attribute on disconnected element." );
@@ -61,6 +62,9 @@ test("attr(String)", function() {
        select.appendChild( optgroup );
 
        equals( jQuery(option).attr("selected"), true, "Make sure that a single option is selected, even when in an optgroup." );
+
+       ok( jQuery("<div/>").attr("doesntexist") === undefined, "Make sure undefined is returned when no attribute is found." );
+       ok( jQuery().attr("doesntexist") === undefined, "Make sure undefined is returned when no element is there." );
 });
 
 if ( !isLocal ) {
@@ -147,7 +151,7 @@ test("attr(String, Object)", function() {
        equals( j.attr("name"), "attrvalue", "Check node,textnode,comment for attr" );
        j.removeAttr("name");
 
-       reset();
+       QUnit.reset();
 
        var type = jQuery("#check2").attr('type');
        var thrown = false;
@@ -303,7 +307,7 @@ test("val()", function() {
        document.getElementById('text1').value = "bla";
        equals( jQuery("#text1").val(), "bla", "Check for modified value of input element" );
 
-       reset();
+       QUnit.reset();
 
        equals( jQuery("#text1").val(), "Test", "Check for value of input element" );
        // ticket #1714 this caused a JS error in IE
@@ -325,10 +329,7 @@ test("val()", function() {
        jQuery('#select3').val("");
        same( jQuery('#select3').val(), [''], 'Call val() on a multiple="multiple" select' );
 
-       var checks = jQuery("<input type='checkbox' name='test' value='1'/>").appendTo("#form")
-               .add( jQuery("<input type='checkbox' name='test' value='2'/>").appendTo("#form") )
-               .add( jQuery("<input type='checkbox' name='test' value=''/>").appendTo("#form") )
-               .add( jQuery("<input type='checkbox' name='test'/>").appendTo("#form") );
+       var checks = jQuery("<input type='checkbox' name='test' value='1'/><input type='checkbox' name='test' value='2'/><input type='checkbox' name='test' value=''/><input type='checkbox' name='test'/>").appendTo("#form");
 
        same( checks.serialize(), "", "Get unchecked values." );
 
@@ -435,7 +436,7 @@ test("val(Function) with incoming value", function() {
 });
 
 var testAddClass = function(valueObj) {
-       expect(2);
+       expect(5);
        var div = jQuery("div");
        div.addClass( valueObj("test") );
        var pass = true;
@@ -448,6 +449,19 @@ var testAddClass = function(valueObj) {
        var j = jQuery("#nonnodes").contents();
        j.addClass( valueObj("asdf") );
        ok( j.hasClass("asdf"), "Check node,textnode,comment for addClass" );
+
+       div = jQuery("<div/>");
+
+       div.addClass( valueObj("test") );
+       equals( div.attr("class"), "test", "Make sure there's no extra whitespace." );
+
+       div.attr("class", " foo");
+       div.addClass( valueObj("test") );
+       equals( div.attr("class"), "foo test", "Make sure there's no extra whitespace." );
+
+       div.attr("class", "foo");
+       div.addClass( valueObj("bar baz") );
+       equals( div.attr("class"), "foo bar baz", "Make sure there isn't too much trimming." );
 };
 
 test("addClass(String)", function() {
@@ -459,15 +473,17 @@ test("addClass(Function)", function() {
 });
 
 test("addClass(Function) with incoming value", function() {
-       expect(39);
+       expect(41);
 
        var div = jQuery("div"), old = div.map(function(){
                return jQuery(this).attr("class");
        });
 
        div.addClass(function(i, val) {
-               equals( val, old[i], "Make sure the incoming value is correct." );
-               return "test";
+               if ( this.id !== "_firebugConsole" ) {
+                       equals( val, old[i], "Make sure the incoming value is correct." );
+                       return "test";
+               }
        });
 
        var pass = true;
@@ -478,7 +494,7 @@ test("addClass(Function) with incoming value", function() {
 });
 
 var testRemoveClass = function(valueObj) {
-       expect(5);
+       expect(7);
 
        var $divs = jQuery('div');
 
@@ -486,7 +502,7 @@ var testRemoveClass = function(valueObj) {
 
        ok( !$divs.is('.test'), "Remove Class" );
 
-       reset();
+       QUnit.reset();
        $divs = jQuery('div');
 
        $divs.addClass("test").addClass("foo").addClass("bar");
@@ -494,7 +510,7 @@ var testRemoveClass = function(valueObj) {
 
        ok( !$divs.is('.test,.bar,.foo'), "Remove multiple classes" );
 
-       reset();
+       QUnit.reset();
        $divs = jQuery('div');
 
        // Make sure that a null value doesn't cause problems
@@ -508,6 +524,17 @@ var testRemoveClass = function(valueObj) {
        var j = jQuery("#nonnodes").contents();
        j.removeClass( valueObj("asdf") );
        ok( !j.hasClass("asdf"), "Check node,textnode,comment for removeClass" );
+
+       var div = document.createElement("div");
+       div.className = " test foo ";
+
+       jQuery(div).removeClass( valueObj("foo") );
+       equals( div.className, "test", "Make sure remaining className is trimmed." );
+
+       div.className = " test ";
+
+       jQuery(div).removeClass( valueObj("test") );
+       equals( div.className, "", "Make sure there is nothing left after everything is removed." );
 };
 
 test("removeClass(String) - simple", function() {
@@ -519,20 +546,22 @@ test("removeClass(Function) - simple", function() {
 });
 
 test("removeClass(Function) with incoming value", function() {
-       expect(39);
+       expect(41);
 
        var $divs = jQuery('div').addClass("test"), old = $divs.map(function(){
                return jQuery(this).attr("class");
        });
 
        $divs.removeClass(function(i, val) {
-               equals( val, old[i], "Make sure the incoming value is correct." );
-               return "test";
+               if ( this.id !== "_firebugConsole" ) {
+                       equals( val, old[i], "Make sure the incoming value is correct." );
+                       return "test";
+               }
        });
 
        ok( !$divs.is('.test'), "Remove Class" );
 
-       reset();        
+       QUnit.reset();  
 });
 
 var testToggleClass = function(valueObj) {