Fix up whitespace and a couple of glitches.

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

diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index aa5bd7c..6b18f99 100644 (file)
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -1,7 +1,10 @@
 module("attributes");
 
+var bareObj = function(value) { return value; };
+var functionReturningObj = function(value) { return (function() { return value; }); };
+
 test("attr(String)", function() {
-       expect(27);
+       expect(28);
        
        // This one sometimes fails randomally ?!
        equals( jQuery('#text1').attr('value'), "Test", 'Check for value attribute' );
@@ -18,6 +21,7 @@ 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' );
+       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' );
@@ -77,8 +81,8 @@ test("attr(Hash)", 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");
+                        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");
 
 });
 
@@ -293,10 +297,10 @@ test("attr('tabindex', value)", function() {
        equals(element.attr('tabindex'), -1, 'set negative tabindex');
 });
 
-test("addClass(String)", function() {
+var testAddClass = function(valueObj) {
        expect(2);
        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;
@@ -305,16 +309,24 @@ 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" );
+}
+
+test("addClass(String)", function() {
+       testAddClass(bareObj);
 });
 
-test("removeClass(String) - simple", function() {
+test("addClass(Function)", function() {
+       testAddClass(functionReturningObj);
+});
+
+var testRemoveClass = function(valueObj) {
        expect(5);
 
        var $divs = jQuery('div');
 
-       $divs.addClass("test").removeClass("test");
+       $divs.addClass("test").removeClass( valueObj("test") );
 
        ok( !$divs.is('.test'), "Remove Class" );
 
@@ -322,7 +334,7 @@ test("removeClass(String) - simple", function() {
        $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" );
 
@@ -330,42 +342,50 @@ test("removeClass(String) - simple", function() {
        $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" );
+};
+
+test("removeClass(String) - simple", function() {
+       testRemoveClass(bareObj);
 });
 
-test("toggleClass(String|boolean|undefined[, boolean])", function() {
+test("removeClass(Function) - simple", function() {
+       testRemoveClass(functionReturningObj);
+});
+
+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" );
 
        // class name with a boolean
-       e.toggleClass("test", false);
+       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("testB testC");
+       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("testA testC");
+       e.toggleClass( valueObj("testA testC") );
        ok( (!e.is(".testA") && !e.is(".testB") && !e.is(".testC")), "Assert no class present" );
 
        // toggleClass storage
@@ -392,11 +412,27 @@ test("toggleClass(String|boolean|undefined[, boolean])", function() {
        // Cleanup
        e.removeClass("testD");
        e.removeData('__className__');
+};
+
+test("toggleClass(String|boolean|undefined[, boolean])", function() {
+       testToggleClass(bareObj);
 });
 
-test("removeAttr(String", function() {
+test("toggleClass(Function[, boolean])", function() {
+       testToggleClass(functionReturningObj);
+});
+
+var testRemoveAttr = function(valueObj) {
        expect(1);
-       equals( jQuery('#mark').removeAttr("class")[0].className, "", "remove class" );
+       equals( jQuery('#mark').removeAttr( valueObj("class") )[0].className, "", "remove class" );
+};
+
+test("removeAttr(String)", function() {
+       testRemoveAttr(bareObj);
+});
+
+test("removeAttr(Function)", function() {
+       testRemoveAttr(functionReturningObj);
 });
 
 test("addClass, removeClass, hasClass", function() {