diff options
| author | kborchers <k_borchers@yahoo.com> | 2011-11-30 10:46:31 -0600 |
|---|---|---|
| committer | kborchers <k_borchers@yahoo.com> | 2011-11-30 10:49:13 -0600 |
| commit | b539e2e5c8528fb1cfaa241fd509fc1ccf65a095 (patch) | |
| tree | 6c4ef7aed8fbaaaaff4ea2e961d7db5428fce7bb /tests/unit/dialog/dialog_options.js | |
| parent | 53ea93327e9040b7472e8fd2af2abaea19058e4a (diff) | |
| parent | afdc577e9c26d6571e934a8fef892f7fbe3619c6 (diff) | |
| download | jquery-ui-b539e2e5c8528fb1cfaa241fd509fc1ccf65a095.tar.gz jquery-ui-b539e2e5c8528fb1cfaa241fd509fc1ccf65a095.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'tests/unit/dialog/dialog_options.js')
| -rw-r--r-- | tests/unit/dialog/dialog_options.js | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/unit/dialog/dialog_options.js b/tests/unit/dialog/dialog_options.js index eab577c69..264c2fb6e 100644 --- a/tests/unit/dialog/dialog_options.js +++ b/tests/unit/dialog/dialog_options.js @@ -177,19 +177,24 @@ test("draggable", function() { }); test("height", function() { - expect(3); + expect(4); el = $('<div></div>').dialog(); - equals(dlg().height(), 150, "default height"); + equals(dlg().outerHeight(), 150, "default height"); el.remove(); el = $('<div></div>').dialog({ height: 237 }); - equals(dlg().height(), 237, "explicit height"); + equals(dlg().outerHeight(), 237, "explicit height"); el.remove(); el = $('<div></div>').dialog(); el.dialog('option', 'height', 238); - equals(dlg().height(), 238, "explicit height set after init"); + equals(dlg().outerHeight(), 238, "explicit height set after init"); + el.remove(); + + el = $('<div></div>').css("padding", "20px") + .dialog({ height: 240 }); + equals(dlg().outerHeight(), 240, "explicit height with padding"); el.remove(); }); |