From b49e071d39795255e88b13ae172367201484c352 Mon Sep 17 00:00:00 2001
From: Mike Sherov <mike.sherov@gmail.com>
Date: Tue, 30 Oct 2012 21:50:08 -0400
Subject: Dev: Standardized the selectable test suite. Fixed #8752 - Dev: Get
 selectable test suite to pass

---
 tests/unit/selectable/selectable_options.js | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'tests/unit/selectable/selectable_options.js')

diff --git a/tests/unit/selectable/selectable_options.js b/tests/unit/selectable/selectable_options.js
index ad57000a9..2b7fc1648 100644
--- a/tests/unit/selectable/selectable_options.js
+++ b/tests/unit/selectable/selectable_options.js
@@ -7,13 +7,15 @@ module("selectable: options");
 
 test("autoRefresh", function() {
 	expect(3);
-	el = $("#selectable1");
-	var actual, sel = $("*", el), selected = function() { actual += 1; };
 
-	actual = 0;
+	var actual = 0,
+		el = $("#selectable1"),
+		sel = $("*", el),
+		selected = function() { actual += 1; };
+
 	el = $("#selectable1").selectable({ autoRefresh: false,	selected: selected });
 	sel.hide();
-	TestHelpers.selectableDrag(1000, 1000);
+	TestHelpers.selectable.drag(el, 1000, 1000);
 	equal(actual, sel.length);
 	el.selectable("destroy");
 
@@ -21,10 +23,10 @@ test("autoRefresh", function() {
 	sel.show();
 	el = $("#selectable1").selectable({ autoRefresh: true,	selected: selected });
 	sel.hide();
-	TestHelpers.selectableDrag(1000, 1000);
+	TestHelpers.selectable.drag(el, 1000, 1000);
 	equal(actual, 0);
 	sel.show();
-	TestHelpers.selectableDrag(1000, 1000);
+	TestHelpers.selectable.drag(el, 1000, 1000);
 	equal(actual, sel.length);
 	el.selectable("destroy");
 	sel.show();
@@ -32,12 +34,15 @@ test("autoRefresh", function() {
 
 test("filter", function() {
 	expect(2);
-	el = $("#selectable1");
-	var actual, sel = $("*", el), selected = function() { actual += 1; };
 
-	actual = 0;
+	var actual =0,
+		el = $("#selectable1"),
+		sel = $("*", el),
+		selected = function() { actual += 1; };
+
+
 	el = $("#selectable1").selectable({ filter: '.special', selected: selected });
-	TestHelpers.selectableDrag(1000, 1000);
+	TestHelpers.selectable.drag(el, 1000, 1000);
 	ok(sel.length !== 1, "this test assumes more than 1 selectee");
 	equal(actual, 1);
 	el.selectable("destroy");
-- 
cgit v1.2.3