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

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index 67dce1e..2d0a0d6 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -1,8 +1,14 @@
 module("attributes");
 
+var bareObj = function(value) { return value; };
+var functionReturningObj = function(value) { return (function() { return value; }); };
+
 test("attr(String)", function() {
-	expect(27);
+	expect(31);
+
+	// This one sometimes fails randomly ?!
 	equals( jQuery('#text1').attr('value'), "Test", 'Check for value attribute' );
+	
 	equals( jQuery('#text1').attr('value', "Test2").attr('defaultValue'), "Test", 'Check for defaultValue attribute' );
 	equals( jQuery('#text1').attr('type'), "text", 'Check for type attribute' );
 	equals( jQuery('#radio1').attr('type'), "radio", 'Check for type attribute' );
@@ -15,6 +21,8 @@ test("attr(String)", function() {
 	equals( jQuery('#name').attr('name'), "name", 'Check for name attribute' );
 	equals( jQuery('#text1').attr('name'), "action", 'Check for name attribute' );
 	ok( jQuery('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );
+	// Temporarily disabled. See: #4299
+	// ok( jQuery('#form').attr('action','newformaction').attr('action').indexOf("newformaction") >= 0, 'Check that action attribute was changed' );
 	equals( jQuery('#text1').attr('maxlength'), '30', 'Check for maxlength attribute' );
 	equals( jQuery('#text1').attr('maxLength'), '30', 'Check for maxLength attribute' );
 	equals( jQuery('#area1').attr('maxLength'), '30', 'Check for maxLength attribute' );
@@ -22,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." );
@@ -33,20 +42,31 @@ test("attr(String)", function() {
 
 	ok( $body.attr('foo') === undefined, 'Make sure that a non existent attribute returns undefined' );
 	ok( $body.attr('nextSibling') === null, 'Make sure a null expando returns null' );
-	
+
 	body.setAttribute('foo', 'baz');
 	equals( $body.attr('foo'), 'baz', 'Make sure the dom attribute is retrieved when no expando is found' );
-	
+
 	body.foo = 'bar';
 	equals( $body.attr('foo'), 'bar', 'Make sure the expando is preferred over the dom attribute' );
-	
+
 	$body.attr('foo','cool');
 	equals( $body.attr('foo'), 'cool', 'Make sure that setting works well when both expando and dom attribute are available' );
-	
+
 	body.foo = undefined;
 	ok( $body.attr('foo') === undefined, 'Make sure the expando is preferred over the dom attribute, even if undefined' );
-	
+
 	body.removeAttribute('foo'); // Cleanup
+
+	var select = document.createElement("select"), optgroup = document.createElement("optgroup"), option = document.createElement("option");
+	optgroup.appendChild( option );
+	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 ) {
@@ -63,35 +83,44 @@ if ( !isLocal ) {
 
 test("attr(String, Function)", function() {
 	expect(2);
-	equals( jQuery('#text1').attr('value', function() { return this.id })[0].value, "text1", "Set value from id" );
+	equals( jQuery('#text1').attr('value', function() { return this.id ;})[0].value, "text1", "Set value from id" );
 	equals( jQuery('#text1').attr('title', function(i) { return i }).attr('title'), "0", "Set value with an index");
 });
 
 test("attr(Hash)", function() {
-	expect(1);
+	expect(3);
 	var pass = true;
 	jQuery("div").attr({foo: 'baz', zoo: 'ping'}).each(function(){
 		if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false;
 	});
 	ok( pass, "Set Multiple Attributes" );
+			 equals( jQuery('#text1').attr({'value': function() { return this.id; }})[0].value, "text1", "Set attribute to computed value #1" );
+			 equals( jQuery('#text1').attr({'title': function(i) { return i; }}).attr('title'), "0", "Set attribute to computed value #2");
+
 });
 
 test("attr(String, Object)", function() {
-	expect(21);
+	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'" );
 
-	ok( jQuery("#foo").attr({"width": null}), "Try to set an attribute to nothing" );
+	// Fails on IE since recent changes to .attr()
+	// ok( jQuery("#foo").attr({"width": null}), "Try to set an attribute to nothing" );
 
 	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);
@@ -105,6 +134,15 @@ test("attr(String, Object)", function() {
 	jQuery("#name").attr('maxLength', '10');
 	equals( document.getElementById('name').maxLength, '10', 'Set maxlength attribute' );
 
+	var table = jQuery('#table').append("<tr><td>cell</td></tr><tr><td>cell</td><td>cell</td></tr><tr><td>cell</td><td>cell</td></tr>"),
+		td = table.find('td:first');
+	td.attr("rowspan", "2");
+	equals( td[0].rowSpan, 2, "Check rowspan is correctly set" );
+	td.attr("colspan", "2");
+	equals( td[0].colSpan, 2, "Check colspan is correctly set" );
+	table.attr("cellspacing", "2");
+	equals( table[0].cellSpacing, 2, "Check cellspacing is correctly set" );
+
 	// for #1070
 	jQuery("#name").attr('someAttr', '0');
 	equals( jQuery("#name").attr('someAttr'), '0', 'Set attribute to a string of "0"' );
@@ -120,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;
@@ -141,7 +179,7 @@ test("attr(String, Object)", function() {
 	}
 	ok( thrown, "Exception thrown when trying to change type property" );
 	equals( "checkbox", jQuery(check).attr('type'), "Verify that you can change the type of an input element that isn't in the DOM" );
-	
+
 	var check = jQuery("<input />");
 	var thrown = true;
 	try {
@@ -151,7 +189,7 @@ test("attr(String, Object)", function() {
 	}
 	ok( thrown, "Exception thrown when trying to change type property" );
 	equals( "checkbox", check.attr('type'), "Verify that you can change the type of an input element that isn't in the DOM" );
-	
+
 	var button = jQuery("#button");
 	var thrown = false;
 	try {
@@ -163,6 +201,37 @@ test("attr(String, Object)", function() {
 	equals( "button", button.attr('type'), "Verify that you can't change the type of a button element" );
 });
 
+test("attr(jquery_method)", function(){
+	expect(7);
+	
+	var $elem = jQuery("<div />"),
+		elem = $elem[0];
+	
+	// one at a time	
+	$elem.attr({'html': 'foo'}, true);
+	equals( elem.innerHTML, 'foo', 'attr(html)');
+	
+	$elem.attr({'text': 'bar'}, true);
+	equals( elem.innerHTML, 'bar', 'attr(text)');
+	
+	$elem.attr({'css': {color:'red'}}, true);
+	ok( /^(#ff0000|red)$/i.test(elem.style.color), 'attr(css)');
+	
+	$elem.attr({'height': 10}, true);
+	equals( elem.style.height, '10px', 'attr(height)');
+	
+	// Multiple attributes
+	
+	$elem.attr({
+		width:10,
+		css:{ paddingLeft:1, paddingRight:1 }
+	}, true);
+	
+	equals( elem.style.width, '10px', 'attr({...})');
+	equals( elem.style.paddingLeft, '1px', 'attr({...})');
+	equals( elem.style.paddingRight, '1px', 'attr({...})');
+});
+
 if ( !isLocal ) {
 	test("attr(String, Object) - Loaded via XML document", function() {
 		expect(2);
@@ -185,7 +254,7 @@ test("attr('tabindex')", function() {
 	// elements not natively tabbable
 	equals(jQuery('#listWithTabIndex').attr('tabindex'), 5, 'not natively tabbable, with tabindex set to 0');
 	equals(jQuery('#divWithNoTabIndex').attr('tabindex'), undefined, 'not natively tabbable, no tabindex set');
-	
+
 	// anchor with href
 	equals(jQuery('#linkWithNoTabIndex').attr('tabindex'), 0, 'anchor with href, no tabindex set');
 	equals(jQuery('#linkWithTabIndex').attr('tabindex'), 2, 'anchor with href, tabindex set to 2');
@@ -214,7 +283,7 @@ test("attr('tabindex', value)", function() {
 	// set a negative string
 	element.attr('tabindex', '-1');
 	equals(element.attr('tabindex'), -1, 'set tabindex to -1 (string)');
-	
+
 	// set a positive number
 	element.attr('tabindex', 1);
 	equals(element.attr('tabindex'), 1, 'set tabindex to 1 (number)');
@@ -226,7 +295,7 @@ test("attr('tabindex', value)", function() {
 	// set a negative number
 	element.attr('tabindex', -1);
 	equals(element.attr('tabindex'), -1, 'set tabindex to -1 (number)');
-	
+
 	element = jQuery('#linkWithTabIndex');
 	equals(element.attr('tabindex'), 2, 'start with tabindex 2');
 
@@ -234,10 +303,183 @@ test("attr('tabindex', value)", function() {
 	equals(element.attr('tabindex'), -1, 'set negative tabindex');
 });
 
-test("addClass(String)", function() {
-	expect(2);
+test("removeAttr(String)", function() {
+	expect(1);
+	equals( jQuery('#mark').removeAttr( "class" )[0].className, "", "remove class" );
+});
+
+test("val()", function() {
+	expect(23);
+
+	document.getElementById('text1').value = "bla";
+	equals( jQuery("#text1").val(), "bla", "Check for modified value of input element" );
+
+	QUnit.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' );
+
+	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." );
+
+	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(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" );
+
+	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(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(5);
 	var div = jQuery("div");
-	div.addClass("test");
+	div.addClass( valueObj("test") );
 	var pass = true;
 	for ( var i = 0; i < div.size(); i++ ) {
 	 if ( div.get(i).className.indexOf("test") == -1 ) pass = false;
@@ -246,76 +488,268 @@ test("addClass(String)", function() {
 
 	// using contents will get regular, text, and comment nodes
 	var j = jQuery("#nonnodes").contents();
-	j.addClass("asdf");
+	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() {
+	testAddClass(bareObj);
 });
 
-test("removeClass(String) - simple", function() {
-	expect(5);
-	
+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(7);
+
 	var $divs = jQuery('div');
-	
-	$divs.addClass("test").removeClass("test");
-		
+
+	$divs.addClass("test").removeClass( valueObj("test") );
+
 	ok( !$divs.is('.test'), "Remove Class" );
 
-	reset();
+	QUnit.reset();
+	$divs = jQuery('div');
 
 	$divs.addClass("test").addClass("foo").addClass("bar");
-	$divs.removeClass("test").removeClass("bar").removeClass("foo");
-	
+	$divs.removeClass( valueObj("test") ).removeClass( valueObj("bar") ).removeClass( valueObj("foo") );
+
 	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
-	$divs.eq(0).addClass("test").removeClass(null);
+	$divs.eq(0).addClass("test").removeClass( valueObj(null) );
 	ok( $divs.eq(0).is('.test'), "Null value passed to removeClass" );
-	
-	$divs.eq(0).addClass("test").removeClass("");
+
+	$divs.eq(0).addClass("test").removeClass( valueObj("") );
 	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();
-	j.removeClass("asdf");
+	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() {
+	testRemoveClass(bareObj);
+});
+
+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();	
 });
 
-test("toggleClass(String)", function() {
-	expect(6);
+var testToggleClass = function(valueObj) {
+	expect(17);
+
 	var e = jQuery("#firstp");
 	ok( !e.is(".test"), "Assert class not present" );
-	e.toggleClass("test");
+	e.toggleClass( valueObj("test") );
 	ok( e.is(".test"), "Assert class present" );
-	e.toggleClass("test");
+	e.toggleClass( valueObj("test") );
 	ok( !e.is(".test"), "Assert class not present" );
 
-	e.toggleClass("test", false);
+	// class name with a boolean
+	e.toggleClass( valueObj("test"), false );
 	ok( !e.is(".test"), "Assert class not present" );
-	e.toggleClass("test", true);
+	e.toggleClass( valueObj("test"), true );
 	ok( e.is(".test"), "Assert class present" );
-	e.toggleClass("test", false);
+	e.toggleClass( valueObj("test"), false );
 	ok( !e.is(".test"), "Assert class not present" );
+
+	// multiple class names
+	e.addClass("testA testB");
+	ok( (e.is(".testA.testB")), "Assert 2 different classes present" );
+	e.toggleClass( valueObj("testB testC") );
+	ok( (e.is(".testA.testC") && !e.is(".testB")), "Assert 1 class added, 1 class removed, and 1 class kept" );
+	e.toggleClass( valueObj("testA testC") );
+	ok( (!e.is(".testA") && !e.is(".testB") && !e.is(".testC")), "Assert no class present" );
+
+	// toggleClass storage
+	e.toggleClass(true);
+	ok( e.get(0).className === "", "Assert class is empty (data was empty)" );
+	e.addClass("testD testE");
+	ok( e.is(".testD.testE"), "Assert class present" );
+	e.toggleClass();
+	ok( !e.is(".testD.testE"), "Assert class not present" );
+	ok( e.data('__className__') === 'testD testE', "Assert data was stored" );
+	e.toggleClass();
+	ok( e.is(".testD.testE"), "Assert class present (restored from data)" );
+	e.toggleClass(false);
+	ok( !e.is(".testD.testE"), "Assert class not present" );
+	e.toggleClass(true);
+	ok( e.is(".testD.testE"), "Assert class present (restored from data)" );
+	e.toggleClass();
+	e.toggleClass(false);
+	e.toggleClass();
+	ok( e.is(".testD.testE"), "Assert class present (restored from data)" );
+
+
+
+	// Cleanup
+	e.removeClass("testD");
+	e.removeData('__className__');
+};
+
+test("toggleClass(String|boolean|undefined[, boolean])", function() {
+	testToggleClass(bareObj);
 });
 
-test("removeAttr(String", function() {
-	expect(1);
-	equals( jQuery('#mark').removeAttr("class")[0].className, "", "remove class" );
+test("toggleClass(Function[, boolean])", function() {
+	testToggleClass(functionReturningObj);
+});
+
+test("toggleClass(Fucntion[, boolean]) with incoming value", function() {
+	expect(14);
+
+	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" );
+
+	// Cleanup
+	e.removeClass("test");
+	e.removeData('__className__');
 });
 
-test("jQuery.className", function() {
-	expect(6);
-	var x = jQuery("<p>Hi</p>")[0];
-	var c = jQuery.className;
-	c.add(x, "hi");
+test("addClass, removeClass, hasClass", function() {
+	expect(14);
+ 
+	var jq = jQuery("<p>Hi</p>"), x = jq[0];
+ 
+	jq.addClass("hi");
 	equals( x.className, "hi", "Check single added class" );
-	c.add(x, "foo bar");
+ 
+	jq.addClass("foo bar");
 	equals( x.className, "hi foo bar", "Check more added classes" );
-	c.remove(x);
+ 
+	jq.removeClass();
 	equals( x.className, "", "Remove all classes" );
-	c.add(x, "hi foo bar");
-	c.remove(x, "foo");
+ 
+	jq.addClass("hi foo bar");
+	jq.removeClass("foo");
 	equals( x.className, "hi bar", "Check removal of one class" );
-	ok( c.has(x, "hi"), "Check has1" );
-	ok( c.has(x, "bar"), "Check has2" );
+ 
+	ok( jq.hasClass("hi"), "Check has1" );
+	ok( jq.hasClass("bar"), "Check has2" );
+ 
+	var jq = jQuery("<p class='class1\nclass2\tcla.ss3\n'></p>");
+	ok( jq.hasClass("class1"), "Check hasClass with carriage return" );
+	ok( jq.is(".class1"), "Check is with carriage return" );
+	ok( jq.hasClass("class2"), "Check hasClass with tab" );
+	ok( jq.is(".class2"), "Check is with tab" );
+	ok( jq.hasClass("cla.ss3"), "Check hasClass with dot" );
+ 
+	jq.removeClass("class2");
+	ok( jq.hasClass("class2")==false, "Check the class has been properly removed" );
+	jq.removeClass("cla");
+	ok( jq.hasClass("cla.ss3"), "Check the dotted class has not been removed" );
+	jq.removeClass("cla.ss3");
+	ok( jq.hasClass("cla.ss3")==false, "Check the dotted class has been removed" );
 });