Skip to content
Permalink
Browse files

Build: Upgrade to qunit-composite 1.1.0

Ref #10119
Closes gh-1528
  • Loading branch information...
scottgonzalez committed Apr 9, 2015
1 parent 4bf80d2 commit f499569bffae60a6a7161eb2e13ec409afb98450
Showing with 15 additions and 4 deletions.
  1. +1 −1 bower.json
  2. +14 −3 external/qunit-composite/qunit-composite.js
@@ -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",
@@ -1,13 +1,19 @@
/**
* QUnit Composite v1.0.4
* QUnit Composite v1.0.5-pre
*
* https://github.com/JamesMGreene/qunit-composite
*
* Copyright jQuery Foundation and other contributors
* 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 );
}));

0 comments on commit f499569

Please sign in to comment.
You can’t perform that action at this time.