Menu: Convert tests to new infrastructure

Ref #10119
Ref gh-1528

diff --git a/tests/unit/menu/menu.html b/tests/unit/menu/menu.html
index 114382587c5e3253790cff7072d94d964c05a491..5f11f441414ebdede03efaec414406c0cacef3e8 100644 (file)
--- a/tests/unit/menu/menu.html
+++ b/tests/unit/menu/menu.html
@@ -4,31 +4,8 @@
        <meta charset="utf-8">
        <title>jQuery UI Menu Test Suite</title>
 
-       <script src="../../jquery.js"></script>
-       <link rel="stylesheet" href="../../../external/qunit/qunit.css">
-       <script src="../../../external/qunit/qunit.js"></script>
-       <script src="../../../external/jquery-simulate/jquery.simulate.js"></script>
-       <script src="../testsuite.js"></script>
-       <script src="../../../external/qunit-assert-classes/qunit-assert-classes.js"></script>
-       <script>
-       TestHelpers.loadResources({
-               css: [ "core", "menu" ],
-               js: [
-                       "ui/core.js",
-                       "ui/widget.js",
-                       "ui/menu.js"
-               ]
-       });
-       </script>
-
-       <script src="menu_test_helpers.js"></script>
-       <script src="menu_common.js"></script>
-       <script src="menu_core.js"></script>
-       <script src="menu_events.js"></script>
-       <script src="menu_methods.js"></script>
-       <script src="menu_options.js"></script>
-
-       <script src="../swarminject.js"></script>
+       <script src="../../lib/css.js" data-modules="core menu"></script>
+       <script src="../../lib/bootstrap.js" data-widget="menu"></script>
        <style>
        .ui-menu {
                font-size: 15px;

diff --git a/tests/unit/menu/menu_common.js b/tests/unit/menu/menu_common.js
index 942e9e9f954e95dca38da5ac3b94b4d035eca7e6..0f0a04de8801f7fa1b2360d03c120e97227e3478 100644 (file)
--- a/tests/unit/menu/menu_common.js
+++ b/tests/unit/menu/menu_common.js
@@ -1,4 +1,9 @@
-TestHelpers.commonWidgetTests( "menu", {
+define( [
+       "lib/common",
+       "ui/menu"
+], function( common ) {
+
+common.testWidget( "menu", {
        defaults: {
                classes: {},
                disabled: false,
@@ -20,3 +25,5 @@ TestHelpers.commonWidgetTests( "menu", {
                select: null
        }
 });
+
+} );

diff --git a/tests/unit/menu/menu_core.js b/tests/unit/menu/menu_core.js
index 9c3ba873a665fc46782344440b454a83b98e1f0a..3dd2c78e13faf549ff5e2c256cf53a8d0700d7ff 100644 (file)
--- a/tests/unit/menu/menu_core.js
+++ b/tests/unit/menu/menu_core.js
@@ -1,4 +1,8 @@
-(function( $ ) {
+define( [
+       "jquery",
+       "./menu_test_helpers",
+       "ui/menu"
+], function( $, menuTestHelpers ) {
 
 module( "menu: core" );
 
@@ -47,7 +51,7 @@ asyncTest( "#9044: Autofocus issue with dialog opened from menu widget", functio
                $( "#test9044" ).focus();
        });
 
-       TestHelpers.menu.click( element, "3" );
+       menuTestHelpers.click( element, "3" );
        setTimeout( function() {
                equal( document.activeElement.id, "test9044", "Focus was swallowed by menu" );
                $( "#test9044" ).remove();
@@ -69,4 +73,4 @@ asyncTest( "#9532: Need a way in Menu to keep ui-state-active class on selected
        });
 });
 
-})( jQuery );
+} );

diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js
index bda2d60500be08653ae5393b5e38d91a9c56fc15..9aed1839cff2ad20f67c69620c0107a1b194f6a0 100644 (file)
--- a/tests/unit/menu/menu_events.js
+++ b/tests/unit/menu/menu_events.js
@@ -1,12 +1,16 @@
-(function( $ ) {
+define( [
+       "jquery",
+       "./menu_test_helpers",
+       "ui/menu"
+], function( $, menuTestHelpers ) {
 
-var log = TestHelpers.menu.log,
-       logOutput = TestHelpers.menu.logOutput,
-       click = TestHelpers.menu.click;
+var log = menuTestHelpers.log,
+       logOutput = menuTestHelpers.logOutput,
+       click = menuTestHelpers.click;
 
 module( "menu: events", {
        setup: function() {
-               TestHelpers.menu.clearLog();
+               menuTestHelpers.clearLog();
        }
 });
 
@@ -730,4 +734,4 @@ asyncTest( "#10571: When typing in a menu, only menu-items should be focused", f
        });
 });
 
-})( jQuery );
+} );

diff --git a/tests/unit/menu/menu_methods.js b/tests/unit/menu/menu_methods.js
index 840ccbd1737bdd129e962a1ff6e8b4fb80df5be6..ad30e5f138cbafc0cccbd263f4b108af68b2931d 100644 (file)
--- a/tests/unit/menu/menu_methods.js
+++ b/tests/unit/menu/menu_methods.js
@@ -1,21 +1,25 @@
-(function( $ ) {
+define( [
+       "jquery",
+       "./menu_test_helpers",
+       "ui/menu"
+], function( $, menuTestHelpers ) {
 
-var log = TestHelpers.menu.log,
-       logOutput = TestHelpers.menu.logOutput,
-       click = TestHelpers.menu.click;
+var log = menuTestHelpers.log,
+       logOutput = menuTestHelpers.logOutput,
+       click = menuTestHelpers.click;
 
 module( "menu: methods", {
        setup: function() {
-               TestHelpers.menu.clearLog();
+               menuTestHelpers.clearLog();
        }
 });
 
-test( "destroy", function() {
+test( "destroy", function( assert ) {
        expect( 2 );
-       domEqual( "#menu2", function() {
+       assert.domEqual( "#menu2", function() {
                $( "#menu2" ).menu().menu( "destroy" );
        });
-       domEqual( "#menu5", function() {
+       assert.domEqual( "#menu5", function() {
                $( "#menu5").menu().menu( "destroy" );
        });
 });
@@ -109,4 +113,4 @@ test( "widget", function() {
 
 // TODO: test select method
 
-})( jQuery );
+} );

diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/menu_options.js
index 3df5473348d4f3bd72e59d04a1fc54a094e00197..91630e14b200432872142fa8e1732e21e20976ee 100644 (file)
--- a/tests/unit/menu/menu_options.js
+++ b/tests/unit/menu/menu_options.js
@@ -1,12 +1,16 @@
-(function( $ ) {
+define( [
+       "jquery",
+       "./menu_test_helpers",
+       "ui/menu"
+], function( $, menuTestHelpers ) {
 
-var log = TestHelpers.menu.log,
-       logOutput = TestHelpers.menu.logOutput,
-       click = TestHelpers.menu.click;
+var log = menuTestHelpers.log,
+       logOutput = menuTestHelpers.logOutput,
+       click = menuTestHelpers.click;
 
 module( "menu: options", {
        setup: function() {
-               TestHelpers.menu.clearLog();
+               menuTestHelpers.clearLog();
        }
 });
 
@@ -118,4 +122,4 @@ test( "{ role: null }", function( assert ) {
        });
 });
 
-})( jQuery );
+} );

diff --git a/tests/unit/menu/menu_test_helpers.js b/tests/unit/menu/menu_test_helpers.js
index ea273c765bfad2cdbdc8c24715f1536cc2d5e1f3..bfed14d74032d444ba5d83088ce4f2031c8fd213 100644 (file)
--- a/tests/unit/menu/menu_test_helpers.js
+++ b/tests/unit/menu/menu_test_helpers.js
@@ -1,9 +1,9 @@
-(function() {
+define( function() {
 
 var lastItem,
        log = [];
 
-TestHelpers.menu = {
+return {
        log: function( message, clear ) {
                if ( clear ) {
                        log.length = 0;
@@ -30,4 +30,4 @@ TestHelpers.menu = {
        }
 };
 
-})();
+} );