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 (parent:
a2e1051
)
Add .width() and .height() unit test for empty sets. Fix .height() test that was...
author
Brandon Aaron
<brandon.aaron@gmail.com>
Wed, 1 Sep 2010 16:05:35 +0000
(11:05 -0500)
committer
Brandon Aaron
<brandon.aaron@gmail.com>
Wed, 1 Sep 2010 16:05:35 +0000
(11:05 -0500)
test/unit/dimensions.js
patch
|
blob
|
history
diff --git
a/test/unit/dimensions.js
b/test/unit/dimensions.js
index
5397790
..
92cf17b
100644
(file)
--- a/
test/unit/dimensions.js
+++ b/
test/unit/dimensions.js
@@
-9,7
+9,7
@@
function fn( val ) {
}
function testWidth( val ) {
}
function testWidth( val ) {
- expect(7);
+ expect(8);
var $div = jQuery("#nothiddendiv");
$div.width( val(30) );
var $div = jQuery("#nothiddendiv");
$div.width( val(30) );
@@
-32,6
+32,7
@@
function testWidth( val ) {
var blah = jQuery("blah");
equals( blah.width( val(10) ), blah, "Make sure that setting a width on an empty set returns the set." );
var blah = jQuery("blah");
equals( blah.width( val(10) ), blah, "Make sure that setting a width on an empty set returns the set." );
+ equals( blah.width(), null, "Make sure 'null' is returned on an empty set");
}
test("width()", function() {
}
test("width()", function() {
@@
-55,7
+56,7
@@
test("width() with function args", function() {
});
function testHeight( val ) {
});
function testHeight( val ) {
- expect(6);
+ expect(8);
var $div = jQuery("#nothiddendiv");
$div.height( val(30) );
var $div = jQuery("#nothiddendiv");
$div.height( val(30) );
@@
-72,15
+73,20
@@
function testHeight( val ) {
$div.css({ display: "", border: "", padding: "", height: "1px" });
$div.css({ display: "", border: "", padding: "", height: "1px" });
+ jQuery("#nothiddendivchild").css({ height: 20, padding: "3px", border: "2px solid #fff" });
+ equals(jQuery("#nothiddendivchild").height(), 20, "Test child height with border and padding");
+ jQuery("#nothiddendiv, #nothiddendivchild").css({ border: "", padding: "", height: "" });
+
var blah = jQuery("blah");
equals( blah.height( val(10) ), blah, "Make sure that setting a height on an empty set returns the set." );
var blah = jQuery("blah");
equals( blah.height( val(10) ), blah, "Make sure that setting a height on an empty set returns the set." );
+ equals( blah.height(), null, "Make sure 'null' is returned on an empty set");
}
test("height()", function() {
testHeight( pass );
});
}
test("height()", function() {
testHeight( pass );
});
-test("width() with function", function() {
+test("height() with function", function() {
testHeight( fn );
});
testHeight( fn );
});