Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-08 18:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test runner with phantomjs and dojo loader.

Browse Source
This commit is contained in:
John-David Dalton
2013-09-04 21:58:34 -05:00
parent 5f8f5a9f85
commit 3560fed86e
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/index.html
View File

@@ -36,9 +36,9 @@
document.write('<script src="' + (ui.isModularize ? '../lodash.js' : ui.buildPath) + '"><\/script>'); document.write('<script src="' + (ui.isModularize ? '../lodash.js' : ui.buildPath) + '"><\/script>');
// load test.js if not using require.js // load test.js if not using require.js
document.write(ui.urlParams.loader != 'none' document.write(ui.urlParams.loader == 'none'
? '<script data-dojo-config="async:1" src="' + ui.loaderPath + '"><\/script>' ? '<script src="test.js"><\/script>'
: '<script src="test.js"><\/script>' : '<script data-dojo-config="async:1" src="' + ui.loaderPath + '"><\/script>'
); );
</script> </script>
<script> <script>

2
test/test.js
View File

@@ -4656,8 +4656,6 @@
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
// configure QUnit and call `QUnit.start()` for
// Narwhal, Node.js, PhantomJS, Rhino, and RingoJS
if (!document) { if (!document) {
QUnit.config.noglobals = true; QUnit.config.noglobals = true;
QUnit.start(); QUnit.start();

8
vendor/qunit-clib/qunit-clib.js vendored
View File

@@ -276,9 +276,11 @@
context[methodName] = QUnit[methodName]; context[methodName] = QUnit[methodName];
}); });
// must call `QUnit.start()` in the test file if using QUnit < 1.3.0 with // must call `QUnit.start()` in the test file if not loaded in a browser
// Node.js or any version of QUnit with Narwhal, PhantomJS, Rhino, or RingoJS if (!context.document || context.phantom) {
QUnit.init(); QUnit.config.autostart = false;
QUnit.init();
}
} }
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/