Skip to content
Permalink
Browse files

Draggable Tests: don't test auto scroll while testing helpers.

  • Loading branch information
mikesherov committed Nov 1, 2013
1 parent ffab89e commit 1f724adb15f5f56802e74dbb838738371f8ae351
Showing with 7 additions and 12 deletions.
  1. +5 −4 tests/unit/draggable/draggable_options.js
  2. +2 −8 tests/unit/draggable/draggable_test_helpers.js
@@ -676,19 +676,20 @@ test( "helper, default, switching after initialization", function() {
"parent and root": [ "#main", document ],
"grandparent": [ "#scrollParent" ]
},
positions = [ "absolute", "fixed", "relative" ],
positions = [ "absolute", "fixed", "relative", "static" ],
helpers = [ "original", "clone" ],
scrollPositions = [ "relative", "static", "absolute" ];
scrollPositions = [ "relative", "static", "absolute", "fixed" ];

for ( m = 0 ; m < helpers.length; m++ ) {
for ( l = 0; l < positions.length; l++ ) {
for ( k in scrollElements ) {
(function( position, helper, scrollElements, scrollElementsTitle ){
test( "{ helper: '" + helper + "' }, " + position + ", with scroll offset on " + scrollElementsTitle, function() {
expect( 6 );
expect( 8 );
var i, j,
element = $( "#draggable1" ).css({ position: position, top: 0, left: 0 }).draggable({
helper: helper
helper: helper,
scroll: false
});

if ( scrollElements.length === 1 && scrollElements[ 1 ] === "#scrollParent" ) {
@@ -30,10 +30,7 @@ TestHelpers.draggable = {

$( handle ).simulate( "drag", {
dx: dx,
dy: dy,
// moves is 1 here because simulate currently fire events synchronously
// so we can't faithfully test things that rely on a scroll event (which is async)
moves: 1
dy: dy
});
},
shouldMovePositionButNotOffset: function( el, msg, handle ) {
@@ -43,10 +40,7 @@ TestHelpers.draggable = {

$( handle ).simulate( "drag", {
dx: 100,
dy: 100,
// moves is 1 here because simulate currently fire events synchronously
// so we can't faithfully test things that rely on a scroll event (which is async)
moves: 1
dy: 100
});
},
shouldMove: function( el, msg, handle ) {

0 comments on commit 1f724ad

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