From 7cfec99858bf397714d3aac1c0ba4708d2ddb986 Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Mon, 13 Jul 2009 21:50:58 +0000 Subject: [PATCH] Uses the more stable font-size as a sentinel --- test/unit/css.js | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/test/unit/css.js b/test/unit/css.js index 20e55073..649db596 100644 --- a/test/unit/css.js +++ b/test/unit/css.js @@ -85,7 +85,7 @@ test("css(String, Function)", function() { try { expect(3); - var colors = ["#ff0000", "#00ff00", "#0000ff"]; + var sizes = ["10px", "20px", "30px"]; jQuery("
" + "
" + @@ -94,16 +94,18 @@ test("css(String, Function)", function() { var index = 0; - jQuery("#cssFunctionTest div").css("color", function() { - var color = colors[index]; + jQuery("#cssFunctionTest div").css("font-size", function() { + var size = sizes[index]; index++; - return color; + return size; }); index = 0; jQuery("#cssFunctionTest div").each(function() { - equals( jQuery(this).css("color"), colors[index], "Div #" + index + " should be " + colors[index] ); + var computedSize = jQuery(this).css("font-size") + var expectedSize = sizes[index] + equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize ); index++; }); @@ -116,7 +118,7 @@ test("css(Object) where values are Functions", function() { try { expect(3); - var colors = ["rgb(255, 0, 0)", "rgb(0, 255, 0)", "rgb(0, 0, 255)"]; + var sizes = ["10px", "20px", "30px"]; jQuery("
" + "
" + @@ -125,18 +127,18 @@ test("css(Object) where values are Functions", function() { var index = 0; - jQuery("#cssFunctionTest div").css({color: function() { - var color = colors[index]; + jQuery("#cssFunctionTest div").css({fontSize: function() { + var size = sizes[index]; index++; - return color; + return size; }}); index = 0; jQuery("#cssFunctionTest div").each(function() { - var computedColor = jQuery(this).css("color").replace(/ /g, ''); - var expectedColor = colors[index].replace(/ /g, ''); - equals( computedColor, expectedColor, "Div #" + index + " should be " + expectedColor ); + var computedSize = jQuery(this).css("font-size") + var expectedSize = sizes[index] + equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize ); index++; });