Skip to content

Commit 0144b27

Browse files
mikesherovmikesherov
committed
Draggable Tests: clarify scroll helpers.
1 parent 82edd58 commit 0144b27

File tree

2 files changed

+58
-66
lines changed

2 files changed

+58
-66
lines changed

‎tests/unit/draggable/draggable_options.js

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -694,164 +694,164 @@ test( "{ helper: 'original' }, relative, with scroll offset on parent", function
694694

695695
var element = $( "#draggable1" ).draggable({ helper: "original" });
696696

697-
TestHelpers.draggable.setScroll();
697+
TestHelpers.draggable.setScroll( "#main" );
698698
TestHelpers.draggable.testScroll( element, "relative" );
699699

700-
TestHelpers.draggable.setScroll();
700+
TestHelpers.draggable.setScroll( "#main" );
701701
TestHelpers.draggable.testScroll( element, "static" );
702702

703-
TestHelpers.draggable.setScroll();
703+
TestHelpers.draggable.setScroll( "#main" );
704704
TestHelpers.draggable.testScroll( element, "absolute" );
705705

706-
TestHelpers.draggable.restoreScroll();
706+
TestHelpers.draggable.restoreScroll( "#main" );
707707
});
708708

709709
test( "{ helper: 'original' }, relative, with scroll offset on root", function() {
710710
expect( 3 );
711711

712712
var element = $( "#draggable1" ).draggable({ helper: "original" });
713713

714-
TestHelpers.draggable.setScroll( "root" );
714+
TestHelpers.draggable.setScroll( document );
715715
TestHelpers.draggable.testScroll( element, "relative" );
716716

717-
TestHelpers.draggable.setScroll( "root" );
717+
TestHelpers.draggable.setScroll( document );
718718
TestHelpers.draggable.testScroll( element, "static" );
719719

720-
TestHelpers.draggable.setScroll( "root" );
720+
TestHelpers.draggable.setScroll( document );
721721
TestHelpers.draggable.testScroll( element, "absolute" );
722722

723-
TestHelpers.draggable.restoreScroll( "root" );
723+
TestHelpers.draggable.restoreScroll( document );
724724
});
725725

726726
test( "{ helper: 'original' }, relative, with scroll offset on root and parent", function() {
727727
expect( 3 );
728728

729729
var element = $( "#draggable1" ).draggable({ helper: "original" });
730730

731-
TestHelpers.draggable.setScroll();
732-
TestHelpers.draggable.setScroll( "root" );
731+
TestHelpers.draggable.setScroll( "#main" );
732+
TestHelpers.draggable.setScroll( document );
733733
TestHelpers.draggable.testScroll( element, "relative" );
734734

735-
TestHelpers.draggable.setScroll();
736-
TestHelpers.draggable.setScroll( "root" );
735+
TestHelpers.draggable.setScroll( "#main" );
736+
TestHelpers.draggable.setScroll( document );
737737
TestHelpers.draggable.testScroll( element, "static" );
738738

739-
TestHelpers.draggable.setScroll();
740-
TestHelpers.draggable.setScroll( "root" );
739+
TestHelpers.draggable.setScroll( "#main" );
740+
TestHelpers.draggable.setScroll( document );
741741
TestHelpers.draggable.testScroll( element, "absolute" );
742742

743-
TestHelpers.draggable.restoreScroll();
744-
TestHelpers.draggable.restoreScroll( "root" );
743+
TestHelpers.draggable.restoreScroll( "#main" );
744+
TestHelpers.draggable.restoreScroll( document );
745745
});
746746

747747
test( "{ helper: 'original' }, absolute, with scroll offset on parent", function() {
748748
expect( 3 );
749749

750750
var element = $( "#draggable1" ).css({ position: "absolute", top: 0, left: 0 }).draggable({ helper: "original" });
751751

752-
TestHelpers.draggable.setScroll();
752+
TestHelpers.draggable.setScroll( "#main" );
753753
TestHelpers.draggable.testScroll( element, "relative" );
754754

755-
TestHelpers.draggable.setScroll();
755+
TestHelpers.draggable.setScroll( "#main" );
756756
TestHelpers.draggable.testScroll( element, "static" );
757757

758-
TestHelpers.draggable.setScroll();
758+
TestHelpers.draggable.setScroll( "#main" );
759759
TestHelpers.draggable.testScroll( element, "absolute" );
760760

761-
TestHelpers.draggable.restoreScroll();
761+
TestHelpers.draggable.restoreScroll( "#main" );
762762
});
763763

764764
test( "{ helper: 'original' }, absolute, with scroll offset on root", function() {
765765
expect( 3 );
766766

767767
var element = $( "#draggable1" ).css({ position: "absolute", top: 0, left: 0 }).draggable({ helper: "original" });
768768

769-
TestHelpers.draggable.setScroll( "root" );
769+
TestHelpers.draggable.setScroll( document );
770770
TestHelpers.draggable.testScroll( element, "relative" );
771771

772-
TestHelpers.draggable.setScroll( "root" );
772+
TestHelpers.draggable.setScroll( document );
773773
TestHelpers.draggable.testScroll( element, "static" );
774774

775-
TestHelpers.draggable.setScroll( "root" );
775+
TestHelpers.draggable.setScroll( document );
776776
TestHelpers.draggable.testScroll( element, "absolute" );
777777

778-
TestHelpers.draggable.restoreScroll( "root" );
778+
TestHelpers.draggable.restoreScroll( document );
779779
});
780780

781781
test( "{ helper: 'original' }, absolute, with scroll offset on root and parent", function() {
782782
expect( 3 );
783783

784784
var element = $( "#draggable1" ).css({ position: "absolute", top: 0, left: 0 }).draggable({ helper: "original" });
785785

786-
TestHelpers.draggable.setScroll();
787-
TestHelpers.draggable.setScroll( "root" );
786+
TestHelpers.draggable.setScroll( "#main" );
787+
TestHelpers.draggable.setScroll( document );
788788
TestHelpers.draggable.testScroll( element, "relative" );
789789

790-
TestHelpers.draggable.setScroll();
791-
TestHelpers.draggable.setScroll( "root" );
790+
TestHelpers.draggable.setScroll( "#main" );
791+
TestHelpers.draggable.setScroll( document );
792792
TestHelpers.draggable.testScroll( element, "static" );
793793

794-
TestHelpers.draggable.setScroll();
795-
TestHelpers.draggable.setScroll( "root" );
794+
TestHelpers.draggable.setScroll( "#main" );
795+
TestHelpers.draggable.setScroll( document );
796796
TestHelpers.draggable.testScroll( element, "absolute" );
797797

798-
TestHelpers.draggable.restoreScroll();
799-
TestHelpers.draggable.restoreScroll( "root" );
798+
TestHelpers.draggable.restoreScroll( "#main" );
799+
TestHelpers.draggable.restoreScroll( document );
800800
});
801801

802802
test( "{ helper: 'original' }, fixed, with scroll offset on parent", function() {
803803
expect( 3 );
804804

805805
var element = $( "#draggable1" ).css({ position: "fixed", top: 0, left: 0 }).draggable({ helper: "original" });
806806

807-
TestHelpers.draggable.setScroll();
807+
TestHelpers.draggable.setScroll( "#main" );
808808
TestHelpers.draggable.testScroll( element, "relative" );
809809

810-
TestHelpers.draggable.setScroll();
810+
TestHelpers.draggable.setScroll( "#main" );
811811
TestHelpers.draggable.testScroll( element, "static" );
812812

813-
TestHelpers.draggable.setScroll();
813+
TestHelpers.draggable.setScroll( "#main" );
814814
TestHelpers.draggable.testScroll( element, "absolute" );
815815

816-
TestHelpers.draggable.restoreScroll();
816+
TestHelpers.draggable.restoreScroll( "#main" );
817817
});
818818

819819
test( "{ helper: 'original' }, fixed, with scroll offset on root", function() {
820820
expect( 3 );
821821

822822
var element = $( "#draggable1" ).css({ position: "fixed", top: 0, left: 0 }).draggable({ helper: "original" });
823823

824-
TestHelpers.draggable.setScroll( "root" );
824+
TestHelpers.draggable.setScroll( document );
825825
TestHelpers.draggable.testScroll( element, "relative" );
826826

827-
TestHelpers.draggable.setScroll( "root" );
827+
TestHelpers.draggable.setScroll( document );
828828
TestHelpers.draggable.testScroll( element, "static" );
829829

830-
TestHelpers.draggable.setScroll( "root" );
830+
TestHelpers.draggable.setScroll( document );
831831
TestHelpers.draggable.testScroll( element, "absolute" );
832832

833-
TestHelpers.draggable.restoreScroll( "root" );
833+
TestHelpers.draggable.restoreScroll( document );
834834
});
835835

836836
test( "{ helper: 'original' }, fixed, with scroll offset on root and parent", function() {
837837
expect( 3 );
838838

839839
var element = $( "#draggable1" ).css({ position: "fixed", top: 0, left: 0 }).draggable({ helper: "original" });
840840

841-
TestHelpers.draggable.setScroll();
842-
TestHelpers.draggable.setScroll( "root" );
841+
TestHelpers.draggable.setScroll( "#main" );
842+
TestHelpers.draggable.setScroll( document );
843843
TestHelpers.draggable.testScroll( element, "relative" );
844844

845-
TestHelpers.draggable.setScroll();
846-
TestHelpers.draggable.setScroll( "root" );
845+
TestHelpers.draggable.setScroll( "#main" );
846+
TestHelpers.draggable.setScroll( document );
847847
TestHelpers.draggable.testScroll( element, "static" );
848848

849-
TestHelpers.draggable.setScroll();
850-
TestHelpers.draggable.setScroll( "root" );
849+
TestHelpers.draggable.setScroll( "#main" );
850+
TestHelpers.draggable.setScroll( document );
851851
TestHelpers.draggable.testScroll( element, "absolute" );
852852

853-
TestHelpers.draggable.restoreScroll();
854-
TestHelpers.draggable.restoreScroll( "root" );
853+
TestHelpers.draggable.restoreScroll( "#main" );
854+
TestHelpers.draggable.restoreScroll( document );
855855
});
856856

857857
test( "{ helper: 'clone' }, absolute", function() {
@@ -873,7 +873,7 @@ test( "{ helper: 'clone' }, absolute", function() {
873873
test( "{ helper: 'clone' }, absolute with scroll offset on parent", function() {
874874
expect( 3 );
875875

876-
TestHelpers.draggable.setScroll();
876+
TestHelpers.draggable.setScroll( "#main" );
877877
var helperOffset = null,
878878
origOffset = null,
879879
element = $( "#draggable1" ).draggable({
@@ -907,13 +907,13 @@ test( "{ helper: 'clone' }, absolute with scroll offset on parent", function() {
907907
});
908908
deepEqual({ top: helperOffset.top - 1, left: helperOffset.left - 1 }, origOffset, "dragged[1, 1]" );
909909

910-
TestHelpers.draggable.restoreScroll();
910+
TestHelpers.draggable.restoreScroll( "#main" );
911911
});
912912

913913
test( "{ helper: 'clone' }, absolute with scroll offset on root", function() {
914914
expect( 3 );
915915

916-
TestHelpers.draggable.setScroll( "root" );
916+
TestHelpers.draggable.setScroll( document );
917917
var helperOffset = null,
918918
origOffset = null,
919919
element = $( "#draggable1" ).draggable({
@@ -947,14 +947,14 @@ test( "{ helper: 'clone' }, absolute with scroll offset on root", function() {
947947
});
948948
deepEqual({ top: helperOffset.top - 1, left: helperOffset.left - 1 }, origOffset, "dragged[1, 1]" );
949949

950-
TestHelpers.draggable.restoreScroll( "root" );
950+
TestHelpers.draggable.restoreScroll( document );
951951
});
952952

953953
test( "{ helper: 'clone' }, absolute with scroll offset on root and parent", function() {
954954
expect( 3 );
955955

956-
TestHelpers.draggable.setScroll( "root" );
957-
TestHelpers.draggable.setScroll();
956+
TestHelpers.draggable.setScroll( document );
957+
TestHelpers.draggable.setScroll( "#main" );
958958

959959
var helperOffset = null,
960960
origOffset = null,
@@ -989,8 +989,8 @@ test( "{ helper: 'clone' }, absolute with scroll offset on root and parent", fun
989989
});
990990
deepEqual({ top: helperOffset.top - 1, left: helperOffset.left - 1 }, origOffset, "dragged[1, 1]" );
991991

992-
TestHelpers.draggable.restoreScroll( "root" );
993-
TestHelpers.draggable.restoreScroll();
992+
TestHelpers.draggable.restoreScroll( document );
993+
TestHelpers.draggable.restoreScroll( "#main" );
994994
});
995995

996996
test( "{ opacity: 0.5 }", function() {

‎tests/unit/draggable/draggable_test_helpers.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,10 @@ TestHelpers.draggable = {
3838
$( "#main" ).css( "position", oldPosition );
3939
},
4040
restoreScroll: function( what ) {
41-
if( what ) {
42-
$( document ).scrollTop( 0 ).scrollLeft( 0 );
43-
} else {
44-
$( "#main" ).scrollTop( 0 ).scrollLeft( 0 );
45-
}
41+
$( what ).scrollTop( 0 ).scrollLeft( 0 );
4642
},
4743
setScroll: function( what ) {
48-
if( what ) {
49-
$( document ).scrollTop( 100 ).scrollLeft( 100 );
50-
} else {
51-
$( "#main" ).scrollTop( 100 ).scrollLeft( 100 );
52-
}
44+
$( what ).scrollTop( 100 ).scrollLeft( 100 );
5345
},
5446
border: function( el, side ) {
5547
return parseInt( el.css( "border-" + side + "-width" ), 10 ) || 0;

0 commit comments

Comments
 (0)