No need for the try/finally logic in the css tests, won't even work as expected.
This commit is contained in:
parent
22ff8e9ea4
commit
0bb4fd0af7
1 changed files with 43 additions and 49 deletions
|
@ -120,69 +120,63 @@ if(jQuery.browser.msie) {
|
|||
}
|
||||
|
||||
test("css(String, Function)", function() {
|
||||
try {
|
||||
expect(3);
|
||||
expect(3);
|
||||
|
||||
var sizes = ["10px", "20px", "30px"];
|
||||
var sizes = ["10px", "20px", "30px"];
|
||||
|
||||
jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
|
||||
"<div class='cssFunction'></div>" +
|
||||
"<div class='cssFunction'></div></div>")
|
||||
.appendTo("body");
|
||||
jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
|
||||
"<div class='cssFunction'></div>" +
|
||||
"<div class='cssFunction'></div></div>")
|
||||
.appendTo("body");
|
||||
|
||||
var index = 0;
|
||||
var index = 0;
|
||||
|
||||
jQuery("#cssFunctionTest div").css("font-size", function() {
|
||||
var size = sizes[index];
|
||||
index++;
|
||||
return size;
|
||||
});
|
||||
jQuery("#cssFunctionTest div").css("font-size", function() {
|
||||
var size = sizes[index];
|
||||
index++;
|
||||
return size;
|
||||
});
|
||||
|
||||
index = 0;
|
||||
|
||||
jQuery("#cssFunctionTest div").each(function() {
|
||||
var computedSize = jQuery(this).css("font-size")
|
||||
var expectedSize = sizes[index]
|
||||
equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
|
||||
index++;
|
||||
});
|
||||
|
||||
} finally {
|
||||
jQuery("#cssFunctionTest").remove();
|
||||
}
|
||||
index = 0;
|
||||
|
||||
jQuery("#cssFunctionTest div").each(function() {
|
||||
var computedSize = jQuery(this).css("font-size")
|
||||
var expectedSize = sizes[index]
|
||||
equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
|
||||
index++;
|
||||
});
|
||||
|
||||
jQuery("#cssFunctionTest").remove();
|
||||
});
|
||||
|
||||
test("css(Object) where values are Functions", function() {
|
||||
try {
|
||||
expect(3);
|
||||
expect(3);
|
||||
|
||||
var sizes = ["10px", "20px", "30px"];
|
||||
var sizes = ["10px", "20px", "30px"];
|
||||
|
||||
jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
|
||||
"<div class='cssFunction'></div>" +
|
||||
"<div class='cssFunction'></div></div>")
|
||||
.appendTo("body");
|
||||
jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
|
||||
"<div class='cssFunction'></div>" +
|
||||
"<div class='cssFunction'></div></div>")
|
||||
.appendTo("body");
|
||||
|
||||
var index = 0;
|
||||
|
||||
var index = 0;
|
||||
|
||||
jQuery("#cssFunctionTest div").css({fontSize: function() {
|
||||
var size = sizes[index];
|
||||
index++;
|
||||
return size;
|
||||
}});
|
||||
jQuery("#cssFunctionTest div").css({fontSize: function() {
|
||||
var size = sizes[index];
|
||||
index++;
|
||||
return size;
|
||||
}});
|
||||
|
||||
index = 0;
|
||||
index = 0;
|
||||
|
||||
jQuery("#cssFunctionTest div").each(function() {
|
||||
var computedSize = jQuery(this).css("font-size")
|
||||
var expectedSize = sizes[index]
|
||||
equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
|
||||
index++;
|
||||
});
|
||||
jQuery("#cssFunctionTest div").each(function() {
|
||||
var computedSize = jQuery(this).css("font-size")
|
||||
var expectedSize = sizes[index]
|
||||
equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
|
||||
index++;
|
||||
});
|
||||
|
||||
} finally {
|
||||
jQuery("#cssFunctionTest").remove();
|
||||
}
|
||||
jQuery("#cssFunctionTest").remove();
|
||||
});
|
||||
|
||||
test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", function () {
|
||||
|
|
Loading…
Reference in a new issue