Draggable Tests: Fix IE8 test when native scroll happens

diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js
index 99fd608bfc61328108d9080a7cfa49eba9fb6c4c..f59a33693d2b2f556754f4562f2d274667cf14c1 100644 (file)
--- a/tests/unit/draggable/draggable_options.js
+++ b/tests/unit/draggable/draggable_options.js
@@ -881,15 +881,34 @@ test( "scroll, scrollSensitivity, and scrollSpeed", function() {
 test( "scroll ignores containers that are overflow: hidden", function() {
        expect( 2 );
 
-       var element = $( "#draggable1" ).draggable({ scroll: true }).appendTo( "#scrollParent" );
+       var scrollParent = $( "#scrollParent" ),
+               element = $( "#draggable1" ).draggable().appendTo( scrollParent );
+
+       element.draggable( "option", "scroll", false );
+
+       element.simulate( "drag", {
+               dx: 1300,
+               dy: 1300
+       });
+
+       // IE8 natively scrolls when dragging an element inside a overflow:hidden
+       // container, so skip this test if native scroll occurs.
+       // Support: IE <9
+       if ( scrollParent.scrollTop() > 0 ) {
+               ok( true, "overflow:hidden container natively scrolls" );
+               ok( true, "overflow:hidden container natively scrolls" );
+               return;
+       }
+
+       element.css({ top: 0, left: 0 }).draggable( "option", "scroll", true );
 
        element.simulate( "drag", {
                dx: 1300,
                dy: 1300
        });
 
-       equal( $( "#scrollParent" ).scrollTop(), 0, "container doesn't scroll vertically" );
-       equal( $( "#scrollParent" ).scrollLeft(), 0, "container doesn't scroll horizontally" );
+       equal( scrollParent.scrollTop(), 0, "container doesn't scroll vertically" );
+       equal( scrollParent.scrollLeft(), 0, "container doesn't scroll horizontally" );
 });
 
 test( "#6817: auto scroll goes double distance when dragging", function() {