library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-10-05 01:44:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

made draggable tests more robust by removing hardcoded expect values

Browse Source
This commit is contained in:
Richard Worth 2008-06-06 03:58:15 +00:00
parent a18f98e547
commit 473de51ff0
1 changed files with 251 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

305
ui/tests/draggable.js
View File

@ -1,3 +1,7 @@
/*
* draggable tests
*/
var drag = function(el, dx, dy, complete) { var drag = function(el, dx, dy, complete) {
// speed = sync -> Drag syncrhonously. // speed = sync -> Drag syncrhonously.
@ -8,7 +12,6 @@ var drag = function(el, dx, dy, complete) {
}); });
}; };
module("Draggable"); module("Draggable");
test("create and destroy", function() { test("create and destroy", function() {
@ -25,39 +28,37 @@ test("create and destroy", function() {
test("No options, relative", function() { test("No options, relative", function() {
expect(4); expect(2);
var dx = 50, dy = 50;
$("#draggable1").draggable(); $("#draggable1").draggable();
var el = $("#draggable1").data("draggable").element;
var offset = $("#draggable1").data("draggable").element.offset(); var before = el.offset();
equals(offset.left, -979, "Checking initial left position"); drag("#draggable1", dx, dy);
equals(offset.top, -979, "Checking initial top position"); var after = el.offset();
drag("#draggable1", 50, 50);
var offset = $("#draggable1").data("draggable").element.offset();
equals(offset.left, -929, "Checking new left position");
equals(offset.top, -929, "Checking new top position");
equals(after.left, before.left + dx, "Checking new left position");
equals(after.top, before.top + dy, "Checking new top position");
}); });
test("No options, absolute", function() { test("No options, absolute", function() {
expect(4); expect(2);
var dx = 50, dy = 50;
$("#draggable2").draggable(); $("#draggable2").draggable();
var el = $("#draggable2").data("draggable").element;
var offset = $("#draggable2").data("draggable").element.offset(); var before = el.offset();
equals(offset.left, -979, "Checking initial left position"); drag("#draggable2", dx, dy);
equals(offset.top, -979, "Checking initial top position"); var after = el.offset();
drag("#draggable2", 50, 50);
var offset = $("#draggable2").data("draggable").element.offset();
equals(offset.left, -929, "Checking new left position");
equals(offset.top, -929, "Checking new top position");
equals(after.left, before.left + dx, "Checking new left position");
equals(after.top, before.top + dy, "Checking new top position");
}); });
@ -65,18 +66,23 @@ test("{ helper: 'clone' }", function() {
expect(4); expect(4);
var dx = 50, dy = 50;
$("#draggable1, #draggable2").draggable({ helper: "clone" }); $("#draggable1, #draggable2").draggable({ helper: "clone" });
var el1 = $("#draggable1").data("draggable").element;
var el2 = $("#draggable2").data("draggable").element;
drag("#draggable1, #draggable2", 50, 50); var before1 = el1.offset();
var before2 = el2.offset();
drag("#draggable1, #draggable2", dx, dy);
var after1 = el1.offset();
var after2 = el2.offset();
var offset = $("#draggable1").data("draggable").element.offset(); equals(after1.left, before1.left, "Relative: Original position should be untouched");
equals(offset.left, -979, "Relative: Original position should be untouched"); equals(after1.top, before1.top, "Relative: Original position should be untouched");
equals(offset.top, -979, "Relative: Original position should be untouched");
var offset = $("#draggable2").data("draggable").element.offset();
equals(offset.left, -979, "Absolute: Original position should be untouched");
equals(offset.top, -979, "Absolute: Original position should be untouched");
equals(after2.left, before2.left, "Absolute: Original position should be untouched");
equals(after2.top, before2.top, "Absolute: Original position should be untouched");
}); });
@ -84,18 +90,49 @@ test("{ grid: [50,50] }", function() {
expect(4); expect(4);
$("#draggable1, #draggable2").draggable({ grid: [50,50] }); var gx = 50, gy = 50;
var dx = gx / 2 + 1, dy = gy / 2 + 1;
drag("#draggable1, #draggable2", 30, 30); $("#draggable1, #draggable2").draggable({ grid: [gx, gy] });
var el1 = $("#draggable1").data("draggable").element;
var el2 = $("#draggable2").data("draggable").element;
var offset = $("#draggable1").data("draggable").element.offset(); var before1 = el1.offset();
equals(offset.left, -929, "Relative: 50px move in grid"); var before2 = el2.offset();
equals(offset.top, -929, "Relative: 50px move in grid"); drag("#draggable1, #draggable2", dx, dy);
var after1 = el1.offset();
var after2 = el2.offset();
var offset = $("#draggable2").data("draggable").element.offset(); equals(after1.left, before1.left + gx, "Relative: 50px move in grid");
equals(offset.left, -929, "Absolute: 50px move in grid"); equals(after1.top, before1.top + gy, "Relative: 50px move in grid");
equals(offset.top, -929, "Absolute: 50px move in grid");
equals(after2.left, before2.left + gx, "Absolute: 50px move in grid");
equals(after2.top, before2.top + gy, "Absolute: 50px move in grid");
});
test("{ grid: [50,50] }", function() {
expect(4);
var gx = 50, gy = 50;
var dx = gx / 2 - 1, dy = gy / 2 - 1;
$("#draggable1, #draggable2").draggable({ grid: [gx, gy] });
var el1 = $("#draggable1").data("draggable").element;
var el2 = $("#draggable2").data("draggable").element;
var before1 = el1.offset();
var before2 = el2.offset();
drag("#draggable1, #draggable2", dx, dy);
var after1 = el1.offset();
var after2 = el2.offset();
equals(after1.left, before1.left, "Relative: 50px move in grid");
equals(after1.top, before1.top, "Relative: 50px move in grid");
equals(after2.left, before2.left, "Absolute: 50px move in grid");
equals(after2.top, before2.top, "Absolute: 50px move in grid");
}); });
@ -103,18 +140,23 @@ test("{ axis: 'y' }", function() {
expect(4); expect(4);
var dx = 50, dy = 50;
$("#draggable1, #draggable2").draggable({ axis: "y" }); $("#draggable1, #draggable2").draggable({ axis: "y" });
var el1 = $("#draggable1").data("draggable").element;
var el2 = $("#draggable2").data("draggable").element;
drag("#draggable1, #draggable2", 50, 50); var before1 = el1.offset();
var before2 = el2.offset();
drag("#draggable1, #draggable2", dx, dy);
var after1 = el1.offset();
var after2 = el2.offset();
var offset = $("#draggable1").data("draggable").element.offset(); equals(after1.left, before1.left, "Relative: 0px move");
equals(offset.left, -979, "Relative: 0px move"); equals(after1.top, before1.top + dy, "Relative: 50px move");
equals(offset.top, -929, "Relative: 50px move");
var offset = $("#draggable2").data("draggable").element.offset();
equals(offset.left, -979, "Absolute: 0px move");
equals(offset.top, -929, "Absolute: 50px move");
equals(after2.left, before2.left, "Absolute: 0px move");
equals(after2.top, before2.top + dy, "Absolute: 50px move");
}); });
@ -122,33 +164,48 @@ test("{ axis: 'x' }", function() {
expect(4); expect(4);
var dx = 50, dy = 50;
$("#draggable1, #draggable2").draggable({ axis: "x" }); $("#draggable1, #draggable2").draggable({ axis: "x" });
var el1 = $("#draggable1").data("draggable").element;
var el2 = $("#draggable2").data("draggable").element;
drag("#draggable1, #draggable2", 50, 50); var before1 = el1.offset();
var before2 = el2.offset();
drag("#draggable1, #draggable2", dx, dy);
var after1 = el1.offset();
var after2 = el2.offset();
var offset = $("#draggable1").data("draggable").element.offset(); equals(after1.left, before1.left + dx, "Relative: 0px move");
equals(offset.left, -929, "Relative: 50px move"); equals(after1.top, before1.top, "Relative: 50px move");
equals(offset.top, -979, "Relative: 0px move");
var offset = $("#draggable2").data("draggable").element.offset();
equals(offset.left, -929, "Absolute: 50px move");
equals(offset.top, -979, "Absolute: 0px move");
equals(after2.left, before2.left + dy, "Absolute: 0px move");
equals(after2.top, before2.top, "Absolute: 50px move");
}); });
test("{ cancel: 'span' }", function() { test("{ cancel: 'span' }", function() {
expect(2); expect(4);
var dx = 50, dy = 50;
$("#draggable2").draggable({ cancel: 'span' }); $("#draggable2").draggable({ cancel: 'span' });
var el = $("#draggable2").data("draggable").element;
drag("#draggable2 span", 50, 50); var before = el.offset();
drag("#draggable2 span", dx, dy);
var after = el.offset();
var offset = $("#draggable2").data("draggable").element.offset(); equals(after.left, before.left, "Trigger on span: 0px move");
equals(offset.left, -979, "Trigger on span: 0px move"); equals(after.top, before.top, "Trigger on span: 0px move");
equals(offset.top, -979, "Trigger on span: 0px move");
var before = el.offset();
drag("#draggable2", dx, dy);
var after = el.offset();
equals(after.left, before.left + dx, "Trigger on element: 50px move");
equals(after.top, before.top + dy, "Trigger on element: 50px move");
}); });
@ -156,39 +213,55 @@ test("{ handle: 'span' }", function() {
expect(4); expect(4);
var dx = 50, dy = 50;
$("#draggable2").draggable({ handle: 'span' }); $("#draggable2").draggable({ handle: 'span' });
var el = $("#draggable2").data("draggable").element;
drag("#draggable2 span", 50, 50); var before = el.offset();
drag("#draggable2 span", dx, dy);
var after = el.offset();
var offset = $("#draggable2").data("draggable").element.offset(); equals(after.left, before.left + dx, "Trigger on span: 50px move");
equals(offset.left, -929, "Trigger on span: 50px move"); equals(after.top, before.top + dy, "Trigger on span: 50px move");
equals(offset.top, -929, "Trigger on span: 50px move");
drag("#draggable2", 50, 50); var before = el.offset();
drag("#draggable2", dx, dy);
var offset = $("#draggable2").data("draggable").element.offset(); var after = el.offset();
equals(offset.left, -929, "Trigger on element: 0px move");
equals(offset.top, -929, "Trigger on element: 0px move");
equals(after.left, before.left, "Trigger on element: 0px move");
equals(after.top, before.top, "Trigger on element: 0px move");
}); });
test("{ containment: 'parent' }", function() { test("{ containment: 'parent' }", function() {
function border(el, side) { return parseInt(el.css('border-' + side + '-width')); }
expect(4); expect(4);
$("#draggable2, #draggable1").draggable({ containment: 'parent' }); var dx = -100, dy = -100;
drag("#draggable2, #draggable1", -100, -100); $("#draggable1, #draggable2").draggable({ containment: 'parent' });
var el1 = $("#draggable1").data("draggable").element;
var el2 = $("#draggable2").data("draggable").element;
var offset = $("#draggable2").data("draggable").element.offset(); var before1 = el1.offset();
equals(offset.left, -989, "Absolute: 10px move (to parent's margin end)"); var before2 = el2.offset();
equals(offset.top, -989, "Absolute: 10px move (to parent's margin end)"); drag("#draggable1, #draggable2", dx, dy);
var after1 = el1.offset();
var after2 = el2.offset();
var offset = $("#draggable1").data("draggable").element.offset(); var p1 = $("#draggable1").parent(), po1 = p1.offset();
equals(offset.left, -989, "Relative: 10px move (to parent's margin end)"); var p2 = $("#draggable2").parent(), po2 = p2.offset();
equals(offset.top, -989, "Relative: 10px move (to parent's margin end)"); var b1 = { left: border(p1, 'left'), top: border(p1, 'top') };
var b2 = { left: border(p2, 'left'), top: border(p2, 'top') };
equals(after1.left, po1.left + b1.left, "Absolute: " + (before1.left - po1.left + b1.left) + "px move (to parent's margin end)");
equals(after1.top, po1.top + b1.top, "Absolute: " + (before1.top - po1.top + b1.top) + "px move (to parent's margin end)");
equals(after2.left, po2.left + b2.left, "Relative: " + (before2.left - po2.left + b2.left) + "move (to parent's margin end)");
equals(after2.top, po2.top + b2.top, "Relative: " + (before2.top - po2.top + b2.top) + "px move (to parent's margin end)");
}); });
@ -196,58 +269,83 @@ test("{ cursorAt: { left: -5, top: -5 } }", function() {
expect(4); expect(4);
var position = null; var dx = -1, dy = -1;
var ox = 5, oy = 5;
var cax = -5, cay = -5;
var actual = null;
$("#draggable2").draggable({ $("#draggable2").draggable({
cursorAt: { left: -5, top: -5 }, cursorAt: { left: cax, top: cay },
drag: function(e, ui) { drag: function(e, ui) {
position = ui.absolutePosition; actual = ui.absolutePosition;
} }
}); });
var el = $("#draggable2").data("draggable").element;
drag("#draggable2", -1, -1); var before = el.offset();
var pos = { clientX: before.left + ox, clientY: before.top + oy };
$("#draggable2").simulate("mousedown", pos);
pos = { clientX: pos.clientX + dx, clientY: pos.clienY + dy };
$(document).simulate("mousedown", pos);
$(document).simulate("mousedown", pos);
$("#draggable2").simulate("mouseup", pos);
var expected = { left: before.left + ox - cax, top: before.top + oy - cay };
equals(position.left, -875, "Absolute: -1px move"); equals(actual.left, expected.left, "Absolute: -1px left");
equals(position.top, -925, "Absolute: -1px move"); equals(actual.top, expected.top, "Absolute: -1px top");
var position = null; var actual = null;
$("#draggable1").draggable({ $("#draggable1").draggable({
cursorAt: { left: -5, top: -5 }, cursorAt: { left: cax, top: cay },
drag: function(e, ui) { drag: function(e, ui) {
position = ui.absolutePosition; actual = ui.absolutePosition;
} }
}); });
var el = $("#draggable2").data("draggable").element;
drag("#draggable1", -1, -1); var before = el.offset();
var pos = { clientX: before.left + ox, clientY: before.top + oy };
$("#draggable2").simulate("mousedown", pos);
pos = { clientX: pos.clientX + dx, clientY: pos.clienY + dy };
$(document).simulate("mousedown", pos);
$(document).simulate("mousedown", pos);
$("#draggable2").simulate("mouseup", pos);
var expected = { left: before.left + ox - cax, top: before.top + oy - cay };
equals(position.left, -875, "Relative: -1px move"); equals(actual.left, expected.left, "Relative: -1px left");
equals(position.top, -925, "Relative: -1px move"); equals(actual.top, expected.top, "Relative: -1px top");
}); });
test("{ cursor: 'move' }", function() { test("{ cursor: 'move' }", function() {
function getCursor() { return $("body").css("cursor"); }
expect(2); expect(2);
var cursor = null; var expected = "move", actual, before, after;
$("#draggable2").draggable({ $("#draggable2").draggable({
cursor: "move", cursor: expected,
start: function(e, ui) { start: function(e, ui) {
cursor = $("body").css("cursor"); actual = getCursor();
} }
}); });
before = getCursor();
drag("#draggable2", -1, -1); drag("#draggable2", -1, -1);
after = getCursor();
equals(cursor, "move", "start callback: cursor 'move'"); equals(actual, expected, "start callback: cursor '" + expected + "'");
equals($("body").css("cursor"), "auto", "after drag: cursor restored"); equals(after, before, "after drag: cursor restored");
}); });
test("{ distance: 10 }", function() { test("{ distance: 10 }", function() {
expect(2); expect(3);
var dragged = false; var dragged;
$("#draggable2").draggable({ $("#draggable2").draggable({
distance: 10, distance: 10,
start: function(e, ui) { start: function(e, ui) {
@ -255,12 +353,18 @@ test("{ distance: 10 }", function() {
} }
}); });
dragged = false;
drag("#draggable2", -9, -9); drag("#draggable2", -9, -9);
equals(dragged, false, "The draggable should not have moved when moving -9px"); equals(dragged, false, "The draggable should not have moved when moving -9px");
dragged = false;
drag("#draggable2", -10, -10); drag("#draggable2", -10, -10);
equals(dragged, true, "The draggable should have moved when moving -10px"); equals(dragged, true, "The draggable should have moved when moving -10px");
dragged = false;
drag("#draggable2", 9, 9);
equals(dragged, false, "The draggable should not have moved when moving 9px");
}); });
test("{ opacity: 0.5 }", function() { test("{ opacity: 0.5 }", function() {
@ -277,7 +381,7 @@ test("{ opacity: 0.5 }", function() {
drag("#draggable2", -1, -1); drag("#draggable2", -1, -1);
equals(opacity, 0.5, "start callback: opacity is 0.5"); equals(opacity, 0.5, "start callback: opacity is");
}); });
@ -285,17 +389,19 @@ test("{ zIndex: 10 }", function() {
expect(1); expect(1);
var expected = 10, actual;
var zIndex = null; var zIndex = null;
$("#draggable2").draggable({ $("#draggable2").draggable({
zIndex: 10, zIndex: expected,
start: function(e, ui) { start: function(e, ui) {
zIndex = $(this).css("zIndex"); actual = $(this).css("zIndex");
} }
}); });
drag("#draggable2", -1, -1); drag("#draggable2", -1, -1);
equals(zIndex, "10", "start callback: zIndex is 10"); equals(actual, expected, "start callback: zIndex is");
}); });
@ -317,6 +423,3 @@ test("callbacks occurance count", function() {
equals(stop, 1, "stop callback should happen exactly once"); equals(stop, 1, "stop callback should happen exactly once");
}); });