]> source.dussan.org Git - jquery-ui.git/commitdiff
projects / jquery-ui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7d48112)
Tooltip: Convert tests to new infrastructure
authorScott González <scott.gonzalez@gmail.com>
Tue, 7 Apr 2015 00:28:55 +0000 (20:28 -0400)
committerScott González <scott.gonzalez@gmail.com>
Thu, 9 Apr 2015 13:26:27 +0000 (09:26 -0400)
Ref #10119
Ref gh-1528

tests/unit/tooltip/tooltip.html patch | blob | history
tests/unit/tooltip/tooltip_common.js patch | blob | history
tests/unit/tooltip/tooltip_common_deprecated.js patch | blob | history
tests/unit/tooltip/tooltip_core.js patch | blob | history
tests/unit/tooltip/tooltip_deprecated.html patch | blob | history
tests/unit/tooltip/tooltip_deprecated.js patch | blob | history
tests/unit/tooltip/tooltip_events.js patch | blob | history
tests/unit/tooltip/tooltip_methods.js patch | blob | history
tests/unit/tooltip/tooltip_options.js patch | blob | history

diff --git a/tests/unit/tooltip/tooltip.html b/tests/unit/tooltip/tooltip.html
index 1a7b94ae22cfb88b830c86d85d6973e3385ad17b..1f0adc9f4626ae756d0a4a6f88adf1e731c8a775 100644 (file)
--- a/tests/unit/tooltip/tooltip.html
+++ b/tests/unit/tooltip/tooltip.html
@@ -4,34 +4,8 @@
        <meta charset="utf-8">
        <title>jQuery UI Tooltip Test Suite</title>
 
-       <script src="../../jquery.js"></script>
-       <script>
-       $.uiBackCompat = false;
-       </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", "tooltip" ],
-               js: [
-                       "ui/core.js",
-                       "ui/widget.js",
-                       "ui/position.js",
-                       "ui/tooltip.js"
-               ]
-       });
-       </script>
-
-       <script src="tooltip_common.js"></script>
-       <script src="tooltip_core.js"></script>
-       <script src="tooltip_events.js"></script>
-       <script src="tooltip_methods.js"></script>
-       <script src="tooltip_options.js"></script>
-
-       <script src="../swarminject.js"></script>
+       <script src="../../lib/css.js" data-modules="core tooltip"></script>
+       <script src="../../lib/bootstrap.js" data-widget="tooltip" data-no-back-compat="true"></script>
 </head>
 <body>
 
diff --git a/tests/unit/tooltip/tooltip_common.js b/tests/unit/tooltip/tooltip_common.js
index 87e73f7ea6c4acbf76a6502a3a0ed1dcd23c00c0..f8045fc334080fe543bb9150bdf98be7b9413300 100644 (file)
--- a/tests/unit/tooltip/tooltip_common.js
+++ b/tests/unit/tooltip/tooltip_common.js
@@ -1,4 +1,9 @@
-TestHelpers.commonWidgetTests( "tooltip", {
+define( [
+       "lib/common",
+       "ui/tooltip"
+], function( common ) {
+
+common.testWidget( "tooltip", {
        defaults: {
                classes: {
                        "ui-tooltip": "ui-corner-all ui-widget-shadow"
@@ -21,3 +26,5 @@ TestHelpers.commonWidgetTests( "tooltip", {
                open: null
        }
 });
+
+} );
diff --git a/tests/unit/tooltip/tooltip_common_deprecated.js b/tests/unit/tooltip/tooltip_common_deprecated.js
index 6ea0e65ffbbad8bd7dc2a0a9636de01afe1f43b9..d32e7656d3d52e97a3c25c525cb2e195fc5f1bc8 100644 (file)
--- a/tests/unit/tooltip/tooltip_common_deprecated.js
+++ b/tests/unit/tooltip/tooltip_common_deprecated.js
@@ -1,4 +1,9 @@
-TestHelpers.commonWidgetTests( "tooltip", {
+define( [
+       "lib/common",
+       "ui/tooltip"
+], function( common ) {
+
+common.testWidget( "tooltip", {
        defaults: {
                classes: {
                        "ui-tooltip": "ui-corner-all ui-widget-shadow"
@@ -22,3 +27,5 @@ TestHelpers.commonWidgetTests( "tooltip", {
                open: null
        }
 });
+
+} );
diff --git a/tests/unit/tooltip/tooltip_core.js b/tests/unit/tooltip/tooltip_core.js
index d4520a4ea682eb3f7c0b7f3f658d4a27ab5e4459..fa24d72ce71eb3af612d3585f15254e15c839750 100644 (file)
--- a/tests/unit/tooltip/tooltip_core.js
+++ b/tests/unit/tooltip/tooltip_core.js
@@ -1,4 +1,7 @@
-(function( $ ) {
+define( [
+       "jquery",
+       "ui/tooltip"
+], function( $ ) {
 
 module( "tooltip: core" );
 
@@ -218,4 +221,4 @@ asyncTest( "multiple active delegated tooltips", function() {
        step1();
 });
 
-}( jQuery ) );
+} );
diff --git a/tests/unit/tooltip/tooltip_deprecated.html b/tests/unit/tooltip/tooltip_deprecated.html
index 813768337fb7caba8fba68b11634d32af444b5ea..d21fea57b338dcf9cd5a481bc1269a1f71ef43e5 100644 (file)
--- a/tests/unit/tooltip/tooltip_deprecated.html
+++ b/tests/unit/tooltip/tooltip_deprecated.html
@@ -4,32 +4,8 @@
        <meta charset="utf-8">
        <title>jQuery UI Tooltip 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", "tooltip" ],
-               js: [
-                       "ui/core.js",
-                       "ui/widget.js",
-                       "ui/position.js",
-                       "ui/tooltip.js"
-               ]
-       });
-       </script>
-
-       <script src="tooltip_common_deprecated.js"></script>
-       <script src="tooltip_core.js"></script>
-       <script src="tooltip_events.js"></script>
-       <script src="tooltip_methods.js"></script>
-       <script src="tooltip_options.js"></script>
-       <script src="tooltip_deprecated.js"></script>
-
-       <script src="../swarminject.js"></script>
+       <script src="../../lib/css.js" data-modules="core tooltip"></script>
+       <script src="../../lib/bootstrap.js" data-widget="tooltip" data-deprecated="true"></script>
 </head>
 <body>
 
diff --git a/tests/unit/tooltip/tooltip_deprecated.js b/tests/unit/tooltip/tooltip_deprecated.js
index a53a2705091058778b1ac5d3cbaba8f704d804aa..057171ee26223fd5715d9652321691094040383e 100644 (file)
--- a/tests/unit/tooltip/tooltip_deprecated.js
+++ b/tests/unit/tooltip/tooltip_deprecated.js
@@ -1,4 +1,7 @@
-(function( $ ) {
+define( [
+       "jquery",
+       "ui/tooltip"
+], function( $ ) {
 
 module( "tooltip: (deprecated) options" );
 
@@ -10,4 +13,4 @@ test( "tooltipClass", function( assert ) {
        assert.hasClasses( $( "#" + element.data( "ui-tooltip-id" ) ), "custom" );
 });
 
-}( jQuery ) );
+} );
diff --git a/tests/unit/tooltip/tooltip_events.js b/tests/unit/tooltip/tooltip_events.js
index de16471aedf09205f15affe8e96b6c550ac494d2..a953c6e9140888dacea50ed4d6ed6bad16a14650 100644 (file)
--- a/tests/unit/tooltip/tooltip_events.js
+++ b/tests/unit/tooltip/tooltip_events.js
@@ -1,4 +1,7 @@
-(function( $ ) {
+define( [
+       "jquery",
+       "ui/tooltip"
+], function( $ ) {
 
 module( "tooltip: events" );
 
@@ -54,4 +57,4 @@ test( "focus events", function() {
        element.trigger( "focusout" );
 });
 
-}( jQuery ) );
+} );
diff --git a/tests/unit/tooltip/tooltip_methods.js b/tests/unit/tooltip/tooltip_methods.js
index f027d5226204027207a00ceee16ff60db5d539f7..3db7b8f7c069ae45b19fe8fdee6b11dbc9eb7cd2 100644 (file)
--- a/tests/unit/tooltip/tooltip_methods.js
+++ b/tests/unit/tooltip/tooltip_methods.js
@@ -1,17 +1,20 @@
-(function( $ ) {
+define( [
+       "jquery",
+       "ui/tooltip"
+], function( $ ) {
 
 module( "tooltip: methods" );
 
-test( "destroy", function() {
+test( "destroy", function( assert ) {
        expect( 3 );
        var element = $( "#tooltipped1" );
 
-       domEqual( "#tooltipped1", function() {
+       assert.domEqual( "#tooltipped1", function() {
                element.tooltip().tooltip( "destroy" );
        });
 
        // make sure that open tooltips are removed on destroy
-       domEqual( "#tooltipped1", function() {
+       assert.domEqual( "#tooltipped1", function() {
                element
                        .tooltip()
                        .tooltip( "open", $.Event( "mouseover", { target: element[0] }) )
@@ -133,4 +136,4 @@ test( "preserve changes to title attributes on close and destroy", function() {
        } );
 });
 
-}( jQuery ) );
+} );
diff --git a/tests/unit/tooltip/tooltip_options.js b/tests/unit/tooltip/tooltip_options.js
index 1d9d6b3f09d5b0da99c9885ad305e3d3d206f46b..d091e3bad4d5633baa6de87b81cbc2f2829aff60 100644 (file)
--- a/tests/unit/tooltip/tooltip_options.js
+++ b/tests/unit/tooltip/tooltip_options.js
@@ -1,4 +1,7 @@
-(function( $ ) {
+define( [
+       "jquery",
+       "ui/tooltip"
+], function( $ ) {
 
 module( "tooltip: options" );
 
@@ -209,4 +212,4 @@ test( "track and programmatic focus", function() {
        equal( "inputtitle", $( ".ui-tooltip" ).text() );
 });
 
-}( jQuery ) );
+} );
The official jQuery user interface library: https://github.com/jquery/jquery-ui