X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fattributes.js;h=21d3d94bcb96a23cc5ad952820537223ad89fdfc;hb=8effe3a7dee91c833cc1774646da9d743600c64c;hp=06920762b7244539c45e376ea15ee5a905b20f44;hpb=4729f4d44326fd302c63af8f3324b6c4bac54084;p=jquery.git

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 0692076..21d3d94 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' );
@@ -61,6 +61,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 ) {
@@ -292,8 +295,150 @@ 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);
+
+	document.getElementById('text1').value = "bla";
+	equals( jQuery("#text1").val(), "bla", "Check for modified value of input element" );
+
+	reset();
+
+	equals( jQuery("#text1").val(), "Test", "Check for value of input element" );
+	// ticket #1714 this caused a JS error in IE
+	equals( jQuery("#first").val(), "", "Check a paragraph element to see if it has a value" );
+	ok( jQuery([]).val() === undefined, "Check an empty jQuery object will return undefined from val" );
+
+	equals( jQuery('#select2').val(), '3', 'Call val() on a single="single" select' );
+
+	same( jQuery('#select3').val(), ['1', '2'], 'Call val() on a multiple="multiple" select' );
+
+	equals( jQuery('#option3c').val(), '2', 'Call val() on a option element with value' );
+
+	equals( jQuery('#option3a').val(), '', 'Call val() on a option element with empty value' );
+
+	equals( jQuery('#option3e').val(), 'no value', 'Call val() on a option element with no value attribute' );
+
+	equals( jQuery('#option3a').val(), '', 'Call val() on a option element with no value attribute' );
+
+	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( checks.serialize(), "", "Get unchecked values." );
+
+	equals( checks.eq(3).val(), "on", "Make sure a value of 'on' is provided if none is specified." );
+
+	checks.val([ "2" ]);
+	same( checks.serialize(), "test=2", "Get a single checked value." );
+
+	checks.val([ "1", "" ]);
+	same( checks.serialize(), "test=1&test=", "Get multiple checked values." );
+
+	checks.val([ "", "2" ]);
+	same( checks.serialize(), "test=2&test=", "Get multiple checked values." );
+
+	checks.val([ "1", "on" ]);
+	same( checks.serialize(), "test=1&test=on", "Get multiple checked values." );
+
+	checks.remove();
+});
+
+var testVal = function(valueObj) {
+	expect(6);
+
+	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( 67 ));
+	equals( document.getElementById('text1').value, "67", "Check for modified (via val(Number)) value of input element" );
+
+	jQuery("#select1").val(valueObj( "3" ));
+	equals( jQuery("#select1").val(), "3", "Check for modified (via val(String)) value of select element" );
+
+	jQuery("#select1").val(valueObj( 2 ));
+	equals( jQuery("#select1").val(), "2", "Check for modified (via val(Number)) value of select element" );
+
+	jQuery("#select1").append("<option value='4'>four</option>");
+	jQuery("#select1").val(valueObj( 4 ));
+	equals( jQuery("#select1").val(), "4", "Should be possible to set the val() to a newly created option" );
+
+	// using contents will get comments regular, text, and comment nodes
+	var j = jQuery("#nonnodes").contents();
+	j.val(valueObj( "asdf" ));
+	equals( j.val(), "asdf", "Check node,textnode,comment with val()" );
+	j.removeAttr("value");
+}
+
+test("val(String/Number)", function() {
+	testVal(bareObj);
+});
+
+test("val(Function)", function() {
+	testVal(functionReturningObj);
+})
+
+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;
@@ -306,6 +451,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() {
@@ -316,8 +474,29 @@ test("addClass(Function)", function() {
 	testAddClass(functionReturningObj);
 });
 
+test("addClass(Function) with incoming value", function() {
+	expect(39);
+
+	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');
 
@@ -347,6 +526,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() {
@@ -357,6 +547,25 @@ test("removeClass(Function) - simple", function() {
 	testRemoveClass(functionReturningObj);
 });
 
+test("removeClass(Function) with incoming value", function() {
+	expect(39);
+
+	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" );
+
+	reset();	
+});
+
 var testToggleClass = function(valueObj) {
 	expect(17);
 
@@ -417,17 +626,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");
 
-test("removeAttr(Function)", function() {
-	testRemoveAttr(functionReturningObj);
+	// 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" );
+
+	// Cleanup
+	e.removeClass("test");
+	e.removeData('__className__');
 });
 
 test("addClass, removeClass, hasClass", function() {