Merge pull request #3891 from marcioj/issue-3886

Fixes problem in initializer tests generated in addons

blueprints/helper-addon/files/__root__/__path__/__name__.js

@@ -0,0 +1 @@
+export { default, <%= camelizedModuleName %> } from '<%= modulePath %>';

blueprints/helper-addon/index.js

@@ -0,0 +1,3 @@
+/*jshint node:true*/
+
+module.exports = require('../addon-import');

blueprints/helper-test/files/tests/unit/helpers/__name__-test.js

@@ -1,6 +1,6 @@
 import {
   <%= camelizedModuleName %>
-} from '../../../helpers/<%= dasherizedModuleName %>';
+} from '<%= dependencyDepth %>/helpers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 
 module('<%= classifiedModuleName %>Helper');

blueprints/helper-test/index.js

@@ -1,5 +1,12 @@
 /*jshint node:true*/
 
+var getDependencyDepth = require('../../lib/utilities/get-dependency-depth');
+
 module.exports = {
-  description: 'Generates a helper unit test.'
+  description: 'Generates a helper unit test.',
+  locals: function(options) {
+    return {
+      dependencyDepth: getDependencyDepth(options)
+    }
+  }
 };

blueprints/initializer-addon/files/__root__/__path__/__name__.js

@@ -0,0 +1 @@
+export { default, initialize } from '<%= modulePath %>';

blueprints/initializer-addon/index.js

@@ -0,0 +1,3 @@
+/*jshint node:true*/
+
+module.exports = require('../addon-import');

blueprints/initializer-test/files/tests/unit/initializers/__name__-test.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import { initialize } from '../../../initializers/<%= dasherizedModuleName %>';
+import { initialize } from '<%= dependencyDepth %>/initializers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 
 var container, application;

blueprints/initializer-test/index.js

@@ -1,5 +1,12 @@
 /*jshint node:true*/
 
+var getDependencyDepth = require('../../lib/utilities/get-dependency-depth');
+
 module.exports = {
-  description: 'Generates an initializer unit test.'
+  description: 'Generates an initializer unit test.',
+  locals: function(options) {
+    return {
+      dependencyDepth: getDependencyDepth(options)
+    }
+  }
 };

lib/utilities/get-dependency-depth.js

@@ -0,0 +1,11 @@
+'use strict';
+
+module.exports = function getDependencyDepth(options) {
+  var name = options.entity.name;
+  var nameParts = name.split('/');
+  var depth = '../..';
+
+  return nameParts.reduce(function(prev) {
+    return prev + '/..';
+  }, depth);
+};

tests/acceptance/addon-generate-test.js

@@ -180,7 +180,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('app/helpers/foo-bar.js', {
         contains: [
-          "export { default } from 'my-addon/helpers/foo-bar';"
+          "export { default, fooBar } from 'my-addon/helpers/foo-bar';"
         ]
       });
       assertFile('tests/unit/helpers/foo-bar-test.js', {
@@ -202,13 +202,13 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('app/helpers/foo/bar-baz.js', {
         contains: [
-          "export { default } from 'my-addon/helpers/foo/bar-baz';"
+          "export { default, fooBarBaz } from 'my-addon/helpers/foo/bar-baz';"
         ]
       });
       assertFile('tests/unit/helpers/foo/bar-baz-test.js', {
         contains: "import {" + EOL +
           "  fooBarBaz" + EOL +
-          "} from '../../../helpers/foo/bar-baz';"
+          "} from '../../../../helpers/foo/bar-baz';"
       });
     });
   });
@@ -416,7 +416,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('app/initializers/foo.js', {
         contains: [
-          "export { default } from 'my-addon/initializers/foo';"
+          "export { default, initialize } from 'my-addon/initializers/foo';"
         ]
       });
       assertFile('tests/unit/initializers/foo-test.js');
@@ -437,7 +437,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('app/initializers/foo/bar.js', {
         contains: [
-          "export { default } from 'my-addon/initializers/foo/bar';"
+          "export { default, initialize } from 'my-addon/initializers/foo/bar';"
         ]
       });
       assertFile('tests/unit/initializers/foo/bar-test.js');

tests/acceptance/generate-test.js

@@ -153,7 +153,7 @@ describe('Acceptance: ember generate', function() {
       assertFile('tests/unit/helpers/foo/bar-baz-test.js', {
         contains: "import {" + EOL +
           "  fooBarBaz" + EOL +
-          "} from '../../../helpers/foo/bar-baz';"
+          "} from '../../../../helpers/foo/bar-baz';"
       });
     });
   });
@@ -451,7 +451,9 @@ describe('Acceptance: ember generate', function() {
                   "};"
       });
 
-      assertFile('tests/unit/initializers/foo-test.js');
+      assertFile('tests/unit/initializers/foo-test.js', {
+        contains: "import { initialize } from '../../../initializers/foo';"
+      });
     });
   });
 
@@ -468,7 +470,9 @@ describe('Acceptance: ember generate', function() {
                   "};"
       });
 
-      assertFile('tests/unit/initializers/foo/bar-test.js');
+      assertFile('tests/unit/initializers/foo/bar-test.js', {
+        contains: "import { initialize } from '../../../../initializers/foo/bar';"
+      });
     });
   });
 

tests/acceptance/in-repo-addon-generate-test.js

@@ -190,7 +190,7 @@ describe('Acceptance: ember generate in-repo-addon', function() {
       });
       assertFile('lib/my-addon/app/helpers/foo-bar.js', {
         contains: [
-          "export { default } from 'my-addon/helpers/foo-bar';"
+          "export { default, fooBar } from 'my-addon/helpers/foo-bar';"
         ]
       });
       assertFile('tests/unit/helpers/foo-bar-test.js', {
@@ -212,13 +212,13 @@ describe('Acceptance: ember generate in-repo-addon', function() {
       });
       assertFile('lib/my-addon/app/helpers/foo/bar-baz.js', {
         contains: [
-          "export { default } from 'my-addon/helpers/foo/bar-baz';"
+          "export { default, fooBarBaz } from 'my-addon/helpers/foo/bar-baz';"
         ]
       });
       assertFile('tests/unit/helpers/foo/bar-baz-test.js', {
         contains: "import {" + EOL +
           "  fooBarBaz" + EOL +
-          "} from '../../../helpers/foo/bar-baz';"
+          "} from '../../../../helpers/foo/bar-baz';"
       });
     });
   });
@@ -427,7 +427,7 @@ describe('Acceptance: ember generate in-repo-addon', function() {
       });
       assertFile('lib/my-addon/app/initializers/foo.js', {
         contains: [
-          "export { default } from 'my-addon/initializers/foo';"
+          "export { default, initialize } from 'my-addon/initializers/foo';"
         ]
       });
       assertFile('tests/unit/initializers/foo-test.js');
@@ -448,7 +448,7 @@ describe('Acceptance: ember generate in-repo-addon', function() {
       });
       assertFile('lib/my-addon/app/initializers/foo/bar.js', {
         contains: [
-          "export { default } from 'my-addon/initializers/foo/bar';"
+          "export { default, initialize } from 'my-addon/initializers/foo/bar';"
         ]
       });
       assertFile('tests/unit/initializers/foo/bar-test.js');

tests/acceptance/pods-generate-test.js

@@ -371,7 +371,7 @@ describe('Acceptance: ember generate pod', function() {
       assertFile('tests/unit/helpers/foo/bar-baz-test.js', {
         contains: "import {" + EOL +
           "  fooBarBaz" + EOL +
-          "} from '../../../helpers/foo/bar-baz';"
+          "} from '../../../../helpers/foo/bar-baz';"
       });
     });
   });
@@ -388,7 +388,7 @@ describe('Acceptance: ember generate pod', function() {
       assertFile('tests/unit/helpers/foo/bar-baz-test.js', {
         contains: "import {" + EOL +
           "  fooBarBaz" + EOL +
-          "} from '../../../helpers/foo/bar-baz';"
+          "} from '../../../../helpers/foo/bar-baz';"
       });
     });
   });