X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2FcoreTest.js;h=4370e9da82391c08b696eab9a66cf3354180b406;hb=3728a8ac0494de7ccab48bfc69f5d71496ba64c2;hp=c8dada498742aa5f5efa5dab3d48f43018fac0f4;hpb=8613d9a93ac424ee5c60ba6f69751e93a2d179c6;p=jquery.git diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js index c8dada4..4370e9d 100644 --- a/src/jquery/coreTest.js +++ b/src/jquery/coreTest.js @@ -240,7 +240,7 @@ if ( location.protocol != "file:" ) { } test("css(String|Hash)", function() { - expect(8); + expect(19); ok( $('#main').css("display") == 'none', 'Check for css property "display"'); @@ -258,10 +258,19 @@ test("css(String|Hash)", function() { ok( $('#floatTest').css('float') == 'right', 'Modified CSS float using "float": Assert float is right'); $('#floatTest').css({'font-size': '30px'}); ok( $('#floatTest').css('font-size') == '30px', 'Modified CSS font-size: Assert font-size is 30px'); + + $.each("0,0.25,0.5,0.75,1".split(','), function(i, n) { + $('#foo').css({opacity: n}); + ok( $('#foo').css('opacity') == n, "Assert opacity is " + n + " as a String" ); + $('#foo').css({opacity: parseFloat(n)}); + ok( $('#foo').css('opacity') == n, "Assert opacity is " + n + " as a Number" ); + }); + $('#foo').css({opacity: ''}); + ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" ); }); test("css(String, Object)", function() { - expect(7); + expect(18); ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible'); $('#foo').css('display', 'none'); ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden'); @@ -276,6 +285,15 @@ test("css(String, Object)", function() { ok( $('#floatTest').css('float') == 'left', 'Modified CSS float using "float": Assert float is left'); $('#floatTest').css('font-size', '20px'); ok( $('#floatTest').css('font-size') == '20px', 'Modified CSS font-size: Assert font-size is 20px'); + + $.each("0,0.25,0.5,0.75,1".split(','), function(i, n) { + $('#foo').css('opacity', n); + ok( $('#foo').css('opacity') == n, "Assert opacity is " + n + " as a String" ); + $('#foo').css('opacity', parseFloat(n)); + ok( $('#foo').css('opacity') == n, "Assert opacity is " + n + " as a Number" ); + }); + $('#foo').css('opacity', ''); + ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" ); }); test("text()", function() {