Dialog: Added some more tests.

diff --git a/tests/dialog.js b/tests/dialog.js
index 89560f7791309d4df7680ae5382b8d4ad38258cb..85b744cb1d97b343994744c3efd4cc7b2799e32b 100644 (file)
--- a/tests/dialog.js
+++ b/tests/dialog.js
@@ -33,19 +33,19 @@ var el,
        widthBefore, widthAfter,\r
        dragged;\r
 \r
-var dlg = function() {\r
+function dlg() {\r
        return el.data("dialog").element.parents(".ui-dialog:first");\r
 }\r
 \r
-var isOpen = function(why) {\r
+function isOpen(why) {\r
        ok(dlg().is(":visible"), why);\r
 }\r
 \r
-var isNotOpen = function(why) {\r
+function isNotOpen(why) {\r
        ok(!dlg().is(":visible"), why);\r
 }\r
 \r
-var drag = function(handle, dx, dy) {\r
+function drag(handle, dx, dy) {\r
        var d = dlg();\r
        offsetBefore = d.offset();\r
        heightBefore = d.height();\r
@@ -63,7 +63,7 @@ var drag = function(handle, dx, dy) {
        widthAfter = d.width();\r
 }\r
 \r
-var moved = function(dx, dy, msg) {\r
+function moved(dx, dy, msg) {\r
        msg = msg ? msg + "." : "";\r
        var actual = { left: offsetAfter.left, top: offsetAfter.top };\r
        var expected = { left: offsetBefore.left + dx, top: offsetBefore.top + dy };\r
@@ -82,7 +82,7 @@ function shouldnotmove(why) {
        moved(0, 0, why);\r
 }\r
 \r
-var resized = function(dw, dh, msg) {\r
+function resized(dw, dh, msg) {\r
        msg = msg ? msg + "." : "";\r
        var actual = { width: widthAfter, height: heightAfter };\r
        var expected = { width: widthBefore + dw, height: heightBefore + dh };\r
@@ -101,33 +101,37 @@ function shouldnotresize(why) {
        resized(0, 0, why);\r
 }\r
 \r
-var border = function(el, side) { return parseInt(el.css('border-' + side + '-width')); }\r
+function broder(el, side){\r
+       return parseInt(el.css('border-' + side + '-width'), 10);\r
+}\r
 \r
-var margin = function(el, side) { return parseInt(el.css('margin-' + side)); }\r
+function margin(el, side) {\r
+       return parseInt(el.css('margin-' + side), 10);\r
+}\r
 \r
 // Dialog Tests\r
 module("dialog");\r
 \r
 test("init", function() {\r
        expect(6);\r
-\r
+       \r
        $("#dialog1").dialog().remove();\r
        ok(true, '.dialog() called on element');\r
-\r
+       \r
        $([]).dialog().remove();\r
        ok(true, '.dialog() called on empty collection');\r
-\r
+       \r
        $('<div/>').dialog().remove();\r
        ok(true, '.dialog() called on disconnected DOMElement');\r
-\r
+       \r
        $('<div/>').dialog().dialog("foo").remove();\r
        ok(true, 'arbitrary method called after init');\r
-\r
-       el = $('<div/>').dialog()\r
+       \r
+       el = $('<div/>').dialog();\r
        var foo = el.data("foo.dialog");\r
        el.remove();\r
        ok(true, 'arbitrary option getter after init');\r
-\r
+       \r
        $('<div/>').dialog().data("foo.dialog", "bar").remove();\r
        ok(true, 'arbitrary option setter after init');\r
 });\r
@@ -193,9 +197,11 @@ module("dialog: Options");
 \r
 test("autoOpen", function() {\r
        expect(2);\r
+       \r
        el = $('<div/>').dialog({ autoOpen: false });\r
                isNotOpen('.dialog({ autoOpen: false })');\r
        el.remove();\r
+       \r
        el = $('<div/>').dialog({ autoOpen: true });\r
                isOpen('.dialog({ autoOpen: true })');\r
        el.remove();\r
@@ -203,25 +209,32 @@ test("autoOpen", function() {
 \r
 test("autoResize", function() {\r
        expect(2);\r
+       \r
+       var actual,\r
+               before,\r
+               expected,\r
+               handle;\r
+       \r
        el = $('<div>content<br>content<br>content<br>content<br>content</div>').dialog({ autoResize: false });\r
-               var expected = { height: el.height() };\r
-               var handle = $(".ui-resizable-se", dlg());\r
+               expected = { height: el.height() };\r
+               handle = $(".ui-resizable-se", dlg());\r
                drag(handle, 50, 50);\r
-               var actual = { height: el.height() };\r
+               actual = { height: el.height() };\r
                compare2(actual, expected, '.dialog({ autoResize: false })');\r
        el.remove();\r
        el = $('<div>content<br>content<br>content<br>content<br>content</div>').dialog({ autoResize: true });\r
-               var before = { width: el.width(), height: el.height() };\r
-               var handle = $(".ui-resizable-se", dlg());\r
+               before = { width: el.width(), height: el.height() };\r
+               handle = $(".ui-resizable-se", dlg());\r
                drag(handle, 50, 50);\r
-               var expected = { width: before.width + 50, height: before.height + 50 };\r
-               var actual = { width: el.width(), height: el.height() };\r
+               expected = { width: before.width + 50, height: before.height + 50 };\r
+               actual = { width: el.width(), height: el.height() };\r
                compare2(actual, expected, '.dialog({ autoResize: true })');\r
        el.remove();\r
 });\r
 \r
 test("buttons", function() {\r
-       expect(14);\r
+       expect(17);\r
+       \r
        var buttons = {\r
                "Ok": function(ev, ui) {\r
                        ok(true, "button click fires callback");\r
@@ -233,45 +246,57 @@ test("buttons", function() {
                        equals(this, el[0], "context of callback");\r
                        equals(ev.target, btn[1], "event target");\r
                }\r
-       }\r
+       };\r
+       \r
        el = $('<div/>').dialog({ buttons: buttons });\r
        var btn = $("button", dlg());\r
        equals(btn.length, 2, "number of buttons");\r
+       \r
        var i = 0;\r
        $.each(buttons, function(key, val) {\r
                equals(btn.eq(i).text(), key, "text of button " + (i+1));\r
-               i += 1;\r
+               i++;\r
        });\r
+       \r
        equals(btn.parent().attr('className'), 'ui-dialog-buttonpane', "buttons in container");\r
        btn.trigger("click");\r
-\r
+       \r
        var newButtons = {\r
-               "Close": function() {}\r
-       }\r
-\r
+               "Close": function(ev, ui) {\r
+                       ok(true, "button click fires callback");\r
+                       equals(this, el[0], "context of callback");\r
+                       equals(ev.target, btn[0], "event target");\r
+               }\r
+       };\r
+       \r
        equals(el.data("buttons.dialog"), buttons, '.data("buttons.dialog") getter');\r
        el.data("buttons.dialog", newButtons);\r
        equals(el.data("buttons.dialog"), newButtons, '.data("buttons.dialog", ...) setter');\r
-\r
+       \r
        btn = $("button", dlg());\r
        equals(btn.length, 1, "number of buttons after setter");\r
-       var i = 0;\r
+       btn.trigger('click');\r
+       \r
+       i = 0;\r
        $.each(newButtons, function(key, val) {\r
                equals(btn.eq(i).text(), key, "text of button " + (i+1));\r
                i += 1;\r
        });\r
-\r
+       \r
        el.remove();\r
 });\r
 \r
 test("dialogClass", function() {\r
        expect(4);\r
+       \r
        el = $('<div/>').dialog();\r
                equals(dlg().is(".foo"), false, 'dialogClass not specified. foo class added');\r
        el.remove();\r
+       \r
        el = $('<div/>').dialog({ dialogClass: "foo" });\r
                equals(dlg().is(".foo"), true, 'dialogClass in init. foo class added');\r
        el.remove();\r
+       \r
        el = $('<div/>').dialog({ dialogClass: "foo bar" });\r
                equals(dlg().is(".foo"), true, 'dialogClass in init, two classes. foo class added');\r
                equals(dlg().is(".bar"), true, 'dialogClass in init, two classes. bar class added');\r
@@ -279,71 +304,112 @@ test("dialogClass", function() {
 });\r
 \r
 test("draggable", function() {\r
-       expect(2);\r
+       expect(4);\r
+       \r
        el = $('<div/>').dialog({ draggable: false });\r
                shouldnotmove();\r
+               el.data('draggable.dialog', true);\r
+               shouldmove();\r
        el.remove();\r
+       \r
        el = $('<div/>').dialog({ draggable: true });\r
                shouldmove();\r
+               el.data('draggable.dialog', false);\r
+               shouldnotmove();\r
        el.remove();\r
 });\r
 \r
 test("height", function() {\r
-       expect(2);\r
+       expect(3);\r
+       \r
        el = $('<div/>').dialog();\r
                equals(dlg().height(), defaults.height, "default height");\r
        el.remove();\r
+       \r
        el = $('<div/>').dialog({ height: 437 });\r
                equals(dlg().height(), 437, "explicit height");\r
        el.remove();\r
+       \r
+       el = $('<div/>').dialog();\r
+               el.data('height.dialog', 438);\r
+               equals(dlg().height(), 438, "explicit height set after init");\r
+       el.remove();\r
 });\r
 \r
 test("maxHeight", function() {\r
-       expect(2);\r
+       expect(3);\r
+       \r
        el = $('<div/>').dialog({ maxHeight: 400 });\r
                drag('.ui-resizable-s', 1000, 1000);\r
                equals(heightAfter, 400, "maxHeight");\r
        el.remove();\r
+       \r
        el = $('<div/>').dialog({ maxHeight: 400 });\r
                drag('.ui-resizable-n', -1000, -1000);\r
                equals(heightAfter, 400, "maxHeight");\r
        el.remove();\r
+       \r
+       el = $('<div/>').dialog({ maxHeight: 400 }).data('maxHeight.dialog', 600);\r
+               drag('.ui-resizable-n', -1000, -1000);\r
+               equals(heightAfter, 600, "maxHeight");\r
+       el.remove();\r
 });\r
 \r
 test("maxWidth", function() {\r
-       expect(2);\r
+       expect(3);\r
+       \r
        el = $('<div/>').dialog({ maxWidth: 400 });\r
                drag('.ui-resizable-e', 1000, 1000);\r
                equals(widthAfter, 400, "maxWidth");\r
        el.remove();\r
+       \r
        el = $('<div/>').dialog({ maxWidth: 400 });\r
                drag('.ui-resizable-w', -1000, -1000);\r
                equals(widthAfter, 400, "maxWidth");\r
        el.remove();\r
+       \r
+       el = $('<div/>').dialog({ maxWidth: 400 }).data('maxWidth.dialog', 600);\r
+               drag('.ui-resizable-w', -1000, -1000);\r
+               equals(widthAfter, 600, "maxWidth");\r
+       el.remove();\r
 });\r
 \r
 test("minHeight", function() {\r
-       expect(2);\r
+       expect(3);\r
+       \r
        el = $('<div/>').dialog({ minHeight: 10 });\r
                drag('.ui-resizable-s', -1000, -1000);\r
                equals(heightAfter, 10, "minHeight");\r
        el.remove();\r
+       \r
        el = $('<div/>').dialog({ minHeight: 10 });\r
                drag('.ui-resizable-n', 1000, 1000);\r
                equals(heightAfter, 10, "minHeight");\r
        el.remove();\r
+       \r
+       el = $('<div/>').dialog({ minHeight: 10 }).data('minHeight.dialog', 30);\r
+               drag('.ui-resizable-n', 1000, 1000);\r
+               equals(heightAfter, 30, "minHeight");\r
+       el.remove();\r
 });\r
 \r
 test("minWidth", function() {\r
-       expect(2);\r
+       expect(3);\r
+       \r
        el = $('<div/>').dialog({ minWidth: 10 });\r
                drag('.ui-resizable-e', -1000, -1000);\r
                equals(widthAfter, 10, "minWidth");\r
        el.remove();\r
+       \r
        el = $('<div/>').dialog({ minWidth: 10 });\r
                drag('.ui-resizable-w', 1000, 1000);\r
                equals(widthAfter, 10, "minWidth");\r
        el.remove();\r
+       \r
+       el = $('<div/>').dialog({ minWidth: 30 }).data('minWidth.dialog', 30);\r
+               drag('.ui-resizable-w', 1000, 1000);\r
+               equals(widthAfter, 30, "minWidth");\r
+       el.remove();\r
 });\r
 \r
 test("modal", function() {\r
@@ -359,14 +425,19 @@ test("position", function() {
 });\r
 \r
 test("resizable", function() {\r
-       expect(2);\r
+       expect(4);\r
+       \r
        el = $('<div/>').dialog();\r
                shouldresize("[default]");\r
+               el.data('resizable.dialog', false);\r
+               shouldnotresize('disabled after init');\r
        el.remove();\r
+       \r
        el = $('<div/>').dialog({ resizable: false });\r
                shouldnotresize("disabled in init options");\r
+               el.data('resizable.dialog', true);\r
+               shouldresize('enabled after init');\r
        el.remove();\r
-       \r
 });\r
 \r
 test("stack", function() {\r
@@ -374,23 +445,44 @@ test("stack", function() {
 });\r
 \r
 test("title", function() {\r
-       expect(4);\r
+       expect(5);\r
+       \r
        function titleText() {\r
                return dlg().find(".ui-dialog-title").html();\r
        }\r
-       el = $('<div/>').dialog(); equals(titleText(), "&nbsp;", "[default]"); el.remove();\r
-       el = $('<div title="foo"/>').dialog(); equals(titleText(), "foo", "title in element attribute"); el.remove();\r
-       el = $('<div/>').dialog({ title: 'foo' }); equals(titleText(), "foo", "title in init options"); el.remove();\r
-       el = $('<div title="foo"/>').dialog({ title: 'bar' }); equals(titleText(), "bar", "title in init options should override title in element attribute"); el.remove();\r
+       \r
+       el = $('<div/>').dialog();\r
+               equals(titleText(), "&nbsp;", "[default]");\r
+       el.remove();\r
+       \r
+       el = $('<div title="foo"/>').dialog();\r
+               equals(titleText(), "foo", "title in element attribute");\r
+       el.remove();\r
+       \r
+       el = $('<div/>').dialog({ title: 'foo' });\r
+               equals(titleText(), "foo", "title in init options");\r
+       el.remove();\r
+       \r
+       el = $('<div title="foo"/>').dialog({ title: 'bar' });\r
+               equals(titleText(), "bar", "title in init options should override title in element attribute");\r
+       el.remove();\r
+       \r
+       el = $('<div/>').dialog().data('title.dialog', 'foo');\r
+               equals(titleText(), 'foo', 'title after init');\r
+       el.remove();\r
 });\r
 \r
 test("width", function() {\r
-       expect(2);\r
+       expect(3);\r
+       \r
        el = $('<div/>').dialog();\r
                equals(dlg().width(), defaults.width, "default width");\r
        el.remove();\r
+       \r
        el = $('<div/>').dialog({width: 437 });\r
                equals(dlg().width(), 437, "explicit width");\r
+               el.data('width.dialog', 438);\r
+               equals(dlg().width(), 438, 'explicit width after init');\r
        el.remove();\r
 });\r
 \r
@@ -398,6 +490,7 @@ module("dialog: Methods");
 \r
 test("isOpen", function() {\r
        expect(4);\r
+       \r
        el = $('<div/>').dialog();\r
        equals(el.dialog('isOpen'), true, "dialog is open after init");\r
        el.dialog('close');\r