X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fattributes.js;h=2d0a0d6cded14ecae26bd6af0623bd042a91ac08;hb=a64dc0405064d68c7b7cd0f0fc8ea60086cbcd21;hp=e1b4c0dc7cd090b1d12cad22d8f1c929b1235f2a;hpb=12e8f07e343b49042bd9a2035411c74b51ed7550;p=jquery.git

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index e1b4c0d..2d0a0d6 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(31);
 
 	// 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,11 @@ 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." );
+
+	equals( jQuery(document).attr("nodeName"), "#document", "attr works correctly on document nodes (bug #7451)." );
 });
 
 if ( !isLocal ) {
@@ -94,15 +100,18 @@ test("attr(Hash)", function() {
 });
 
 test("attr(String, Object)", function() {
-	expect(23);
+	expect(24);
+
 	var div = jQuery("div").attr("foo", "bar"),
 		fail = false;
+
 	for ( var i = 0; i < div.size(); i++ ) {
 		if ( div.get(i).getAttribute('foo') != "bar" ){
 			fail = i;
 			break;
 		}
 	}
+
 	equals( fail, false, "Set Attribute, the #"+fail+" element didn't get the attribute 'foo'" );
 
 	// Fails on IE since recent changes to .attr()
@@ -110,6 +119,8 @@ test("attr(String, Object)", function() {
 
 	jQuery("#name").attr('name', 'something');
 	equals( jQuery("#name").attr('name'), 'something', 'Set name attribute' );
+	jQuery("#name").attr('name', null);
+	equals( jQuery("#name").attr('title'), '', 'Remove name attribute' );
 	jQuery("#check2").attr('checked', true);
 	equals( document.getElementById('check2').checked, true, 'Set checked attribute' );
 	jQuery("#check2").attr('checked', false);
@@ -147,7 +158,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;
@@ -292,13 +303,18 @@ test("attr('tabindex', value)", function() {
 	equals(element.attr('tabindex'), -1, 'set negative tabindex');
 });
 
+test("removeAttr(String)", function() {
+	expect(1);
+	equals( jQuery('#mark').removeAttr( "class" )[0].className, "", "remove class" );
+});
+
 test("val()", function() {
-	expect(17);
+	expect(23);
 
 	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
@@ -320,10 +336,23 @@ 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") );
+	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' );
+
+	equals( jQuery('#select5').val(), "3", "Check value on ambiguous select." );
+
+	jQuery('#select5').val(1);
+	equals( jQuery('#select5').val(), "1", "Check value on ambiguous select." );
+
+	jQuery('#select5').val(3);
+	equals( jQuery('#select5').val(), "3", "Check value on ambiguous select." );
+
+	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." );
 
@@ -345,14 +374,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" );
 
@@ -376,10 +411,73 @@ test("val(String/Number)", function() {
 
 test("val(Function)", function() {
 	testVal(functionReturningObj);
-})
+});
+
+test( "val(Array of Numbers) (Bug #7123)", function() {
+	expect(4);
+	jQuery('#form').append('<input type="checkbox" name="arrayTest" value="1" /><input type="checkbox" name="arrayTest" value="2" /><input type="checkbox" name="arrayTest" value="3" checked="checked" /><input type="checkbox" name="arrayTest" value="4" />');
+	var elements = jQuery('input[name=arrayTest]').val([ 1, 2 ]);
+	ok( elements[0].checked, "First element was checked" );
+	ok( elements[1].checked, "Second element was checked" );
+	ok( !elements[2].checked, "Third element was unchecked" );
+	ok( !elements[3].checked, "Fourth element remained unchecked" );
+	
+	elements.remove();
+});
+
+test("val(Function) with incoming value", function() {
+	expect(10);
+
+	var oldVal = jQuery("#text1").val();
+
+	jQuery("#text1").val(function(i, val) {
+		equals( val, oldVal, "Make sure the incoming value is correct." );
+		return "test";
+	});
+
+	equals( document.getElementById('text1').value, "test", "Check for modified (via val(String)) value of input element" );
+
+	oldVal = jQuery("#text1").val();
+
+	jQuery("#text1").val(function(i, val) {
+		equals( val, oldVal, "Make sure the incoming value is correct." );
+		return 67;
+	});
+
+	equals( document.getElementById('text1').value, "67", "Check for modified (via val(Number)) value of input element" );
+
+	oldVal = jQuery("#select1").val();
+
+	jQuery("#select1").val(function(i, val) {
+		equals( val, oldVal, "Make sure the incoming value is correct." );
+		return "3";
+	});
+
+	equals( jQuery("#select1").val(), "3", "Check for modified (via val(String)) value of select element" );
+
+	oldVal = jQuery("#select1").val();
+
+	jQuery("#select1").val(function(i, val) {
+		equals( val, oldVal, "Make sure the incoming value is correct." );
+		return 2;
+	});
+
+	equals( jQuery("#select1").val(), "2", "Check for modified (via val(Number)) value of select element" );
+
+	jQuery("#select1").append("<option value='4'>four</option>");
+
+	oldVal = jQuery("#select1").val();
+
+	jQuery("#select1").val(function(i, val) {
+		equals( val, oldVal, "Make sure the incoming value is correct." );
+		return 4;
+	});
+
+	equals( jQuery("#select1").val(), "4", "Should be possible to set the val() to a newly created option" );
+});
 
 var testAddClass = function(valueObj) {
-	expect(2);
+	expect(5);
 	var div = jQuery("div");
 	div.addClass( valueObj("test") );
 	var pass = true;
@@ -392,6 +490,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() {
@@ -402,8 +513,29 @@ test("addClass(Function)", function() {
 	testAddClass(functionReturningObj);
 });
 
+test("addClass(Function) with incoming value", function() {
+	expect(45);
+
+	var div = jQuery("div"), old = div.map(function(){
+		return jQuery(this).attr("class");
+	});
+
+	div.addClass(function(i, val) {
+		if ( this.id !== "_firebugConsole" ) {
+			equals( val, old[i], "Make sure the incoming value is correct." );
+			return "test";
+		}
+	});
+
+	var pass = true;
+	for ( var i = 0; i < div.size(); i++ ) {
+	 if ( div.get(i).className.indexOf("test") == -1 ) pass = false;
+	}
+	ok( pass, "Add Class" );
+});
+
 var testRemoveClass = function(valueObj) {
-	expect(5);
+	expect(7);
 
 	var $divs = jQuery('div');
 
@@ -411,7 +543,7 @@ var testRemoveClass = function(valueObj) {
 
 	ok( !$divs.is('.test'), "Remove Class" );
 
-	reset();
+	QUnit.reset();
 	$divs = jQuery('div');
 
 	$divs.addClass("test").addClass("foo").addClass("bar");
@@ -419,7 +551,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
@@ -433,6 +565,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() {
@@ -443,6 +586,25 @@ test("removeClass(Function) - simple", function() {
 	testRemoveClass(functionReturningObj);
 });
 
+test("removeClass(Function) with incoming value", function() {
+	expect(45);
+
+	var $divs = jQuery('div').addClass("test"), old = $divs.map(function(){
+		return jQuery(this).attr("class");
+	});
+
+	$divs.removeClass(function(i, val) {
+		if ( this.id !== "_firebugConsole" ) {
+			equals( val, old[i], "Make sure the incoming value is correct." );
+			return "test";
+		}
+	});
+
+	ok( !$divs.is('.test'), "Remove Class" );
+
+	QUnit.reset();	
+});
+
 var testToggleClass = function(valueObj) {
 	expect(17);
 
@@ -503,17 +665,57 @@ test("toggleClass(Function[, boolean])", function() {
 	testToggleClass(functionReturningObj);
 });
 
-var testRemoveAttr = function(valueObj) {
-	expect(1);
-	equals( jQuery('#mark').removeAttr( valueObj("class") )[0].className, "", "remove class" );
-};
+test("toggleClass(Fucntion[, boolean]) with incoming value", function() {
+	expect(14);
 
-test("removeAttr(String)", function() {
-	testRemoveAttr(bareObj);
-});
+	var e = jQuery("#firstp"), old = e.attr("class");
+	ok( !e.is(".test"), "Assert class not present" );
+	
+	e.toggleClass(function(i, val) {
+		equals( val, old, "Make sure the incoming value is correct." );
+		return "test";
+	});
+	ok( e.is(".test"), "Assert class present" );
+	
+	old = e.attr("class");
+	
+	e.toggleClass(function(i, val) {
+		equals( val, old, "Make sure the incoming value is correct." );
+		return "test";
+	});
+	ok( !e.is(".test"), "Assert class not present" );
+	
+	old = e.attr("class");
+
+	// class name with a boolean
+	e.toggleClass(function(i, val, state) {
+		equals( val, old, "Make sure the incoming value is correct." );
+		equals( state, false, "Make sure that the state is passed in." );
+		return "test";
+	}, false );
+	ok( !e.is(".test"), "Assert class not present" );
+	
+	old = e.attr("class");
+	
+	e.toggleClass(function(i, val, state) {
+		equals( val, old, "Make sure the incoming value is correct." );
+		equals( state, true, "Make sure that the state is passed in." );
+		return "test";
+	}, true );
+	ok( e.is(".test"), "Assert class present" );
+	
+	old = e.attr("class");
+	
+	e.toggleClass(function(i, val, state) {
+		equals( val, old, "Make sure the incoming value is correct." );
+		equals( state, false, "Make sure that the state is passed in." );
+		return "test";
+	}, false );
+	ok( !e.is(".test"), "Assert class not present" );
 
-test("removeAttr(Function)", function() {
-	testRemoveAttr(functionReturningObj);
+	// Cleanup
+	e.removeClass("test");
+	e.removeData('__className__');
 });
 
 test("addClass, removeClass, hasClass", function() {