aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2015-04-06 09:51:10 -0400
committerScott González <scott.gonzalez@gmail.com>2015-04-07 09:03:36 -0400
commit500f6b4992f8a113d7c88f4063b75923fe92663b (patch)
tree8179b72b38ddfcff5c693ec2c613e7e122fa3f84 /tests/unit
parentbf03479cc14aa54c2e674cad87bf75c8126cb86f (diff)
downloadjquery-ui-500f6b4992f8a113d7c88f4063b75923fe92663b.tar.gz
jquery-ui-500f6b4992f8a113d7c88f4063b75923fe92663b.zip
Tests: Switch to the new qunit-composite module
This module was created from our existing implementation. Closes gh-1532
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/accordion/all.html4
-rw-r--r--tests/unit/all.html4
-rw-r--r--tests/unit/autocomplete/all.html4
-rw-r--r--tests/unit/button/all.html4
-rw-r--r--tests/unit/core/all.html4
-rw-r--r--tests/unit/datepicker/all.html4
-rw-r--r--tests/unit/dialog/all.html4
-rw-r--r--tests/unit/draggable/all.html4
-rw-r--r--tests/unit/droppable/all.html4
-rw-r--r--tests/unit/effects/all.html4
-rw-r--r--tests/unit/menu/all.html4
-rw-r--r--tests/unit/position/all.html4
-rw-r--r--tests/unit/progressbar/all.html4
-rw-r--r--tests/unit/qunit-composite.css13
-rw-r--r--tests/unit/qunit-composite.js112
-rw-r--r--tests/unit/resizable/all.html4
-rw-r--r--tests/unit/selectable/all.html4
-rw-r--r--tests/unit/selectmenu/all.html4
-rw-r--r--tests/unit/slider/all.html4
-rw-r--r--tests/unit/sortable/all.html4
-rw-r--r--tests/unit/spinner/all.html4
-rw-r--r--tests/unit/tabs/all.html4
-rw-r--r--tests/unit/tooltip/all.html4
-rw-r--r--tests/unit/widget/all.html4
24 files changed, 44 insertions, 169 deletions
diff --git a/tests/unit/accordion/all.html b/tests/unit/accordion/all.html
index 7b0bf8558..3c247cdae 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 043304f76..712887f63 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="qunit-composite.css">
+ <link rel="stylesheet" href="../../external/qunit-composite/qunit-composite.css">
<script src="../../external/qunit/qunit.js"></script>
- <script src="qunit-composite.js"></script>
+ <script src="../../external/qunit-composite/qunit-composite.js"></script>
<script>
(function() {
diff --git a/tests/unit/autocomplete/all.html b/tests/unit/autocomplete/all.html
index 854b2beb4..4ff90fe3c 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 33b1ad457..c370837b8 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 fc8d2eadb..c7834b81a 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/qunit-composite/qunit-composite.js"></script>
<script src="../subsuite.js"></script>
<script>
diff --git a/tests/unit/datepicker/all.html b/tests/unit/datepicker/all.html
index 65398542a..d2299a0f5 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 b298c2c30..009b4a38d 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 ae2fe4f12..9bdc0d881 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 b8be47d0d..4934e13d1 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 54752f594..b043b6223 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 b1631496d..b8f7b3f37 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 f2dfa779c..82e5cd9bc 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 c8cfc824d..b20bdd27e 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/qunit-composite/qunit-composite.js"></script>
<script src="../subsuite.js"></script>
<script>
diff --git a/tests/unit/qunit-composite.css b/tests/unit/qunit-composite.css
deleted file mode 100644
index c530436da..000000000
--- a/tests/unit/qunit-composite.css
+++ /dev/null
@@ -1,13 +0,0 @@
-iframe.qunit-subsuite {
- position: fixed;
- bottom: 0;
- left: 0;
-
- margin: 0;
- padding: 0;
- border-width: 1px 0 0;
- height: 45%;
- width: 100%;
-
- background: #fff;
-}
diff --git a/tests/unit/qunit-composite.js b/tests/unit/qunit-composite.js
deleted file mode 100644
index 2e5454056..000000000
--- a/tests/unit/qunit-composite.js
+++ /dev/null
@@ -1,112 +0,0 @@
-(function( QUnit ) {
-
-QUnit.extend( QUnit, {
- testSuites: function( suites ) {
- QUnit.begin(function() {
- QUnit.initIframe();
- });
-
- for ( var i = 0; i < suites.length; i++ ) {
- QUnit.runSuite( suites[i] );
- }
-
- QUnit.done(function() {
- this.iframe.style.display = "none";
- });
- },
-
- runSuite: function( suite ) {
- var path = suite;
-
- if ( QUnit.is( "object", suite ) ) {
- path = suite.path;
- suite = suite.name;
- }
-
- asyncTest( suite, function() {
- QUnit.iframe.setAttribute( "src", path );
- });
- },
-
- initIframe: function() {
- var body = document.body,
- iframe = this.iframe = document.createElement( "iframe" ),
- iframeWin;
-
- iframe.className = "qunit-subsuite";
- body.appendChild( iframe );
-
- function onIframeLoad() {
- var module, test,
- count = 0;
-
- if (iframe.src === "") {
- return;
- }
-
- iframeWin.QUnit.moduleStart(function( data ) {
- // capture module name for messages
- module = data.name;
- });
-
- iframeWin.QUnit.testStart(function( data ) {
- // capture test name for messages
- test = data.name;
- });
- iframeWin.QUnit.testDone(function() {
- test = null;
- });
-
- iframeWin.QUnit.log(function( data ) {
- if (test === null) {
- return;
- }
- // pass all test details through to the main page
- var message = module + ": " + test + ": " + data.message;
- expect( ++count );
- QUnit.push( data.result, data.actual, data.expected, message );
- });
-
- iframeWin.QUnit.done(function() {
- // start the wrapper test from the main page
- start();
- });
- }
- QUnit.addEvent( iframe, "load", onIframeLoad );
-
- iframeWin = iframe.contentWindow;
- }
-});
-
-QUnit.testStart(function( data ) {
- // update the test status to show which test suite is running
- QUnit.id( "qunit-testresult" ).innerHTML = "Running " + data.name + "...<br>&nbsp;";
-});
-
-QUnit.testDone(function() {
- var i,
- current = QUnit.id( this.config.current.id ),
- children = current.children,
- src = this.iframe.src;
-
- // undo the auto-expansion of failed tests
- for ( i = 0; i < children.length; i++ ) {
- if ( children[i].nodeName === "OL" ) {
- children[i].style.display = "none";
- }
- }
-
- QUnit.addEvent(current, "dblclick", function( e ) {
- var target = e && e.target ? e.target : window.event.srcElement;
- if ( target.nodeName.toLowerCase() === "span" || target.nodeName.toLowerCase() === "b" ) {
- target = target.parentNode;
- }
- if ( window.location && target.nodeName.toLowerCase() === "strong" ) {
- window.location = src;
- }
- });
-
- current.getElementsByTagName("a")[0].href = src;
-});
-
-}( QUnit ) );
diff --git a/tests/unit/resizable/all.html b/tests/unit/resizable/all.html
index 1c4116175..486f26696 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 bbaaac6f4..6f5cc5760 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 9e4ffd77a..d4e339f96 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 244b4f4f9..17d375ab4 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 cabaea469..cb08860bc 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 2778110f0..2c64e1dce 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 8101bf34f..25f7bf3fd 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 db33226a8..e87a76203 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/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 b9dbb770c..7ef570bd1 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="../qunit-composite.css">
+ <link rel="stylesheet" href="../../../external/qunit-composite/qunit-composite.css">
<script src="../../../external/qunit/qunit.js"></script>
- <script src="../qunit-composite.js"></script>
+ <script src="../../../external/qunit-composite/qunit-composite.js"></script>
<script src="../subsuite.js"></script>
<script>