library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Dialog Tests: Fix test fails due to window measurements in FF and IE7

Browse Source
This commit is contained in:
Mike Sherov 2012-12-22 15:46:57 -05:00
parent 48d7d53f7b
commit 6d88d264be
3 changed files with 78 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tests/unit/dialog/dialog_deprecated.js
View File

@ -1,26 +1,36 @@
module("dialog (deprecated): position option with string and array"); module("dialog (deprecated): position option with string and array");
if ( !$.ui.ie ) { test( "position, right bottom on window w/array", function() {
test("position, right bottom on window w/array", function() {
expect( 2 ); expect( 2 );
var el = $('<div></div>').dialog({ position: ["right", "bottom"] }),
dialog = el.dialog('widget'),
offset = dialog.offset();
closeEnough(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft(), 1);
closeEnough(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop(), 1);
el.remove();
});
test("position, right bottom on window", function() { // dialogs alter the window width and height in FF and IE7
expect( 2 ); // so we collect that information before creating the dialog
var el = $('<div></div>').dialog({ position: "right bottom" }), // Support: FF, IE7
dialog = el.dialog('widget'), var winWidth = $( window ).width(),
winHeight = $( window ).height(),
el = $("<div></div>").dialog({ position: [ "right", "bottom" ] }),
dialog = el.dialog("widget"),
offset = dialog.offset(); offset = dialog.offset();
closeEnough(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft(), 1); closeEnough( offset.left, winWidth - dialog.outerWidth() + $( window ).scrollLeft(), 1, "offset left of right bottom on window w/array" );
closeEnough(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop(), 1); closeEnough( offset.top, winHeight - dialog.outerHeight() + $( window ).scrollTop(), 1, "offset top of right bottom on window w/array" );
el.remove(); el.remove();
}); });
}
test( "position, right bottom on window", function() {
expect( 2 );
// dialogs alter the window width and height in FF and IE7
// so we collect that information before creating the dialog
// Support: FF, IE7
var winWidth = $( window ).width(),
winHeight = $( window ).height(),
el = $("<div></div>").dialog({ position: "right bottom" }),
dialog = el.dialog("widget"),
offset = dialog.offset();
closeEnough( offset.left, winWidth - dialog.outerWidth() + $( window ).scrollLeft(), 1, "offset left of right bottom on window" );
closeEnough( offset.top, winHeight - dialog.outerHeight() + $( window ).scrollTop(), 1, "offset top of right bottom on window" );
el.remove();
});
test("position, offset from top left w/array", function() { test("position, offset from top left w/array", function() {
expect( 2 ); expect( 2 );

61
tests/unit/dialog/dialog_options.js
View File

@ -338,36 +338,45 @@ test("minWidth", function() {
el.remove(); el.remove();
}); });
test("position, default center on window", function() { test( "position, default center on window", function() {
expect( 2 ); expect( 2 );
var el = $('<div></div>').dialog(),
dialog = el.dialog('widget'), // dialogs alter the window width and height in FF and IE7
// so we collect that information before creating the dialog
// Support: FF, IE7
var winWidth = $( window ).width(),
winHeight = $( window ).height(),
el = $("<div></div>").dialog(),
dialog = el.dialog("widget"),
offset = dialog.offset(); offset = dialog.offset();
closeEnough(offset.left, Math.round($(window).width() / 2 - dialog.outerWidth() / 2) + $(window).scrollLeft(), 1); closeEnough( offset.left, Math.round( winWidth / 2 - dialog.outerWidth() / 2 ) + $( window ).scrollLeft(), 1, "dialog left position of center on window on initilization" );
closeEnough(offset.top, Math.round($(window).height() / 2 - dialog.outerHeight() / 2) + $(window).scrollTop(), 1); closeEnough( offset.top, Math.round( winHeight / 2 - dialog.outerHeight() / 2 ) + $( window ).scrollTop(), 1, "dialog top position of center on window on initilization" );
el.remove(); el.remove();
}); });
// todo: figure out these fails in IE7 test( "position, right bottom at right bottom via ui.position args", function() {
if ( !$.ui.ie ) {
test("position, right bottom at right bottom via ui.position args", function() {
expect( 2 ); expect( 2 );
var el = $('<div></div>').dialog({
// dialogs alter the window width and height in FF and IE7
// so we collect that information before creating the dialog
// Support: FF, IE7
var winWidth = $( window ).width(),
winHeight = $( window ).height(),
el = $("<div></div>").dialog({
position: { position: {
my: "right bottom", my: "right bottom",
at: "right bottom" at: "right bottom"
} }
}), }),
dialog = el.dialog('widget'), dialog = el.dialog("widget"),
offset = dialog.offset(); offset = dialog.offset();
closeEnough(offset.left, $(window).width() - dialog.outerWidth() + $(window).scrollLeft(), 1); closeEnough( offset.left, winWidth - dialog.outerWidth() + $( window ).scrollLeft(), 1, "dialog left position of right bottom at right bottom on initilization" );
closeEnough(offset.top, $(window).height() - dialog.outerHeight() + $(window).scrollTop(), 1); closeEnough( offset.top, winHeight - dialog.outerHeight() + $( window ).scrollTop(), 1, "dialog top position of right bottom at right bottom on initilization" );
el.remove(); el.remove();
}); });
}
test("position, at another element", function() { test( "position, at another element", function() {
expect( 4 ); expect( 4 );
var parent = $('<div></div>').css({ var parent = $('<div></div>').css({
position: 'absolute', position: 'absolute',
@ -375,32 +384,34 @@ test("position, at another element", function() {
left: 600, left: 600,
height: 10, height: 10,
width: 10 width: 10
}).appendTo('body'), }).appendTo("body"),
el = $('<div></div>').dialog({ el = $("<div></div>").dialog({
position: { position: {
my: "left top", my: "left top",
at: "left top", at: "left top",
of: parent of: parent,
collision: "none"
} }
}), }),
dialog = el.dialog('widget'), dialog = el.dialog("widget"),
offset = dialog.offset(); offset = dialog.offset();
deepEqual(offset.left, 600); closeEnough( offset.left, 600, 1, "dialog left position at another element on initilization" );
deepEqual(offset.top, 400); closeEnough( offset.top, 400, 1, "dialog top position at another element on initilization" );
el.dialog('option', 'position', { el.dialog("option", "position", {
my: "left top", my: "left top",
at: "right bottom", at: "right bottom",
of: parent of: parent,
collision: "none"
}); });
offset = dialog.offset(); offset = dialog.offset();
deepEqual(offset.left, 610); closeEnough( offset.left, 610, 1, "dialog left position at another element via setting option" );
deepEqual(offset.top, 410); closeEnough( offset.top, 410, 1, "dialog top position at another element via setting option" );
el.remove(); el.remove();
parent.remove(); parent.remove();

8
tests/unit/dialog/dialog_test_helpers.js
View File

@ -9,7 +9,7 @@ TestHelpers.dialog = {
}); });
}, },
testDrag: function(el, dx, dy, expectedDX, expectedDY, msg) { testDrag: function(el, dx, dy, expectedDX, expectedDY, msg) {
var actual, expected, offsetAfter, var actualDX, actualDY, offsetAfter,
d = el.dialog('widget'), d = el.dialog('widget'),
handle = $(".ui-dialog-titlebar", d), handle = $(".ui-dialog-titlebar", d),
offsetBefore = d.offset(); offsetBefore = d.offset();
@ -20,9 +20,9 @@ TestHelpers.dialog = {
msg = msg ? msg + "." : ""; msg = msg ? msg + "." : "";
actual = { left: Math.round(offsetAfter.left), top: Math.round(offsetAfter.top) }, actualDX = offsetAfter.left - offsetBefore.left;
expected = { left: Math.round(offsetBefore.left + expectedDX), top: Math.round(offsetBefore.top + expectedDY) }; actualDY = offsetAfter.top - offsetBefore.top;
deepEqual(actual, expected, 'dragged[' + expectedDX + ', ' + expectedDY + '] ' + msg); ok( expectedDX - actualDX <= 1 && expectedDY - actualDY <= 1, 'dragged[' + expectedDX + ', ' + expectedDY + '] ' + msg);
}, },
shouldResize: function(el, dw, dh, msg) { shouldResize: function(el, dw, dh, msg) {
var heightAfter, widthAfter, actual, expected, var heightAfter, widthAfter, actual, expected,