diff options
| author | Mike Sherov <mike.sherov@gmail.com> | 2013-10-31 21:41:45 -0400 |
|---|---|---|
| committer | Mike Sherov <mike.sherov@gmail.com> | 2013-10-31 21:41:45 -0400 |
| commit | 1f724adb15f5f56802e74dbb838738371f8ae351 (patch) | |
| tree | e8dd65132b073d67247ce19a2e1488e43a613bb1 | |
| parent | ffab89e9bee97cf7cc74249b6e4ce9dd798013c9 (diff) | |
| download | jquery-ui-1f724adb15f5f56802e74dbb838738371f8ae351.tar.gz jquery-ui-1f724adb15f5f56802e74dbb838738371f8ae351.zip | |
Draggable Tests: don't test auto scroll while testing helpers.
| -rw-r--r-- | tests/unit/draggable/draggable_options.js | 9 | ||||
| -rw-r--r-- | tests/unit/draggable/draggable_test_helpers.js | 10 |
2 files changed, 7 insertions, 12 deletions
diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js index 8c4685fa8..ea52eb299 100644 --- a/tests/unit/draggable/draggable_options.js +++ b/tests/unit/draggable/draggable_options.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" ) { diff --git a/tests/unit/draggable/draggable_test_helpers.js b/tests/unit/draggable/draggable_test_helpers.js index 928e87f26..0b533a4e1 100644 --- a/tests/unit/draggable/draggable_test_helpers.js +++ b/tests/unit/draggable/draggable_test_helpers.js @@ -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 ) { |