X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcss.js;h=beac04a89e07276e802216dc92c70476fe7d6199;hb=ac00fe5bbb2a95fdb747f76fd9dd7c58ba6a531c;hp=89f83982000aaca2f3753f4a9519a01e288961e7;hpb=4ae7234736fd501110a7bf2acea6cc68e24bd4cd;p=jquery.git

diff --git a/test/unit/css.js b/test/unit/css.js
index 89f8398..beac04a 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,7 +1,7 @@
 module("css");
 
 test("css(String|Hash)", function() {
-	expect(23);
+	expect(27);
 
 	equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
 
@@ -38,6 +38,17 @@ test("css(String|Hash)", function() {
 	equals( jQuery('#empty').css('opacity'), '0', "Assert opacity is accessible via filter property set in stylesheet in IE" );
 	jQuery('#empty').css({ opacity: '1' });
 	equals( jQuery('#empty').css('opacity'), '1', "Assert opacity is taken from style attribute when set vs stylesheet in IE with filters" );
+
+	var div = jQuery('#nothiddendiv'), child = jQuery('#nothiddendivchild');
+
+	equals( parseInt(div.css("fontSize")), 16, "Verify fontSize px set." );
+	equals( parseInt(child.css("fontSize")), 16, "Verify fontSize px set." );
+
+	child.attr("class", "em");
+	equals( parseInt(child.css("fontSize")), 32, "Verify fontSize em set." );
+
+	child.attr("class", "prct");
+	equals( parseInt(child.css("fontSize")), 24, "Verify fontSize % set." );
 });
 
 test("css(String, Object)", function() {
@@ -85,7 +96,7 @@ test("css(String, Function)", function() {
 	try { 
 		expect(3);
 		
-		var colors = ["#ff0000", "#00ff00", "#0000ff"];
+		var sizes = ["10px", "20px", "30px"];
 	
 		jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
 					 "<div class='cssFunction'></div>" + 
@@ -94,16 +105,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 +129,7 @@ test("css(Object) where values are Functions", function() {
 	try { 
 		expect(3);
 		
-		var colors = ["#ff0000", "#00ff00", "#0000ff"];
+		var sizes = ["10px", "20px", "30px"];
 	
 		jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
 					 "<div class='cssFunction'></div>" + 
@@ -125,16 +138,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() {
-			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++;
 		});