Draggable Tests: style guide conformance for TestHelpers(cherry picked from commit...

diff --git a/tests/unit/draggable/draggable_test_helpers.js b/tests/unit/draggable/draggable_test_helpers.js
index 24617560484d2c63b8c2b3ef5f1513d56a4d155a..0263f694cf5a8e5101ef09234050b52fdda9ca72 100644 (file)
--- a/tests/unit/draggable/draggable_test_helpers.js
+++ b/tests/unit/draggable/draggable_test_helpers.js
@@ -1,12 +1,12 @@
 TestHelpers.draggable = {
-       // todo: remove the unreliable offset hacks
+       // TODO: remove the unreliable offset hacks
        unreliableOffset: $.ui.ie && ( !document.documentMode || document.documentMode < 8 ) ? 2 : 0,
        // Support: Opera 12.10, Safari 5.1, jQuery <1.8
        unreliableContains: function(){
                var element = $( "<div>" );
                return $.contains( element[ 0 ].ownerDocument, element[ 0 ] );
        }(),
-       testDrag: function(el, handle, dx, dy, expectedDX, expectedDY, msg) {
+       testDrag: function( el, handle, dx, dy, expectedDX, expectedDY, msg ) {
                var offsetAfter, actual, expected,
                        offsetBefore = el.offset();
 
@@ -20,64 +20,60 @@ TestHelpers.draggable = {
                expected = { left: offsetBefore.left + expectedDX, top: offsetBefore.top + expectedDY };
 
                msg = msg ? msg + "." : "";
-               deepEqual(actual, expected, "dragged[" + dx + ", " + dy + "] " + msg);
+               deepEqual( actual, expected, "dragged[" + dx + ", " + dy + "] " + msg );
        },
-       shouldMove: function(el, why) {
-               TestHelpers.draggable.testDrag(el, el, 50, 50, 50, 50, why);
+       shouldMove: function( el, why ) {
+               TestHelpers.draggable.testDrag( el, el, 50, 50, 50, 50, why );
        },
-       shouldNotMove: function(el, why) {
-               TestHelpers.draggable.testDrag(el, el, 50, 50, 0, 0, why);
+       shouldNotMove: function( el, why ) {
+               TestHelpers.draggable.testDrag( el, el, 50, 50, 0, 0, why );
        },
-       testScroll: function(el, position ) {
-               var oldPosition = $("#main").css("position");
-               $("#main").css("position", position);
-               TestHelpers.draggable.shouldMove(el, position+" parent");
-               $("#main").css("position", oldPosition);
+       testScroll: function( el, position ) {
+               var oldPosition = $( "#main" ).css( "position" );
+               $( "#main" ).css( "position", position);
+               TestHelpers.draggable.shouldMove( el, position + " parent" );
+               $( "#main" ).css( "position", oldPosition );
        },
        restoreScroll: function( what ) {
                if( what ) {
-                       $(document).scrollTop(0); $(document).scrollLeft(0);
+                       $( document ).scrollTop( 0 ).scrollLeft( 0 );
                } else {
-                       $("#main").scrollTop(0); $("#main").scrollLeft(0);
+                       $( "#main" ).scrollTop( 0 ).scrollLeft( 0 );
                }
        },
        setScroll: function( what ) {
-               if(what) {
-                       // todo: currently, the draggable interaction doesn't properly account for scrolled pages,
+               if( what ) {
+                       // TODO: currently, the draggable interaction doesn't properly account for scrolled pages,
                        // uncomment the line below to make the tests fail that should when the page is scrolled
-                       // $(document).scrollTop(100); $(document).scrollLeft(100);
+                       // $( document ).scrollTop( 100 ).scrollLeft( 100 );
                } else {
-                       $("#main").scrollTop(100); $("#main").scrollLeft(100);
+                       $( "#main" ).scrollTop( 100 ).scrollLeft( 100 );
                }
        },
-       border: function(el, side) {
-               return parseInt(el.css("border-" + side + "-width"), 10) || 0;
+       border: function( el, side ) {
+               return parseInt( el.css( "border-" + side + "-width" ), 10 ) || 0;
        },
-       margin: function(el, side) {
-               return parseInt(el.css("margin-" + side), 10) || 0;
+       margin: function( el, side ) {
+               return parseInt( el.css( "margin-" + side ), 10 ) || 0;
        },
        move: function( el, x, y ) {
-
                $( el ).simulate( "drag", {
                        dx: x,
                        dy: y
                });
-
        },
        trackMouseCss : function( el ) {
                el.bind( "drag", function() {
-                       el.data( "last_dragged_cursor", $("body").css("cursor") );
+                       el.data( "last_dragged_cursor", $( "body" ).css( "cursor" ) );
                });
        },
        trackAppendedParent : function( el ) {
-
-               // appendTo ignored without being clone
+               // TODO: appendTo is currently ignored if helper is original (see #7044)
                el.draggable( "option", "helper", "clone" );
 
+               // Get what parent is at time of drag
                el.bind( "drag", function(e,ui) {
-                       // Get what parent is at time of drag
-                       el.data( "last_dragged_parent", ui.helper.parent()[0] );
+                       el.data( "last_dragged_parent", ui.helper.parent()[ 0 ] );
                });
-
        }
 };
\ No newline at end of file