Skip to content

Commit f499569

Browse files
committed
Build: Upgrade to qunit-composite 1.1.0
Ref #10119 Closes jquerygh-1528
1 parent 4bf80d2 commit f499569

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"qunit": "1.18.0",
1818
"qunit-assert-classes": "0.1.5",
1919
"qunit-assert-close": "JamesMGreene/qunit-assert-close#v1.1.1",
20-
"qunit-composite": "JamesMGreene/qunit-composite#v1.0.4",
20+
"qunit-composite": "JamesMGreene/qunit-composite#v1.1.0",
2121
"requirejs": "2.1.14",
2222

2323
"jquery-1.7.0": "jquery#1.7.0",

external/qunit-composite/qunit-composite.js

+14-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
/**
2-
* QUnit Composite v1.0.4
2+
* QUnit Composite v1.0.5-pre
33
*
44
* https://github.com/JamesMGreene/qunit-composite
55
*
66
* Copyright jQuery Foundation and other contributors
77
* Released under the MIT license.
88
* https://jquery.org/license/
99
*/
10-
(function( QUnit ) {
10+
(function( factory ) {
11+
if ( typeof define === "function" && define.amd ) {
12+
define( [ "qunit" ], factory );
13+
} else {
14+
factory( QUnit );
15+
}
16+
}(function( QUnit ) {
1117
var iframe, hasBound,
1218
modules = 1,
1319
executingComposite = false;
@@ -60,6 +66,11 @@ function initIframe() {
6066
return;
6167
}
6268

69+
// Deal with QUnit being loaded asynchronously via AMD
70+
if ( !iframeWin.QUnit && iframeWin.define && iframeWin.define.amd ) {
71+
return iframeWin.require( [ "qunit" ], onIframeLoad );
72+
}
73+
6374
iframeWin.QUnit.moduleStart(function( data ) {
6475
// Capture module name for messages
6576
moduleName = data.name;
@@ -181,4 +192,4 @@ QUnit.testDone(function( data ) {
181192
current.getElementsByTagName( "a" )[ 0 ].href = src;
182193
});
183194

184-
})( QUnit );
195+
}));

0 commit comments

Comments
 (0)