-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Preserve Qunit autostart configuration
- Loading branch information
1 parent
5ac8583
commit 384f632
Showing
2 changed files
with
5 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,11 +22,7 @@ function cliFinish() { | |
blanket.onTestsDone = cliFinish; | ||
|
||
if (typeof(QUnit) === 'object') { | ||
// I'm not sure which ember-cli release introduced this behavior, | ||
// but QUnit.start() is called by the ember-cli framework as of | ||
// [email protected] and causes a conflict if QUnit.start() is | ||
// called again here | ||
// QUnit.start(); | ||
QUnit.config.autostart = window._$blanket_qunit.autostart; | ||
} | ||
else if (typeof(mocha) === 'object') { | ||
|
||
|