Fix test runner with phantomjs and dojo loader.

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

View File

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

View File

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