Merge pull request #4 from kpfefferle/master

Load testdouble via NPM instead of Bower

Author: alexblom

blueprints/ember-cli-testdouble/index.js

@@ -1,22 +1,24 @@
 /* jshint node: true */
 'use strict';
+
 var path = require('path');
+var Funnel = require('broccoli-funnel');
+var MergeTrees = require('broccoli-merge-trees');
 
 module.exports = {
   name: 'ember-cli-testdouble',
 
-  included: function included(app) {
-    if (app.app) {
-      app = app.app;
-    }
-    this.app = app;
+  included(app) {
+    this._super.included.apply(this, arguments);
+    app.import('vendor/testdouble.js', { type: 'test' });
+    app.import('vendor/shims/testdouble.js', { type: 'test' });
+  },
 
-    app.import('bower_components/testdouble/dist/testdouble.js');
-    app.import('vendor/shims/testdouble.js', {
-      type: 'vendor',
-      exports: {
-        'testdouble': ['default']
-      }
+  treeForVendor(vendorTree) {
+    var tdTree = new Funnel(path.join(this.project.root, 'node_modules', 'testdouble', 'dist'), {
+      files: ['testdouble.js']
     });
+
+    return new MergeTrees([vendorTree, tdTree]);
   }
 };

index.js

@@ -15,7 +15,11 @@
   "bugs": {
     "url": "https://github.com/isleofcode/ember-cli-testdouble/issues"
   },
-  "dependences": {},
+  "dependencies": {
+    "broccoli-funnel": "^1.2.0",
+    "broccoli-merge-trees": "^2.0.0",
+    "testdouble": "^2.1.2"    
+  },
   "devDependencies": {},
   "keywords": [
     "ember-addon",

package.json

@@ -1,9 +1,12 @@
-/* globals td */
+(function() {
+  function vendorModule() {
+    'use strict';
 
-define('testdouble', [], function() {
-  "use strict";
+    return {
+      'default': self['td'],
+      __esModule: true,
+    };
+  }
 
-  return {
-    'default': td
-  };
-});
+  define('testdouble', [], vendorModule);
+})();