Merged in /branches/dev r3251:3620 (excluding autocomplete, modal, tooltip, menu; including menu static tests).

2 files changed, 8 insertions, 7 deletions

diff --git a/tests/unit/accordion/accordion_core.js b/tests/unit/accordion/accordion_core.js
index 797ead864..47d2509e6 100644
--- a/tests/unit/accordion/accordion_core.js
+++ b/tests/unit/accordion/accordion_core.js
@@ -5,7 +5,7 @@
 
 (function($) {
 
-jQuery.ui.accordion.defaults.animated = false;
+$.ui.accordion.prototype.options.animated = false;
 
 function state(accordion) {
 	var args = $.makeArray(arguments).slice(1);
diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js
index b77cb787e..ddb2c38cb 100644
--- a/tests/unit/accordion/accordion_options.js
+++ b/tests/unit/accordion/accordion_options.js
@@ -127,19 +127,20 @@ test("{ header: '> li > :first-child,> :not(li):even' }, default", function() {
 });
 
 test("{ icons: false }", function() {
+	var list = $("#list1");
 	function icons(on) {
-		same($("#list1 span.ui-icon").length, on ? 3 : 0);
-		same( $("#list1").hasClass("ui-accordion-icons"), on );
+		same($("span.ui-icon", list).length, on ? 3 : 0);
+		same( list.hasClass("ui-accordion-icons"), on );
 	}
-	$("#list1").accordion();
+	list.accordion();
 	icons(true);
-	$("#list1").accordion("destroy").accordion({
+	list.accordion("destroy").accordion({
 		icons: false
 	});
 	icons(false);
-	$("#list1").accordion("option", "icons", $.ui.accordion.defaults.icons);
+	list.accordion("option", "icons", $.ui.accordion.prototype.options.icons);
 	icons(true);
-	$("#list1").accordion("option", "icons", false);
+	list.accordion("option", "icons", false);
 	icons(false);
 });