Skip to content

Commit

Permalink
Auto merge of #6052 - nathanhammond:use-strict, r=nathanhammond
Browse files Browse the repository at this point in the history
Turn on strict mode for tests.

Fixes #5389.
  • Loading branch information
homu committed Jul 9, 2016
2 parents 4225661 + 87dc1a6 commit 3b4ad7f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions lib/broccoli/ember-app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,7 @@ EmberApp.prototype._processedEmberCLITree = function() {
'app-boot.js',
'test-support-prefix.js',
'test-support-suffix.js',
'tests-prefix.js',
'tests-suffix.js'
];
var emberCLITree = new ConfigReplace(new UnwatchedDir(__dirname), this._configTree(), {
Expand Down Expand Up @@ -1124,6 +1125,7 @@ EmberApp.prototype.appTests = function(coreTestTree) {

return this._concatFiles(appTestTrees, {
inputFiles: [ this.name + '/tests/**/*.js' ],
headerFiles: [ 'vendor/ember-cli/tests-prefix.js' ],
footerFiles: [ 'vendor/ember-cli/tests-suffix.js' ],
outputFile: this.options.outputPaths.tests.js,
annotation: 'Concat: App Tests'
Expand Down
1 change: 1 addition & 0 deletions lib/broccoli/tests-prefix.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
'use strict';

0 comments on commit 3b4ad7f

Please sign in to comment.