Merge pull request #34 from rwjblue/update-to-latest-ember-qunit

Update to ember-qunit 0.2.0.
ember-cli · Jan 31, 2015 · eceece8 · eceece8
2 parents 49499fb + 9066042
commit eceece8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/blueprints/ember-cli-qunit/index.js b/blueprints/ember-cli-qunit/index.js
@@ -19,7 +19,7 @@ module.exports = {
  return addonContext.addBowerPackageToProject('ember-qunit-notifications', '0.0.5');
  })
  .then(function() {
- return addonContext.addBowerPackageToProject('ember-qunit', '0.1.8');
+ return addonContext.addBowerPackageToProject('ember-qunit', 'rwjblue/ember-qunit-builds#0.2.0');
  });
  }
 };
diff --git a/index.js b/index.js
@@ -39,7 +39,12 @@ module.exports = {
  app.bowerDirectory + '/ember-qunit-notifications/failed.png',
  ];
 
- app.import(app.bowerDirectory + '/ember-qunit/dist/named-amd/main.js', {
+ var emberQunitPath = app.bowerDirectory + '/ember-qunit/ember-qunit.amd.js';
+ if (!fs.existsSync(emberQunitPath)) {
+ emberQunitPath = app.bowerDirectory + '/ember-qunit/named-amd/main.js';
+ }
+
+ app.import(emberQunitPath, {
  type: 'test',
  exports: {
  'ember-qunit': [