diff options
Diffstat (limited to 'tests/unit')
27 files changed, 86 insertions, 60 deletions
diff --git a/tests/unit/accordion/all.html b/tests/unit/accordion/all.html index 3c247cdae..71593dd39 100644 --- a/tests/unit/accordion/all.html +++ b/tests/unit/accordion/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/all.html b/tests/unit/all.html index 22f60f7b5..3a39956f0 100644 --- a/tests/unit/all.html +++ b/tests/unit/all.html @@ -7,9 +7,9 @@ <script src="../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../external/qunit/qunit.js"></script> - <script src="../../external/qunit-composite/qunit-composite.js"></script> + <script src="../lib/vendor/qunit-composite/qunit-composite.js"></script> <script> (function() { diff --git a/tests/unit/autocomplete/all.html b/tests/unit/autocomplete/all.html index 4ff90fe3c..94678956a 100644 --- a/tests/unit/autocomplete/all.html +++ b/tests/unit/autocomplete/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/button/all.html b/tests/unit/button/all.html index c370837b8..2d9f4a396 100644 --- a/tests/unit/button/all.html +++ b/tests/unit/button/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/checkboxradio/all.html b/tests/unit/checkboxradio/all.html index 71a65d9ee..68d599942 100644 --- a/tests/unit/checkboxradio/all.html +++ b/tests/unit/checkboxradio/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/controlgroup/all.html b/tests/unit/controlgroup/all.html index 737144acd..8409dc90c 100644 --- a/tests/unit/controlgroup/all.html +++ b/tests/unit/controlgroup/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/core/all.html b/tests/unit/core/all.html index c7834b81a..1fe23e195 100644 --- a/tests/unit/core/all.html +++ b/tests/unit/core/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/core/selector.js b/tests/unit/core/selector.js index 314cfd570..062c7a6cc 100644 --- a/tests/unit/core/selector.js +++ b/tests/unit/core/selector.js @@ -11,23 +11,39 @@ define( [ QUnit.module( "core - selectors", { afterEach: helper.moduleAfterEach } ); QUnit.assert.isFocusable = function( selector, msg ) { - this.push( $( selector ).is( ":focusable" ), null, null, - msg + " - selector " + selector + " is focusable" ); + this.pushResult( { + result: $( selector ).is( ":focusable" ), + actual: null, + expected: null, + message: msg + " - selector " + selector + " is focusable" + } ); }; QUnit.assert.isNotFocusable = function( selector, msg ) { - this.push( $( selector ).length && !$( selector ).is( ":focusable" ), null, null, - msg + " - selector " + selector + " is not focusable" ); + this.pushResult( { + result: $( selector ).length && !$( selector ).is( ":focusable" ), + actual: null, + expected: null, + message: msg + " - selector " + selector + " is not focusable" + } ); }; QUnit.assert.isTabbable = function( selector, msg ) { - this.push( $( selector ).is( ":tabbable" ), null, null, - msg + " - selector " + selector + " is tabbable" ); + this.pushResult( { + result: $( selector ).is( ":tabbable" ), + actual: null, + expected: null, + message: msg + " - selector " + selector + " is tabbable" + } ); }; QUnit.assert.isNotTabbable = function( selector, msg ) { - this.push( $( selector ).length && !$( selector ).is( ":tabbable" ), null, null, - msg + " - selector " + selector + " is not tabbable" ); + this.pushResult( { + result: $( selector ).length && !$( selector ).is( ":tabbable" ), + actual: null, + expected: null, + message: msg + " - selector " + selector + " is not tabbable" + } ); }; QUnit.test( "data", function( assert ) { diff --git a/tests/unit/datepicker/all.html b/tests/unit/datepicker/all.html index d2299a0f5..b3eb6a31a 100644 --- a/tests/unit/datepicker/all.html +++ b/tests/unit/datepicker/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/dialog/all.html b/tests/unit/dialog/all.html index 009b4a38d..059398995 100644 --- a/tests/unit/dialog/all.html +++ b/tests/unit/dialog/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/draggable/all.html b/tests/unit/draggable/all.html index 9bdc0d881..b785b67ea 100644 --- a/tests/unit/draggable/all.html +++ b/tests/unit/draggable/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/droppable/all.html b/tests/unit/droppable/all.html index 4934e13d1..f6be092ed 100644 --- a/tests/unit/droppable/all.html +++ b/tests/unit/droppable/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/effects/all.html b/tests/unit/effects/all.html index b043b6223..0de2b3798 100644 --- a/tests/unit/effects/all.html +++ b/tests/unit/effects/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/effects/core.js b/tests/unit/effects/core.js index 187f5355a..94321e636 100644 --- a/tests/unit/effects/core.js +++ b/tests/unit/effects/core.js @@ -23,11 +23,21 @@ define( [ "use strict"; QUnit.assert.present = function( value, array, message ) { - this.push( jQuery.inArray( value, array ) !== -1, value, array, message ); + this.pushResult( { + result: jQuery.inArray( value, array ) !== -1, + actual: value, + expected: array, + message: message + } ); }; QUnit.assert.notPresent = function( value, array, message ) { - this.push( jQuery.inArray( value, array ) === -1, value, array, message ); + this.pushResult( { + result: jQuery.inArray( value, array ) === -1, + actual: value, + expected: array, + message: message + } ); }; // MinDuration is used for "short" animate tests where we are only concerned about the final diff --git a/tests/unit/form-reset-mixin/all.html b/tests/unit/form-reset-mixin/all.html index 9acf969e3..38eeca95f 100644 --- a/tests/unit/form-reset-mixin/all.html +++ b/tests/unit/form-reset-mixin/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/menu/all.html b/tests/unit/menu/all.html index b8f7b3f37..f01c3ad39 100644 --- a/tests/unit/menu/all.html +++ b/tests/unit/menu/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/position/all.html b/tests/unit/position/all.html index 82e5cd9bc..43ad67386 100644 --- a/tests/unit/position/all.html +++ b/tests/unit/position/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/progressbar/all.html b/tests/unit/progressbar/all.html index b20bdd27e..ba2d79931 100644 --- a/tests/unit/progressbar/all.html +++ b/tests/unit/progressbar/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/resizable/all.html b/tests/unit/resizable/all.html index 486f26696..f219a5967 100644 --- a/tests/unit/resizable/all.html +++ b/tests/unit/resizable/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/selectable/all.html b/tests/unit/selectable/all.html index 6f5cc5760..92dcbc730 100644 --- a/tests/unit/selectable/all.html +++ b/tests/unit/selectable/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/selectmenu/all.html b/tests/unit/selectmenu/all.html index d4e339f96..f9eabaf9a 100644 --- a/tests/unit/selectmenu/all.html +++ b/tests/unit/selectmenu/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/slider/all.html b/tests/unit/slider/all.html index 17d375ab4..aeff8d08d 100644 --- a/tests/unit/slider/all.html +++ b/tests/unit/slider/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/sortable/all.html b/tests/unit/sortable/all.html index cb08860bc..8841e9ccd 100644 --- a/tests/unit/sortable/all.html +++ b/tests/unit/sortable/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/spinner/all.html b/tests/unit/spinner/all.html index 2c64e1dce..b8269074b 100644 --- a/tests/unit/spinner/all.html +++ b/tests/unit/spinner/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/tabs/all.html b/tests/unit/tabs/all.html index 25f7bf3fd..81f54ce75 100644 --- a/tests/unit/tabs/all.html +++ b/tests/unit/tabs/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/tooltip/all.html b/tests/unit/tooltip/all.html index e87a76203..d0470c064 100644 --- a/tests/unit/tooltip/all.html +++ b/tests/unit/tooltip/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> diff --git a/tests/unit/widget/all.html b/tests/unit/widget/all.html index 7ef570bd1..336c8347a 100644 --- a/tests/unit/widget/all.html +++ b/tests/unit/widget/all.html @@ -7,9 +7,9 @@ <script src="../../../external/jquery/jquery.js"></script> <link rel="stylesheet" href="../../../external/qunit/qunit.css"> - <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css"> + <link rel="stylesheet" href="../../lib/vendor/qunit-composite/qunit-composite.css"> <script src="../../../external/qunit/qunit.js"></script> - <script src="../../../external/qunit-composite/qunit-composite.js"></script> + <script src="../../lib/vendor/qunit-composite/qunit-composite.js"></script> <script src="../subsuite.js"></script> <script> |