1 files changed, 8 insertions, 30 deletions

diff --git a/tests/unit/sortable/sortable_methods.js b/tests/unit/sortable/sortable_methods.js
index c2a0b9548..85b418ac8 100644
--- a/tests/unit/sortable/sortable_methods.js
+++ b/tests/unit/sortable/sortable_methods.js
@@ -3,27 +3,10 @@
  */
 (function($) {
 
-var el, offsetBefore, offsetAfter, dragged;
-
-function drag(handle, dx, dy) {
-	offsetBefore = $(handle).offset();
-	$(handle).simulate("drag", {
-		dx: dx || 0,
-		dy: dy || 0
-	});
-	dragged = { dx: dx, dy: dy };
-	offsetAfter = $(handle).offset();
-}
-
-function sort(handle, dx, dy, index, msg) {
-	drag(handle, dx, dy);
-	equal($(handle).parent().children().index(handle), index, msg);
-}
-
 module("sortable: methods");
 
 test("init", function() {
-	expect(6);
+	expect(5);
 
 	$("<div></div>").appendTo('body').sortable().remove();
 	ok(true, '.sortable() called on element');
@@ -34,9 +17,6 @@ test("init", function() {
 	$("<div></div>").sortable();
 	ok(true, '.sortable() called on disconnected DOMElement');
 
-	$("<div></div>").sortable().sortable("foo");
-	ok(true, 'arbitrary method called after init');
-
 	$("<div></div>").sortable().sortable("option", "foo");
 	ok(true, 'arbitrary option getter after init');
 
@@ -45,6 +25,7 @@ test("init", function() {
 });
 
 test("destroy", function() {
+	expect(4);
 	$("<div></div>").appendTo('body').sortable().sortable("destroy").remove();
 	ok(true, '.sortable("destroy") called on element');
 
@@ -54,9 +35,6 @@ test("destroy", function() {
 	$("<div></div>").sortable().sortable("destroy");
 	ok(true, '.sortable("destroy") called on disconnected DOMElement');
 
-	$("<div></div>").sortable().sortable("destroy").sortable("foo");
-	ok(true, 'arbitrary method called after destroy');
-
 	var expected = $('<div></div>').sortable(),
 		actual = expected.sortable('destroy');
 	equal(actual, expected, 'destroy is chainable');
@@ -66,7 +44,7 @@ test("enable", function() {
 	expect(5);
 	el = $("#sortable").sortable({ disabled: true });
 
-	sort($("li", el)[0], 0, 40, 0, '.sortable({ disabled: true })');
+	TestHelpers.sortable.sort($("li", el)[0], 0, 44, 0, '.sortable({ disabled: true })');
 
 	el.sortable("enable");
 	equal(el.sortable("option", "disabled"), false, "disabled option getter");
@@ -76,7 +54,7 @@ test("enable", function() {
 	el.sortable("option", "disabled", false);
 	equal(el.sortable("option", "disabled"), false, "disabled option setter");
 
-	sort($("li", el)[0], 0, 40, 2, '.sortable("option", "disabled", false)');
+	TestHelpers.sortable.sort($("li", el)[0], 0, 44, 2, '.sortable("option", "disabled", false)');
 
 	var expected = $('<div></div>').sortable(),
 		actual = expected.sortable('enable');
@@ -86,19 +64,19 @@ test("enable", function() {
 test("disable", function() {
 	expect(7);
 	el = $("#sortable").sortable({ disabled: false });
-	sort($("li", el)[0], 0, 40, 2, '.sortable({ disabled: false })');
+	TestHelpers.sortable.sort($("li", el)[0], 0, 44, 2, '.sortable({ disabled: false })');
 
 	el.sortable("disable");
-	sort($("li", el)[0], 0, 40, 0, 'disabled.sortable getter');
+	TestHelpers.sortable.sort($("li", el)[0], 0, 44, 0, 'disabled.sortable getter');
 
 	el.sortable("destroy");
 
 	el.sortable({ disabled: false });
-	sort($("li", el)[0], 0, 40, 2, '.sortable({ disabled: false })');
+	TestHelpers.sortable.sort($("li", el)[0], 0, 44, 2, '.sortable({ disabled: false })');
 	el.sortable("option", "disabled", true);
 	equal(el.sortable("option", "disabled"), true, "disabled option setter");
 	ok(el.sortable("widget").is(":not(.ui-state-disabled)"), "sortable element does not get ui-state-disabled since it's an interaction");
-	sort($("li", el)[0], 0, 40, 0, '.sortable("option", "disabled", true)');
+	TestHelpers.sortable.sort($("li", el)[0], 0, 44, 0, '.sortable("option", "disabled", true)');
 
 	var expected = $('<div></div>').sortable(),
 		actual = expected.sortable('disable');