Skip to content
Permalink
Browse files

Dev: Fix test failures in oldIE. Fixed #8748 - Dev: Get draggable tes…

…t suite to pass
  • Loading branch information...
mikesherov authored and scottgonzalez committed Oct 31, 2012
1 parent d85b016 commit d771048a566abb218d3f4968132376b5f33a8aef
Showing with 13 additions and 10 deletions.
  1. +5 −2 tests/unit/draggable/draggable_core.js
  2. +8 −8 tests/unit/draggable/draggable_options.js
@@ -4,6 +4,9 @@

TestHelpers.draggable = {};

// todo: remove these hacks
TestHelpers.draggable.unreliableOffset = $.ui.ie && ( !document.documentMode || document.documentMode < 8 ) ? 2 : 0;

TestHelpers.draggable.drag = function(handle, dx, dy) {
$(handle).simulate("drag", {
dx: dx || 0,
@@ -57,10 +60,10 @@ TestHelpers.draggable.setScroll = function( what ) {
};

TestHelpers.draggable.border = function(el, side) {
return parseInt(el.css('border-' + side + '-width'), 10);
return parseInt(el.css('border-' + side + '-width'), 10) || 0;
};
TestHelpers.draggable.margin = function(el, side) {
return parseInt(el.css('margin-' + side), 10);
return parseInt(el.css('margin-' + side), 10) || 0;
};

(function($) {
@@ -281,8 +281,8 @@ test("{ cursorAt: { left: -5, top: -5 } }", function() {
clientY: before.top + offsetY
};
expected = {
left: before.left + offsetX - cursorAtX + deltaX,
top: before.top + offsetY - cursorAtY + deltaY
left: before.left + offsetX - cursorAtX + deltaX - TestHelpers.draggable.unreliableOffset,
top: before.top + offsetY - cursorAtY + deltaY - TestHelpers.draggable.unreliableOffset
};

el.simulate("mousedown", pos);
@@ -315,8 +315,8 @@ test("{ cursorAt: { right: 10, bottom: 20 } }", function() {
clientY: before.top + offsetY
};
expected = {
left: before.left + offsetX - el.width() + cursorAtX + deltaX,
top: before.top + offsetY - el.height() + cursorAtY + deltaY
left: before.left + offsetX - el.width() + cursorAtX + deltaX - TestHelpers.draggable.unreliableOffset,
top: before.top + offsetY - el.height() + cursorAtY + deltaY - TestHelpers.draggable.unreliableOffset
};

el.simulate("mousedown", pos);
@@ -349,8 +349,8 @@ test("{ cursorAt: [10, 20] }", function() {
clientY: before.top + offsetY
};
expected = {
left: before.left + offsetX - cursorAtX + deltaX,
top: before.top + offsetY - cursorAtY + deltaY
left: before.left + offsetX - cursorAtX + deltaX - TestHelpers.draggable.unreliableOffset,
top: before.top + offsetY - cursorAtY + deltaY - TestHelpers.draggable.unreliableOffset
};

el.simulate("mousedown", pos);
@@ -383,8 +383,8 @@ test("{ cursorAt: '20, 40' }", function() {
clientY: before.top + offsetY
};
expected = {
left: before.left + offsetX - cursorAtX + deltaX,
top: before.top + offsetY - cursorAtY + deltaY
left: before.left + offsetX - cursorAtX + deltaX - TestHelpers.draggable.unreliableOffset,
top: before.top + offsetY - cursorAtY + deltaY - TestHelpers.draggable.unreliableOffset
};

el.simulate("mousedown", pos);

0 comments on commit d771048

Please sign in to comment.
You can’t perform that action at this time.