Merge pull request #347 from machty/legacy-test-files

Fix issue where app.js files are appended to tests.js
ember-cli · Apr 13, 2014 · 0480164 · 0480164
2 parents c785e37 + d8001b7
commit 0480164
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/blueprint/Brocfile.js b/blueprint/Brocfile.js
@@ -153,14 +153,12 @@ module.exports = function (broccoli) {
       }
     });
 
-    var legacyTestFiles = [
+    var legacyTestFilesToAppend = [
       'qunit/qunit/qunit.js',
       'test-shims.js',
       'ember-qunit/dist/named-amd/main.js'
     ];
 
-    legacyFilesToAppend = legacyFilesToAppend.concat(legacyTestFiles);
-
     testsJs = compileES6(testsJs, {
       // Temporary workaround for
       // https://github.com/joliss/broccoli-es6-concatenator/issues/9
@@ -174,7 +172,7 @@ module.exports = function (broccoli) {
       inputFiles: [
         prefix + '/**/*.js'
       ],
-      legacyFilesToAppend: legacyFilesToAppend,
+      legacyFilesToAppend: legacyTestFilesToAppend,
 
       wrapInEval: true,
       outputFile: '/assets/tests.js'