Skip to content

Commit

Permalink
Tests: extract TestHelpers.forceScrollableWindow for tests that need …
Browse files Browse the repository at this point in the history
…the window to scroll
  • Loading branch information
mikesherov committed Oct 19, 2013
1 parent 52307eb commit 67fd40e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 20 deletions.
22 changes: 7 additions & 15 deletions tests/unit/draggable/draggable_core.js
Expand Up @@ -118,14 +118,11 @@ test( "#6258: not following mouse when scrolled and using overflow-y: scroll", f
.scrollLeft( 0 );
}
}),
contentToForceScroll = $( "<div>" ).css({
height: "10000px",
width: "10000px"
}),
oldOverflowY = $( "html" ).css( "overflow-y" ),
oldOverflowX = $( "html" ).css( "overflow-x" );

contentToForceScroll.appendTo( "#qunit-fixture" );
TestHelpers.forceScrollableWindow();

$( "html" )
.css( "overflow-y", "scroll" )
.css( "overflow-x", "scroll" )
Expand All @@ -148,13 +145,10 @@ test( "#9315: Draggable: jumps down with offset of scrollbar", function() {
equal( ui.position.top, 11, "top position is correct when position is absolute" );
$( "html" ).scrollTop( 0 ).scrollLeft( 0 );
}
}),
contentToForceScroll = $( "<div>" ).css({
height: "10000px",
width: "10000px"
});

contentToForceScroll.appendTo( "#qunit-fixture" );
TestHelpers.forceScrollableWindow();

$( "html" ).scrollTop( 300 ).scrollLeft( 300 );

element.simulate( "drag", {
Expand All @@ -178,13 +172,11 @@ test( "#5009: scroll not working with parent's position fixed", function() {
equal( ui.position.top, 10, "top position is correct when parent position is fixed" );
$( document ).scrollTop( 0 ).scrollLeft( 0 );
}
}),
contentToForceScroll = $( "<div>" ).css({
height: "20000px",
width: "20000px"
});

$( "#qunit-fixture" ).append( contentToForceScroll );

TestHelpers.forceScrollableWindow();

$( "#wrapper" ).css( "position", "fixed" );

element.simulate( "drag", {
Expand Down
6 changes: 1 addition & 5 deletions tests/unit/selectable/selectable_events.js
Expand Up @@ -40,12 +40,8 @@ test( "mousedown: initial position of helper", function() {

var helperOffset,
element = $( "#selectable1" ).selectable(),
contentToForceScroll = $( "<div>" ).css({
height: "10000px",
width: "10000px"
});
contentToForceScroll = TestHelpers.forceScrollableWindow( "body" );

contentToForceScroll.appendTo( "body" );
$( window ).scrollTop( 100 ).scrollLeft( 100 );

element.simulate( "mousedown", {
Expand Down
7 changes: 7 additions & 0 deletions tests/unit/testsuite.js
Expand Up @@ -191,6 +191,13 @@ TestHelpers.onFocus= function( element, onFocus ) {
element.bind( "focus", fn )[ 0 ].focus();
};

TestHelpers.forceScrollableWindow = function( appendTo ) {
return $( "<div>" ).css({
height: "10000px",
width: "10000px"
}).appendTo( appendTo || "#qunit-fixture" );
};

/*
* Taken from https://github.com/jquery/qunit/tree/master/addons/close-enough
*/
Expand Down

0 comments on commit 67fd40e

Please sign in to comment.