Tests: Widget test helpers extend the main helper

Ref #10119 Ref gh-1528
jquery · Apr 7, 2015 · dc4b015a8b9acdb5bff2d5dd89737b3d8b64097f · dc4b015
1 parent 42566bd
commit dc4b015a8b9acdb5bff2d5dd89737b3d8b64097f
diff --git a/tests/unit/accordion/accordion_core.js b/tests/unit/accordion/accordion_core.js
@@ -2,10 +2,10 @@ define( [
 	"jquery",
 	"./accordion_test_helpers",
 	"ui/accordion"
-  
-], function( $, accordionTestHelper ) {
+  
+], function( $, testHelper ) {
-  
-var setupTeardown = accordionTestHelper.setupTeardown,
-  
-	state = accordionTestHelper.state;
+  
+var setupTeardown = testHelper.setupTeardown,
+  
+	state = testHelper.state;
 module( "accordion: core", setupTeardown() );

diff --git a/tests/unit/accordion/accordion_events.js b/tests/unit/accordion/accordion_events.js
@@ -2,10 +2,10 @@ define( [
 	"jquery",
 	"./accordion_test_helpers",
 	"ui/accordion"
-  
-], function( $, accordionTestHelper ) {
+  
+], function( $, testHelper ) {
-  
-var setupTeardown = accordionTestHelper.setupTeardown,
-  
-	state = accordionTestHelper.state;
+  
+var setupTeardown = testHelper.setupTeardown,
+  
+	state = testHelper.state;
 module( "accordion: events", setupTeardown() );

diff --git a/tests/unit/accordion/accordion_methods.js b/tests/unit/accordion/accordion_methods.js
@@ -2,11 +2,11 @@ define( [
 	"jquery",
 	"./accordion_test_helpers",
 	"ui/accordion"
-  
-], function( $, accordionTestHelper ) {
+  
+], function( $, testHelper ) {
-  
-var equalHeight = accordionTestHelper.equalHeight,
-  
-	setupTeardown = accordionTestHelper.setupTeardown,
-  
-	state = accordionTestHelper.state;
+  
+var equalHeight = testHelper.equalHeight,
+  
+	setupTeardown = testHelper.setupTeardown,
+  
+	state = testHelper.state;
 module( "accordion: methods", setupTeardown() );

diff --git a/tests/unit/accordion/accordion_options.js b/tests/unit/accordion/accordion_options.js
@@ -2,11 +2,11 @@ define( [
 	"jquery",
 	"./accordion_test_helpers",
 	"ui/accordion"
-  
-], function( $, accordionTestHelper ) {
+  
+], function( $, testHelper ) {
-  
-var equalHeight = accordionTestHelper.equalHeight,
-  
-	setupTeardown = accordionTestHelper.setupTeardown,
-  
-	state = accordionTestHelper.state;
+  
+var equalHeight = testHelper.equalHeight,
+  
+	setupTeardown = testHelper.setupTeardown,
+  
+	state = testHelper.state;
 module( "accordion: options", setupTeardown() );

diff --git a/tests/unit/accordion/accordion_test_helpers.js b/tests/unit/accordion/accordion_test_helpers.js
@@ -1,6 +1,10 @@
-  
-define( function() {
+  
+define( [
+  
+	"jquery",
+  
+	"lib/helper",
+  
+	"ui/accordion"
+  
+], function( $, helper ) {
-  
-return {
+  
+return $.extend( helper, {
 	equalHeight: function( accordion, height ) {
 		accordion.find( ".ui-accordion-content" ).each(function() {
 			equal( $( this ).outerHeight(), height );
@@ -26,7 +30,6 @@ return {
 			}).get();
 		QUnit.push( QUnit.equiv(actual, expected), actual, expected );
 	}
-  
-
-  
-};
+  
+} );
 } );