Merge branch 'accordion-cleanup'

3 files changed, 9 insertions, 4 deletions

diff --git a/tests/unit/accordion/accordion_methods.js b/tests/unit/accordion/accordion_methods.js
index 9f61647c4..2f4722070 100644
--- a/tests/unit/accordion/accordion_methods.js
+++ b/tests/unit/accordion/accordion_methods.js
@@ -10,15 +10,19 @@ test( "destroy", function() {
 });
 
 test( "enable/disable", function() {
-	expect( 3 );
+	expect( 4 );
 	var element = $( "#list1" ).accordion();
 	accordion_state( element, 1, 0, 0 );
 	element.accordion( "disable" );
-	element.accordion( "option", "active", 1 );
+	// event does nothing
+	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "click" );
 	accordion_state( element, 1, 0, 0 );
-	element.accordion( "enable" );
+	// option still works
 	element.accordion( "option", "active", 1 );
 	accordion_state( element, 0, 1, 0 );
+	element.accordion( "enable" );
+	element.accordion( "option", "active", 2 );
+	accordion_state( element, 0, 0, 1 );
 });
 
 test( "refresh", function() {
diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js
index 8206b1d62..74a9a3177 100644
--- a/tests/unit/accordion/accordion_options.js
+++ b/tests/unit/accordion/accordion_options.js
@@ -152,6 +152,7 @@ test( "{ event: custom }", function() {
 
 	// ensure old event handlers are unbound
 	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom1" );
+	element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "custom2" );
 	equal( element.accordion( "option", "active" ), 2 );
 	accordion_state( element, 0, 0, 1 );
 
diff --git a/tests/unit/accordion/accordion_test_helpers.js b/tests/unit/accordion/accordion_test_helpers.js
index 7b316e983..542809ea0 100644
--- a/tests/unit/accordion/accordion_test_helpers.js
+++ b/tests/unit/accordion/accordion_test_helpers.js
@@ -3,7 +3,7 @@ function accordion_state( accordion ) {
 	var actual = accordion.find( ".ui-accordion-content" ).map(function() {
 		return $( this ).css( "display" ) === "none" ? 0 : 1;
 	}).get();
-	deepEqual( actual, expected );
+	QUnit.push( QUnit.equiv(actual, expected), actual, expected );
 }
 
 function accordion_equalHeights( accordion, min, max ) {