File tree 2 files changed +15
-4
lines changed
2 files changed +15
-4
lines changed Original file line number Diff line number Diff line change 17
17
"qunit" : " 1.18.0" ,
18
18
"qunit-assert-classes" : " 0.1.5" ,
19
19
"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 " ,
21
21
"requirejs" : " 2.1.14" ,
22
22
23
23
"jquery-1.7.0" : " jquery#1.7.0" ,
Original file line number Diff line number Diff line change 1
1
/**
2
- * QUnit Composite v1.0.4
2
+ * QUnit Composite v1.0.5-pre
3
3
*
4
4
* https://github.com/JamesMGreene/qunit-composite
5
5
*
6
6
* Copyright jQuery Foundation and other contributors
7
7
* Released under the MIT license.
8
8
* https://jquery.org/license/
9
9
*/
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 ) {
11
17
var iframe , hasBound ,
12
18
modules = 1 ,
13
19
executingComposite = false ;
@@ -60,6 +66,11 @@ function initIframe() {
60
66
return ;
61
67
}
62
68
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
+
63
74
iframeWin . QUnit . moduleStart ( function ( data ) {
64
75
// Capture module name for messages
65
76
moduleName = data . name ;
@@ -181,4 +192,4 @@ QUnit.testDone(function( data ) {
181
192
current . getElementsByTagName ( "a" ) [ 0 ] . href = src ;
182
193
} ) ;
183
194
184
- } ) ( QUnit ) ;
195
+ } ) ) ;
You can’t perform that action at this time.
0 commit comments