aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit/dialog/dialog_methods.js
diff options
context:
space:
mode:
authorMike Sherov <mike.sherov@gmail.com>2012-12-12 03:16:33 -0500
committerMike Sherov <mike.sherov@gmail.com>2012-12-12 03:16:33 -0500
commitfec36fd2140a1e88b0a6584f4e9d42a0495d395a (patch)
treec986f242ba1f786d16bfe0fea6f273a61966162d /tests/unit/dialog/dialog_methods.js
parentb9f206dbcf7f8b9c190e86f0974ad2003911b668 (diff)
downloadjquery-ui-fec36fd2140a1e88b0a6584f4e9d42a0495d395a.tar.gz
jquery-ui-fec36fd2140a1e88b0a6584f4e9d42a0495d395a.zip
Dev: remove todos from datepicker and dialog testsuite
Diffstat (limited to 'tests/unit/dialog/dialog_methods.js')
-rw-r--r--tests/unit/dialog/dialog_methods.js21
1 files changed, 10 insertions, 11 deletions
diff --git a/tests/unit/dialog/dialog_methods.js b/tests/unit/dialog/dialog_methods.js
index fbb649fbf..85d13d157 100644
--- a/tests/unit/dialog/dialog_methods.js
+++ b/tests/unit/dialog/dialog_methods.js
@@ -59,6 +59,16 @@ test("destroy", function() {
});
});
+test("#4980: Destroy should place element back in original DOM position", function(){
+ expect( 2 );
+ var container = $('<div id="container"><div id="modal">Content</div></div>'),
+ modal = container.find('#modal');
+ modal.dialog();
+ ok(!$.contains(container[0], modal[0]), 'dialog should move modal element to outside container element');
+ modal.dialog('destroy');
+ ok($.contains(container[0], modal[0]), 'dialog(destroy) should place element back in original DOM position');
+});
+
test( "enable/disable disabled", function() {
expect( 2 );
var el = $( "<div></div>" ).dialog();
@@ -137,17 +147,6 @@ test("open", function() {
ok(el.dialog('widget').is(':visible') && !el.dialog('widget').is(':hidden'), 'dialog visible after open method called');
});
-// TODO merge this with the main destroy test
-test("#4980: Destroy should place element back in original DOM position", function(){
- expect( 2 );
- var container = $('<div id="container"><div id="modal">Content</div></div>'),
- modal = container.find('#modal');
- modal.dialog();
- ok(!$.contains(container[0], modal[0]), 'dialog should move modal element to outside container element');
- modal.dialog('destroy');
- ok($.contains(container[0], modal[0]), 'dialog(destroy) should place element back in original DOM position');
-});
-
test("#6137: dialog('open') causes form elements to reset on IE7", function() {
expect(2);