diff options
Diffstat (limited to 'tests/unit/dialog/dialog_test_helpers.js')
-rw-r--r-- | tests/unit/dialog/dialog_test_helpers.js | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/unit/dialog/dialog_test_helpers.js b/tests/unit/dialog/dialog_test_helpers.js index ef0b9b6fa..4ecaf0c0f 100644 --- a/tests/unit/dialog/dialog_test_helpers.js +++ b/tests/unit/dialog/dialog_test_helpers.js @@ -1,6 +1,6 @@ TestHelpers.dialog = { drag: function(el, handle, dx, dy) { - var d = el.dialog('widget'); + var d = el.dialog("widget"); //this mouseover is to work around a limitation in resizable //TODO: fix resizable so handle doesn't require mouseover in order to be used $( handle, d ).simulate("mouseover").simulate( "drag", { @@ -9,8 +9,8 @@ TestHelpers.dialog = { }); }, testDrag: function(el, dx, dy, expectedDX, expectedDY, msg) { - var actual, expected, offsetAfter, - d = el.dialog('widget'), + var actualDX, actualDY, offsetAfter, + d = el.dialog("widget"), handle = $(".ui-dialog-titlebar", d), offsetBefore = d.offset(); @@ -20,13 +20,13 @@ TestHelpers.dialog = { msg = msg ? msg + "." : ""; - actual = { left: Math.round(offsetAfter.left), top: Math.round(offsetAfter.top) }, - expected = { left: Math.round(offsetBefore.left + expectedDX), top: Math.round(offsetBefore.top + expectedDY) }; - deepEqual(actual, expected, 'dragged[' + expectedDX + ', ' + expectedDY + '] ' + msg); + actualDX = offsetAfter.left - offsetBefore.left; + actualDY = offsetAfter.top - offsetBefore.top; + ok( expectedDX - actualDX <= 1 && expectedDY - actualDY <= 1, "dragged[" + expectedDX + ", " + expectedDY + "] " + msg); }, shouldResize: function(el, dw, dh, msg) { var heightAfter, widthAfter, actual, expected, - d = el.dialog('widget'), + d = el.dialog("widget"), handle = $(".ui-resizable-se", d), heightBefore = d.height(), widthBefore = d.width(); @@ -39,6 +39,6 @@ TestHelpers.dialog = { msg = msg ? msg + "." : ""; actual = { width: widthAfter, height: heightAfter }, expected = { width: widthBefore + dw, height: heightBefore + dh }; - deepEqual(actual, expected, 'resized[' + 50 + ', ' + 50 + '] ' + msg); + deepEqual(actual, expected, "resized[" + 50 + ", " + 50 + "] " + msg); } };
\ No newline at end of file |