6 files changed, 32 insertions, 36 deletions
diff --git a/tests/unit/selectable/all.html b/tests/unit/selectable/all.html
index bfebf46c2..51778e771 100644
--- a/tests/unit/selectable/all.html
+++ b/tests/unit/selectable/all.html
@@ -7,9 +7,9 @@
 	<script src="../../../jquery-1.7.2.js"></script>
 
 	<link rel="stylesheet" href="../../../external/qunit.css">
-	<link rel="stylesheet" href="../subsuiteRunner.css">
+	<link rel="stylesheet" href="../qunit-composite.css">
 	<script src="../../../external/qunit.js"></script>
-	<script src="../subsuiteRunner.js"></script>
+	<script src="../qunit-composite.js"></script>
 	<script src="../subsuite.js"></script>
 
 	<script>
diff --git a/tests/unit/selectable/selectable.html b/tests/unit/selectable/selectable.html
index 4f70e8dd4..7b0ca6ffe 100644
--- a/tests/unit/selectable/selectable.html
+++ b/tests/unit/selectable/selectable.html
@@ -5,9 +5,12 @@
 	<title>jQuery UI Selectable Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script src="../../resource_loader.js"></script>
+	<link rel="stylesheet" href="../../../external/qunit.css">
+	<script src="../../../external/qunit.js"></script>
+	<script src="../../jquery.simulate.js"></script>
+	<script src="../testsuite.js"></script>
 	<script>
-	loadResources({
+	TestHelpers.loadResources({
 		css: [ "ui.core", "ui.selectable" ],
 		js: [
 			"ui/jquery.ui.core.js",
@@ -18,13 +21,8 @@
 	});
 	</script>
 
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-
+	<script src="selectable_common.js"></script>
 	<script src="selectable_core.js"></script>
-	<script src="selectable_defaults.js"></script>
 	<script src="selectable_events.js"></script>
 	<script src="selectable_methods.js"></script>
 	<script src="selectable_options.js"></script>
diff --git a/tests/unit/selectable/selectable_common.js b/tests/unit/selectable/selectable_common.js
new file mode 100644
index 000000000..27714d0ae
--- /dev/null
+++ b/tests/unit/selectable/selectable_common.js
@@ -0,0 +1,12 @@
+TestHelpers.commonWidgetTests('selectable', {
+	defaults: {
+		appendTo: 'body',
+		autoRefresh: true,
+		cancel: ':input,option',
+		delay: 0,
+		disabled: false,
+		distance: 0,
+		filter: '*',
+		tolerance: 'touch'
+	}
+});
diff --git a/tests/unit/selectable/selectable_defaults.js b/tests/unit/selectable/selectable_defaults.js
deleted file mode 100644
index dbf799a43..000000000
--- a/tests/unit/selectable/selectable_defaults.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * selectable_defaults.js
- */
-
-var selectable_defaults = {
-	appendTo: 'body',
-	autoRefresh: true,
-	cancel: ':input,option',
-	delay: 0,
-	disabled: false,
-	distance: 0,
-	filter: '*',
-	tolerance: 'touch'
-};
-
-commonWidgetTests('selectable', { defaults: selectable_defaults });
diff --git a/tests/unit/selectable/selectable_methods.js b/tests/unit/selectable/selectable_methods.js
index 32dfe00ed..dbc88f269 100644
--- a/tests/unit/selectable/selectable_methods.js
+++ b/tests/unit/selectable/selectable_methods.js
@@ -20,7 +20,7 @@ test("init", function() {
 	$("<div></div>").selectable().selectable("foo").remove();
 	ok(true, 'arbitrary method called after init');
 
-	el = $("<div></div>").selectable()
+	el = $("<div></div>").selectable();
 	var foo = el.selectable("option", "foo");
 	el.remove();
 	ok(true, 'arbitrary option getter after init');
@@ -49,7 +49,8 @@ test("destroy", function() {
 
 test("enable", function() {
 	expect(3);
-	var fired = false;
+	var expected, actual,
+		fired = false;
 
 	el = $("#selectable1");
 	el.selectable({
@@ -63,14 +64,15 @@ test("enable", function() {
 	equal(fired, true, "start fired");
 	el.selectable("destroy");
 
-	var expected = $('<div></div>').selectable(),
-		actual = expected.selectable('enable');
+	expected = $('<div></div>').selectable();
+	actual = expected.selectable('enable');
 	equal(actual, expected, 'enable is chainable');
 });
 
 test("disable", function() {
 	expect(3);
-	var fired = false;
+	var expected, actual,
+		fired = false;
 
 	el = $("#selectable1");
 	el.selectable({
@@ -85,8 +87,8 @@ test("disable", function() {
 	equal(fired, false, "start fired");
 	el.selectable("destroy");
 
-	var expected = $('<div></div>').selectable(),
-		actual = expected.selectable('disable');
+	expected = $('<div></div>').selectable();
+	actual = expected.selectable('disable');
 	equal(actual, expected, 'disable is chainable');
 });
 
diff --git a/tests/unit/selectable/selectable_options.js b/tests/unit/selectable/selectable_options.js
index 2bc44e6e0..be9fdf5fe 100644
--- a/tests/unit/selectable/selectable_options.js
+++ b/tests/unit/selectable/selectable_options.js
@@ -8,7 +8,7 @@ module("selectable: options");
 test("autoRefresh", function() {
 	expect(3);
 	el = $("#selectable1");
-	var actual, sel = $("*", el), selected = function() { actual += 1 };
+	var actual, sel = $("*", el), selected = function() { actual += 1; };
 
 	actual = 0;
 	el = $("#selectable1").selectable({ autoRefresh: false,	selected: selected });
@@ -33,12 +33,12 @@ test("autoRefresh", function() {
 test("filter", function() {
 	expect(2);
 	el = $("#selectable1");
-	var actual, sel = $("*", el), selected = function() { actual += 1 };
+	var actual, sel = $("*", el), selected = function() { actual += 1; };
 
 	actual = 0;
 	el = $("#selectable1").selectable({ filter: '.special', selected: selected });
 	drag(1000, 1000);
-	ok(sel.length != 1, "this test assumes more than 1 selectee");
+	ok(sel.length !== 1, "this test assumes more than 1 selectee");
 	equal(actual, 1);
 	el.selectable("destroy");
 });