From dc1e63b4324e55fd0d120ec250a5f32f647dffdd Mon Sep 17 00:00:00 2001 From: Mike Sherov Date: Mon, 17 Feb 2014 22:10:29 -0500 Subject: [PATCH] Draggable Tests: fix IE scroll tests affected by focus issues. Calling element.focus() causes scroll in IE. In order to correctly test scroll behavior, we must calculate scrollTop on the drag event, before .focus is called. --- tests/unit/draggable/draggable_options.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js index eba6c4731..4cebe4dfb 100644 --- a/tests/unit/draggable/draggable_options.js +++ b/tests/unit/draggable/draggable_options.js @@ -835,7 +835,8 @@ test( "scroll, scrollSensitivity, and scrollSpeed", function() { TestHelpers.draggable.setScrollable( "#main", false ); - var viewportHeight = $( window ).height(), + var currentScrollTop, + viewportHeight = $( window ).height(), element = $( "#draggable1" ).draggable({ scroll: true }).appendTo( "#qunit-fixture" ), scrollSensitivity = element.draggable( "option", "scrollSensitivity" ), scrollSpeed = element.draggable( "option", "scrollSpeed" ); @@ -845,14 +846,16 @@ test( "scroll, scrollSensitivity, and scrollSpeed", function() { left: 1 }); + $( element ).one( "drag", function() { + equal( $( window ).scrollTop(), 0, "scroll: true doesn't scroll when the element is dragged outside of scrollSensitivity" ); + }); + element.simulate( "drag", { dx: 1, y: viewportHeight - scrollSensitivity - 1, moves: 1 }); - ok( $( window ).scrollTop() === 0, "scroll: true doesn't scroll when the element is dragged outside of scrollSensitivity" ); - element.draggable( "option", "scrollSensitivity", scrollSensitivity + 10 ); element.offset({ @@ -860,14 +863,18 @@ test( "scroll, scrollSensitivity, and scrollSpeed", function() { left: 1 }); + currentScrollTop = $( window ).scrollTop(); + + $( element ).one( "drag", function() { + ok( $( window ).scrollTop() - currentScrollTop, scrollSpeed, "scroll: true scrolls when the element is dragged within scrollSensitivity" ); + }); + element.simulate( "drag", { dx: 1, y: viewportHeight - scrollSensitivity - 1, moves: 1 }); - ok( $( window ).scrollTop() === scrollSpeed, "scroll: true scrolls when the element is dragged within scrollSensitivity" ); - TestHelpers.draggable.restoreScroll( document ); }); -- 2.39.5