Dev: remove unnecessary simulated drag delegation in test suite

2 files changed, 112 insertions, 78 deletions

diff --git a/tests/unit/sortable/sortable_events.js b/tests/unit/sortable/sortable_events.js
index 4245d64fa..b9ee078f5 100644
--- a/tests/unit/sortable/sortable_events.js
+++ b/tests/unit/sortable/sortable_events.js
@@ -9,9 +9,13 @@ test("start", function() {
 	expect( 7 );
 
 	var hash;
-	$("#sortable")
-		.sortable({ start: function(e, ui) { hash = ui; } })
-		.find('li:eq(0)').simulate("drag", { dx: 0, dy: 10 });
+	$("#sortable").sortable({
+		start: function( e, ui ) {
+			hash = ui;
+		}
+	}).find("li:eq(0)").simulate( "drag", {
+		dy: 10
+	});
 
 	ok(hash, 'start event triggered');
 	ok(hash.helper, 'UI hash includes: helper');
@@ -30,9 +34,13 @@ test("sort", function() {
 	expect( 7 );
 
 	var hash;
-	$("#sortable")
-		.sortable({ sort: function(e, ui) { hash = ui; } })
-		.find('li:eq(0)').simulate("drag", { dx: 0, dy: 10 });
+	$("#sortable").sortable({
+		sort: function( e, ui ) {
+			hash = ui;
+		}
+	}).find("li:eq(0)").simulate( "drag", {
+		dy: 10
+	});
 
 	ok(hash, 'sort event triggered');
 	ok(hash.helper, 'UI hash includes: helper');
@@ -48,15 +56,24 @@ test("change", function() {
 	expect( 8 );
 
 	var hash;
-	$("#sortable")
-		.sortable({ change: function(e, ui) { hash = ui; } })
-		.find('li:eq(0)').simulate("drag", { dx: 1, dy: 1 });
+	$("#sortable").sortable({
+		change: function( e, ui ) {
+			hash = ui;
+		}
+	}).find("li:eq(0)").simulate( "drag", {
+		dx: 1,
+		dy: 1
+	});
 
 	ok(!hash, '1px drag, change event should not be triggered');
 
-	$("#sortable")
-		.sortable({ change: function(e, ui) { hash = ui; } })
-		.find('li:eq(0)').simulate("drag", { dx: 0, dy: 22 });
+	$("#sortable").sortable({
+		change: function( e, ui ) {
+			hash = ui;
+		}
+	}).find("li:eq(0)").simulate( "drag", {
+		dy: 22
+	});
 
 	ok(hash, 'change event triggered');
 	ok(hash.helper, 'UI hash includes: helper');
@@ -72,9 +89,13 @@ test("beforeStop", function() {
 	expect( 7 );
 
 	var hash;
-	$("#sortable")
-		.sortable({ beforeStop: function(e, ui) { hash = ui; } })
-		.find('li:eq(0)').simulate("drag", { dx: 0, dy: 20 });
+	$("#sortable").sortable({
+		beforeStop: function( e, ui ) {
+			hash = ui;
+		}
+	}).find("li:eq(0)").simulate( "drag", {
+		dy: 20
+	});
 
 	ok(hash, 'beforeStop event triggered');
 	ok(hash.helper, 'UI hash includes: helper');
@@ -90,9 +111,13 @@ test("stop", function() {
 	expect( 7 );
 
 	var hash;
-	$("#sortable")
-		.sortable({ stop: function(e, ui) { hash = ui; } })
-		.find('li:eq(0)').simulate("drag", { dx: 0, dy: 20 });
+	$("#sortable").sortable({
+		stop: function( e, ui ) {
+			hash = ui;
+		}
+	}).find("li:eq(0)").simulate( "drag", {
+		dy: 20
+	});
 
 	ok(hash, 'stop event triggered');
 	ok(!hash.helper, 'UI should not include: helper');
@@ -108,15 +133,24 @@ test("update", function() {
 	expect( 8 );
 
 	var hash;
-	$("#sortable")
-		.sortable({ update: function(e, ui) { hash = ui; } })
-		.find('li:eq(0)').simulate("drag", { dx: 1, dy: 1 });
+	$("#sortable").sortable({
+		update: function( e, ui ) {
+			hash = ui;
+		}
+	}).find("li:eq(0)").simulate( "drag", {
+		dx: 1,
+		dy: 1
+	});
 
 	ok(!hash, '1px drag, update event should not be triggered');
 
-	$("#sortable")
-		.sortable({ update: function(e, ui) { hash = ui; } })
-		.find('li:eq(0)').simulate("drag", { dx: 0, dy: 22 });
+	$("#sortable").sortable({
+		update: function( e, ui ) {
+			hash = ui;
+		}
+	}).find("li:eq(0)").simulate( "drag", {
+		dy: 22
+	});
 
 	ok(hash, 'update event triggered');
 	ok(!hash.helper, 'UI hash should not include: helper');
@@ -129,14 +163,14 @@ test("update", function() {
 });
 
 test("#3019: Stop fires too early", function() {
-    expect(2);
+	expect(2);
 
 	var helper = null,
-        el = $("#sortable").sortable({
-            stop: function(event, ui) {
-                helper = ui.helper;
-            }
-        });
+		el = $("#sortable").sortable({
+			stop: function(event, ui) {
+				helper = ui.helper;
+			}
+		});
 
 	TestHelpers.sortable.sort($("li", el)[0], 0, 44, 2, 'Dragging the sortable');
 	equal(helper, null, "helper should be false");
@@ -144,49 +178,49 @@ test("#3019: Stop fires too early", function() {
 });
 
 test('#4752: link event firing on sortable with connect list', function () {
-    expect( 10 );
-
-    var fired = {},
-        hasFired = function (type) { return (type in fired) && (true === fired[type]); };
-
-    $('#sortable').clone().attr('id', 'sortable2').insertAfter('#sortable');
-
-    $('#qunit-fixture ul').sortable({
-        connectWith: '#qunit-fixture ul',
-        change: function () {
-            fired.change = true;
-        },
-        receive: function () {
-            fired.receive = true;
-        },
-        remove: function () {
-            fired.remove = true;
-        }
-    });
-
-    $('#qunit-fixture ul').bind('click.ui-sortable-test', function () {
-        fired.click = true;
-    });
-
-    $('#sortable li:eq(0)').simulate('click');
-    ok(!hasFired('change'), 'Click only, change event should not have fired');
-    ok(hasFired('click'), 'Click event should have fired');
-
-    // Drag an item within the first list
-    fired = {};
-    $('#sortable li:eq(0)').simulate('drag', { dx: 0, dy: 40 });
-    ok(hasFired('change'), '40px drag, change event should have fired');
-    ok(!hasFired('receive'), 'Receive event should not have fired');
-    ok(!hasFired('remove'), 'Remove event should not have fired');
-    ok(!hasFired('click'), 'Click event should not have fired');
-
-    // Drag an item from the first list to the second, connected list
-    fired = {};
-    $('#sortable li:eq(0)').simulate('drag', { dx: 0, dy: 150 });
-    ok(hasFired('change'), '150px drag, change event should have fired');
-    ok(hasFired('receive'), 'Receive event should have fired');
-    ok(hasFired('remove'), 'Remove event should have fired');
-    ok(!hasFired('click'), 'Click event should not have fired');
+	expect( 10 );
+
+	var fired = {},
+		hasFired = function (type) { return (type in fired) && (true === fired[type]); };
+
+	$('#sortable').clone().attr('id', 'sortable2').insertAfter('#sortable');
+
+	$('#qunit-fixture ul').sortable({
+		connectWith: '#qunit-fixture ul',
+		change: function () {
+			fired.change = true;
+		},
+		receive: function () {
+			fired.receive = true;
+		},
+		remove: function () {
+			fired.remove = true;
+		}
+	});
+
+	$('#qunit-fixture ul').bind('click.ui-sortable-test', function () {
+		fired.click = true;
+	});
+
+	$('#sortable li:eq(0)').simulate('click');
+	ok(!hasFired('change'), 'Click only, change event should not have fired');
+	ok(hasFired('click'), 'Click event should have fired');
+
+	// Drag an item within the first list
+	fired = {};
+	$('#sortable li:eq(0)').simulate('drag', { dx: 0, dy: 40 });
+	ok(hasFired('change'), '40px drag, change event should have fired');
+	ok(!hasFired('receive'), 'Receive event should not have fired');
+	ok(!hasFired('remove'), 'Remove event should not have fired');
+	ok(!hasFired('click'), 'Click event should not have fired');
+
+	// Drag an item from the first list to the second, connected list
+	fired = {};
+	$('#sortable li:eq(0)').simulate('drag', { dx: 0, dy: 150 });
+	ok(hasFired('change'), '150px drag, change event should have fired');
+	ok(hasFired('receive'), 'Receive event should have fired');
+	ok(hasFired('remove'), 'Remove event should have fired');
+	ok(!hasFired('click'), 'Click event should not have fired');
 });
 
 /*
diff --git a/tests/unit/sortable/sortable_test_helpers.js b/tests/unit/sortable/sortable_test_helpers.js
index 7569b5797..12e4829ea 100644
--- a/tests/unit/sortable/sortable_test_helpers.js
+++ b/tests/unit/sortable/sortable_test_helpers.js
@@ -1,9 +1,9 @@
 TestHelpers.sortable = {
-	sort: function(handle, dx, dy, index, msg) {
-		$(handle).simulate("drag", {
-			dx: dx || 0,
-			dy: dy || 0
+	sort: function( handle, dx, dy, index, msg ) {
+		$( handle ).simulate( "drag", {
+			dx: dx,
+			dy: dy
 		});
-		equal($(handle).parent().children().index(handle), index, msg);
+		equal( $( handle ).parent().children().index( handle ), index, msg );
 	}
 };
\ No newline at end of file