From ff957dd2876e33e767f9a8293f03d5752464d8e6 Mon Sep 17 00:00:00 2001
From: Felix Nagel <info@felixnagel.com>
Date: Wed, 16 May 2012 20:30:30 +0200
Subject: Selectmenu: Update unit tests

---
 tests/unit/selectmenu/selectmenu.html        | 27 +++++++++++++++------------
 tests/unit/selectmenu/selectmenu_common.js   | 19 +++++++++++++++++++
 tests/unit/selectmenu/selectmenu_defaults.js | 19 -------------------
 3 files changed, 34 insertions(+), 31 deletions(-)
 create mode 100644 tests/unit/selectmenu/selectmenu_common.js
 delete mode 100644 tests/unit/selectmenu/selectmenu_defaults.js

(limited to 'tests/unit/selectmenu')

diff --git a/tests/unit/selectmenu/selectmenu.html b/tests/unit/selectmenu/selectmenu.html
index cca8c2631..9beea5d76 100644
--- a/tests/unit/selectmenu/selectmenu.html
+++ b/tests/unit/selectmenu/selectmenu.html
@@ -4,23 +4,26 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Selectmenu Test Suite</title>
 
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.core.css">
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.menu.css">
-	<link rel="stylesheet" href="../../../themes/base/jquery.ui.selectmenu.css">
 
 	<script src="../../jquery.js"></script>
-	<script src="../../../ui/jquery.ui.core.js"></script>
-	<script src="../../../ui/jquery.ui.widget.js"></script>
-	<script src="../../../ui/jquery.ui.menu.js"></script>
-	<script src="../../../ui/jquery.ui.selectmenu.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>
+	TestHelpers.loadResources({
+		css: [ "ui.core", "ui.menu" , "ui.selectmenu" ],
+		js: [
+			"ui/jquery.ui.core.js",
+			"ui/jquery.ui.widget.js",
+			"ui/jquery.ui.menu.js",
+			"ui/jquery.ui.selectmenu.js"
+		]
+	});
+	</script>
 
+	<script src="selectmenu_common.js"></script>
 	<script src="selectmenu_core.js"></script>
-	<script src="selectmenu_defaults.js"></script>
 	<script src="selectmenu_events.js"></script>
 	<script src="selectmenu_methods.js"></script>
 	<script src="selectmenu_options.js"></script>
@@ -35,7 +38,7 @@
 <h2 id="qunit-userAgent"></h2>
 <ol id="qunit-tests"></ol>
 <div id="qunit-fixture">
-	
+
 	<label for="speed">Select a speed:</label>
 	<select name="speed" id="speed">
 		<option value="Slower">Slower</option>
@@ -44,7 +47,7 @@
 		<option value="Fast">Fast</option>
 		<option value="Faster">Faster</option>
 	</select>
-	
+
 	<label for="number">Select a number:</label>
 	<select name="number" id="number">
 		<option value="1">1</option>
@@ -67,7 +70,7 @@
 		<option value="18">18</option>
 		<option value="19">19</option>
 	</select>
-	
+
 	<label for="files">Select a file:</label>
 	<select name="files" id="files">
 		<optgroup label="Scripts">
diff --git a/tests/unit/selectmenu/selectmenu_common.js b/tests/unit/selectmenu/selectmenu_common.js
new file mode 100644
index 000000000..6ce79ff15
--- /dev/null
+++ b/tests/unit/selectmenu/selectmenu_common.js
@@ -0,0 +1,19 @@
+TestHelpers.commonWidgetTests( "selectmenu", {
+	defaults: {
+		appendTo: "body",
+		disabled: false,
+		dropdown: true,
+		position: {
+			my: "left top",
+			at: "left bottom",
+			collision: "none"
+		},
+		// callbacks,
+		create: null,
+		open: null,
+		focus: null,
+		select: null,
+		close: null,
+		change: null
+	}
+});
diff --git a/tests/unit/selectmenu/selectmenu_defaults.js b/tests/unit/selectmenu/selectmenu_defaults.js
deleted file mode 100644
index 9f6a1a964..000000000
--- a/tests/unit/selectmenu/selectmenu_defaults.js
+++ /dev/null
@@ -1,19 +0,0 @@
-commonWidgetTests( "selectmenu", {
-	defaults: {
-		appendTo: "body",
-		disabled: false,
-		dropdown: true,
-		position: {
-			my: "left top",
-			at: "left bottom",
-			collision: "none"
-		},
-		// callbacks,
-		create: null,
-		open: null,
-		focus: null,
-		select: null,
-		close: null,
-		change: null
-	}
-});
-- 
cgit v1.2.3