Dev: Standardized the draggable test suite. Fixed #8748 - Dev: Get draggable test suite to pass

1 files changed, 14 insertions, 25 deletions

diff --git a/tests/unit/draggable/draggable_methods.js b/tests/unit/draggable/draggable_methods.js
index bb3fd0771..b4b7888b6 100644
--- a/tests/unit/draggable/draggable_methods.js
+++ b/tests/unit/draggable/draggable_methods.js
@@ -3,20 +3,10 @@
  */
 (function($) {
 
-function shouldmove(why) {
-	drag(el, 50, 50);
-	moved(50, 50, why);
-}
-
-function shouldnotmove(why) {
-	drag(el, 50, 50);
-	moved(0, 0, why);
-}
-
 module("draggable: methods");
 
 test("init", function() {
-	expect(6);
+	expect(5);
 
 	$("<div></div>").appendTo('body').draggable().remove();
 	ok(true, '.draggable() called on element');
@@ -27,9 +17,6 @@ test("init", function() {
 	$("<div></div>").draggable();
 	ok(true, '.draggable() called on disconnected DOMElement');
 
-	$("<div></div>").draggable().draggable("foo");
-	ok(true, 'arbitrary method called after init');
-
 	$("<div></div>").draggable().draggable("option", "foo");
 	ok(true, 'arbitrary option getter after init');
 
@@ -38,6 +25,7 @@ test("init", function() {
 });
 
 test("destroy", function() {
+	expect(4);
 	$("<div></div>").appendTo('body').draggable().draggable("destroy").remove();
 	ok(true, '.draggable("destroy") called on element');
 
@@ -47,9 +35,6 @@ test("destroy", function() {
 	$("<div></div>").draggable().draggable("destroy");
 	ok(true, '.draggable("destroy") called on disconnected DOMElement');
 
-	$("<div></div>").draggable().draggable("destroy").draggable("foo");
-	ok(true, 'arbitrary method called after destroy');
-
 	var expected = $('<div></div>').draggable(),
 		actual = expected.draggable('destroy');
 	equal(actual, expected, 'destroy is chainable');
@@ -58,17 +43,19 @@ test("destroy", function() {
 test("enable", function() {
 	expect(7);
 	el = $("#draggable2").draggable({ disabled: true });
-	shouldnotmove('.draggable({ disabled: true })');
+	TestHelpers.draggable.shouldNotMove(el, '.draggable({ disabled: true })');
+
 	el.draggable("enable");
-	shouldmove('.draggable("enable")');
+	TestHelpers.draggable.shouldMove(el, '.draggable("enable")');
 	equal(el.draggable("option", "disabled"), false, "disabled option getter");
 
 	el.draggable("destroy");
 	el.draggable({ disabled: true });
-	shouldnotmove('.draggable({ disabled: true })');
+	TestHelpers.draggable.shouldNotMove(el, '.draggable({ disabled: true })');
+
 	el.draggable("option", "disabled", false);
 	equal(el.draggable("option", "disabled"), false, "disabled option setter");
-	shouldmove('.draggable("option", "disabled", false)');
+	TestHelpers.draggable.shouldMove(el, '.draggable("option", "disabled", false)');
 
 	var expected = $('<div></div>').draggable(),
 		actual = expected.draggable('enable');
@@ -78,18 +65,20 @@ test("enable", function() {
 test("disable", function() {
 	expect(7);
 	el = $("#draggable2").draggable({ disabled: false });
-	shouldmove('.draggable({ disabled: false })');
+	TestHelpers.draggable.shouldMove(el, '.draggable({ disabled: false })');
+
 	el.draggable("disable");
-	shouldnotmove('.draggable("disable")');
+	TestHelpers.draggable.shouldNotMove(el, '.draggable("disable")');
 	equal(el.draggable("option", "disabled"), true, "disabled option getter");
 
 	el.draggable("destroy");
 
 	el.draggable({ disabled: false });
-	shouldmove('.draggable({ disabled: false })');
+	TestHelpers.draggable.shouldMove(el, '.draggable({ disabled: false })');
+
 	el.draggable("option", "disabled", true);
 	equal(el.draggable("option", "disabled"), true, "disabled option setter");
-	shouldnotmove('.draggable("option", "disabled", true)');
+	TestHelpers.draggable.shouldNotMove(el, '.draggable("option", "disabled", true)');
 
 	var expected = $('<div></div>').draggable(),
 		actual = expected.draggable('disable');