Build: Upgrade to qunit-composite 1.1.0

Ref #10119
Closes gh-1528

diff --git a/bower.json b/bower.json
index 543a98db886deb368a31c2fb493ed1868f9d3461..b5b8e4420d06acf5b2bbbadfefbd33cbedaa99f5 100644 (file)
--- a/bower.json
+++ b/bower.json
@@ -17,7 +17,7 @@
                "qunit": "1.18.0",
                "qunit-assert-classes": "0.1.5",
                "qunit-assert-close": "JamesMGreene/qunit-assert-close#v1.1.1",
-               "qunit-composite": "JamesMGreene/qunit-composite#v1.0.4",
+               "qunit-composite": "JamesMGreene/qunit-composite#v1.1.0",
                "requirejs": "2.1.14",
 
                "jquery-1.7.0": "jquery#1.7.0",

diff --git a/external/qunit-composite/qunit-composite.js b/external/qunit-composite/qunit-composite.js
index 6cff04b51321aa858124aa5d1a6d89e2ad53f828..1ffd2eea575a765a64125db61d3bbefab6ce54e2 100644 (file)
--- a/external/qunit-composite/qunit-composite.js
+++ b/external/qunit-composite/qunit-composite.js
@@ -1,5 +1,5 @@
 /**
- * QUnit Composite v1.0.4
+ * QUnit Composite v1.0.5-pre
  *
  * https://github.com/JamesMGreene/qunit-composite
  *
@@ -7,7 +7,13 @@
  * Released under the MIT license.
  * https://jquery.org/license/
  */
-(function( QUnit ) {
+(function( factory ) {
+       if ( typeof define === "function" && define.amd ) {
+               define( [ "qunit" ], factory );
+       } else {
+               factory( QUnit );
+       }
+}(function( QUnit ) {
 var iframe, hasBound,
        modules = 1,
        executingComposite = false;
@@ -60,6 +66,11 @@ function initIframe() {
                        return;
                }
 
+               // Deal with QUnit being loaded asynchronously via AMD
+               if ( !iframeWin.QUnit && iframeWin.define && iframeWin.define.amd ) {
+                       return iframeWin.require( [ "qunit" ], onIframeLoad );
+               }
+
                iframeWin.QUnit.moduleStart(function( data ) {
                        // Capture module name for messages
                        moduleName = data.name;
@@ -181,4 +192,4 @@ QUnit.testDone(function( data ) {
        current.getElementsByTagName( "a" )[ 0 ].href = src;
 });
 
-})( QUnit );
+}));