X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=test%2Funit%2Fattributes.js;h=3326dfe890c8c6e4cfab1bae5b7dbd6269cd5d5d;hb=97d468fbf0f840f52c91855b0bc8db0ed6ac403c;hp=234d586220224675da4a9041a5972949eba439af;hpb=83a044f1b5a733dc7ea76dbc9b7dd3a3dc4b7f25;p=jquery.git diff --git a/test/unit/attributes.js b/test/unit/attributes.js index 234d586..3326dfe 100644 --- 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('').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('').attr({ 'id': 'tAnchor5', 'href': '#5' }).appendTo('#main'); equals( jQuery('#tAnchor5').attr('href'), "#5", 'Check for non-absolute href (an anchor)' ); equals( jQuery("").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("
").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; @@ -298,12 +302,12 @@ test("removeAttr(String)", function() { }); test("val()", function() { - expect(17); + expect(20); 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,15 @@ test("val()", function() { jQuery('#select3').val(""); same( jQuery('#select3').val(), [''], 'Call val() on a multiple="multiple" select' ); - var checks = jQuery("").appendTo("#form") - .add( jQuery("").appendTo("#form") ) - .add( jQuery("").appendTo("#form") ) - .add( jQuery("").appendTo("#form") ); + same( jQuery('#select4').val(), [], 'Call val() on multiple="multiple" select with all disabled options' ); + + jQuery('#select4 optgroup').add('#select4 > [disabled]').attr('disabled', false); + same( jQuery('#select4').val(), ['2', '3'], 'Call val() on multiple="multiple" select with some disabled options' ); + + jQuery('#select4').attr('disabled', true); + same( jQuery('#select4').val(), ['2', '3'], 'Call val() on disabled multiple="multiple" select' ); + + var checks = jQuery("").appendTo("#form"); same( checks.serialize(), "", "Get unchecked values." ); @@ -350,14 +359,20 @@ test("val()", function() { }); var testVal = function(valueObj) { - expect(6); + expect(8); jQuery("#text1").val(valueObj( 'test' )); equals( document.getElementById('text1').value, "test", "Check for modified (via val(String)) value of input element" ); + jQuery("#text1").val(valueObj( undefined )); + equals( document.getElementById('text1').value, "", "Check for modified (via val(undefined)) value of input element" ); + jQuery("#text1").val(valueObj( 67 )); equals( document.getElementById('text1').value, "67", "Check for modified (via val(Number)) value of input element" ); + jQuery("#text1").val(valueObj( null )); + equals( document.getElementById('text1').value, "", "Check for modified (via val(null)) value of input element" ); + jQuery("#select1").val(valueObj( "3" )); equals( jQuery("#select1").val(), "3", "Check for modified (via val(String)) value of select element" ); @@ -435,7 +450,7 @@ test("val(Function) with incoming value", function() { }); var testAddClass = function(valueObj) { - expect(4); + expect(5); var div = jQuery("div"); div.addClass( valueObj("test") ); var pass = true; @@ -457,6 +472,10 @@ var testAddClass = function(valueObj) { 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() { @@ -468,15 +487,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; @@ -495,7 +516,7 @@ var testRemoveClass = function(valueObj) { ok( !$divs.is('.test'), "Remove Class" ); - reset(); + QUnit.reset(); $divs = jQuery('div'); $divs.addClass("test").addClass("foo").addClass("bar"); @@ -503,7 +524,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 @@ -539,20 +560,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) {