From f126f1ce857f11154a8378fc7e0b04a00d803682 Mon Sep 17 00:00:00 2001 From: jeresig Date: Thu, 7 Jan 2010 11:15:40 -0500 Subject: [PATCH] Added tests for attribute function setters. --- test/unit/attributes.js | 150 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 141 insertions(+), 9 deletions(-) diff --git a/test/unit/attributes.js b/test/unit/attributes.js index e1b4c0dc7..fd5b203df 100644 --- a/test/unit/attributes.js +++ b/test/unit/attributes.js @@ -292,6 +292,11 @@ 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); @@ -378,6 +383,57 @@ 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(""); + + 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); var div = jQuery("div"); @@ -402,6 +458,25 @@ 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) { + 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); @@ -443,6 +518,23 @@ 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) { + 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); @@ -503,17 +595,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() { -- 2.39.5