git.asbjorn.biz
/
jquery.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c0802e5
)
Uses the more stable font-size as a sentinel
author
Yehuda Katz
<wycats@gmail.com>
Mon, 13 Jul 2009 21:50:58 +0000
(21:50 +0000)
committer
Yehuda Katz
<wycats@gmail.com>
Mon, 13 Jul 2009 21:50:58 +0000
(21:50 +0000)
test/unit/css.js
patch
|
blob
|
history
diff --git
a/test/unit/css.js
b/test/unit/css.js
index
20e5507
..
649db59
100644
(file)
--- a/
test/unit/css.js
+++ b/
test/unit/css.js
@@
-85,7
+85,7
@@
test("css(String, Function)", function() {
try {
expect(3);
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>" +
jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
"<div class='cssFunction'></div>" +
@@
-94,16
+94,18
@@
test("css(String, Function)", function() {
var index = 0;
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++;
index++;
- return color;
+ return size;
});
index = 0;
jQuery("#cssFunctionTest div").each(function() {
});
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++;
});
index++;
});
@@
-116,7
+118,7
@@
test("css(Object) where values are Functions", function() {
try {
expect(3);
try {
expect(3);
- var colors = ["rgb(255, 0, 0)", "rgb(0, 255, 0)", "rgb(0, 0, 255)"];
+ var sizes = ["10px", "20px", "30px"];
jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
"<div class='cssFunction'></div>" +
jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
"<div class='cssFunction'></div>" +
@@
-125,18
+127,18
@@
test("css(Object) where values are Functions", function() {
var index = 0;
var index = 0;
- jQuery("#cssFunctionTest div").css({color: function() {
- var color = colors[index];
+ jQuery("#cssFunctionTest div").css({fontSize: function() {
+ var size = sizes[index];
index++;
index++;
- return color;
+ return size;
}});
index = 0;
jQuery("#cssFunctionTest div").each(function() {
}});
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++;
});
index++;
});