Merge pull request #120 from chadhietala/bump-ember-test-helpers

Bumping ember-test-helpers and upgraded module transpiler

Brocfile.js

@@ -1,7 +1,7 @@
-var concat     = require('broccoli-concat');
+var concat     = require('broccoli-sourcemap-concat');
 var Funnel     = require('broccoli-funnel');
 var mergeTrees = require('broccoli-merge-trees');
-var compileES6 = require('broccoli-es6-concatenator');
+var compileES6 = require('broccoli-es6modules');
 var jshintTree = require('broccoli-jshint');
 var replace    = require('broccoli-string-replace');
 var gitInfo    = require('git-repo-info');
@@ -40,11 +40,9 @@ var tests = new Funnel('tests', {
 });
 
 var main = mergeTrees([deps, lib]);
-main = compileES6(main, {
+main = concat(new compileES6(main), {
   inputFiles: ['**/*.js'],
-  ignoredModules: ['ember'],
-  outputFile: '/ember-qunit.amd.js',
-  wrapInEval: false
+  outputFile: '/ember-qunit.amd.js'
 });
 
 var generatedBowerConfig = new Funnel('build-support', {
@@ -77,9 +75,8 @@ var jshintLib = jshintTree(lib);
 var jshintTest = jshintTree(tests);
 
 var mainWithTests = mergeTrees([deps, lib, tests, jshintLib, jshintTest]);
-mainWithTests = compileES6(mainWithTests, {
+mainWithTests = concat(new compileES6(mainWithTests), {
   inputFiles: ['**/*.js'],
-  ignoredModules: ['ember'],
   outputFile: '/assets/ember-qunit-tests.amd.js'
 });
 

bower.json

@@ -16,7 +16,7 @@
   ],
   "dependencies": {
     "ember": "^1.7.0",
-    "ember-test-helpers": "^0.0.7"
+    "ember-test-helpers": "^0.2.0"
   },
   "devDependencies": {
     "qunit": "^1.15.0",

package.json

@@ -20,11 +20,11 @@
   "devDependencies": {
     "bower": "^1.3.12",
     "broccoli": "^0.13.0",
-    "broccoli-concat": "^0.0.11",
-    "broccoli-es6-concatenator": "^0.1.7",
+    "broccoli-es6modules": "^0.4.0",
     "broccoli-funnel": "^0.1.6",
     "broccoli-jshint": "^0.5.3",
     "broccoli-merge-trees": "^0.1.4",
+    "broccoli-sourcemap-concat": "^0.4.3",
     "broccoli-string-replace": "0.0.2",
     "git-repo-info": "^1.0.2",
     "testem": "0.6.22"