Auto merge of #5418 - kamalaknn:absolute-imports, r=rwjblue

[ENHANCEMENT] Use absolute imports in tests Continuation of #5203
ember-cli · Feb 16, 2016 · bfa8dd6 · bfa8dd6
2 parents 0cf42c8 + 4372bf8
commit bfa8dd6
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 25 deletions.
diff --git a/blueprints/helper-test/files/tests/unit/helpers/__name__-test.js b/blueprints/helper-test/files/tests/unit/helpers/__name__-test.js
@@ -1,4 +1,4 @@
-import { <%= camelizedModuleName %> } from '<%= dependencyDepth %>/helpers/<%= dasherizedModuleName %>';
+import { <%= camelizedModuleName %> } from '<%= dasherizedModulePrefix %>/helpers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 
 module('<%= friendlyTestName %>');

diff --git a/blueprints/helper-test/index.js b/blueprints/helper-test/index.js
@@ -1,14 +1,14 @@
 /*jshint node:true*/
 
-var getDependencyDepth = require('ember-cli-get-dependency-depth');
 var testInfo = require('ember-cli-test-info');
+var stringUtils = require('ember-cli-string-utils');
 
 module.exports = {
   description: 'Generates a helper unit test.',
   locals: function(options) {
     return {
       friendlyTestName: testInfo.name(options.entity.name, "Unit", "Helper"),
-      dependencyDepth: getDependencyDepth(options.entity.name)
+      dasherizedModulePrefix: stringUtils.dasherize(options.project.config().modulePrefix)
     };
   }
 };
diff --git a/blueprints/initializer-test/files/tests/unit/initializers/__name__-test.js b/blueprints/initializer-test/files/tests/unit/initializers/__name__-test.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import <%= classifiedModuleName %>Initializer from '<%= dependencyDepth %>/initializers/<%= dasherizedModuleName %>';
+import <%= classifiedModuleName %>Initializer from '<%= dasherizedModulePrefix %>/initializers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 
 let application;

diff --git a/blueprints/initializer-test/index.js b/blueprints/initializer-test/index.js
@@ -1,14 +1,14 @@
 /*jshint node:true*/
 
-var getDependencyDepth = require('ember-cli-get-dependency-depth');
 var testInfo = require('ember-cli-test-info');
+var stringUtils = require('ember-cli-string-utils');
 
 module.exports = {
   description: 'Generates an initializer unit test.',
   locals: function(options) {
     return {
       friendlyTestName: testInfo.name(options.entity.name, "Unit", "Initializer"),
-      dependencyDepth: getDependencyDepth(options.entity.name)
+      dasherizedModulePrefix: stringUtils.dasherize(options.project.config().modulePrefix)
     };
   }
 };
diff --git a/blueprints/instance-initializer-test/files/tests/unit/instance-initializers/__name__-test.js b/blueprints/instance-initializer-test/files/tests/unit/instance-initializers/__name__-test.js
@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import { initialize } from '<%= dependencyDepth %>/instance-initializers/<%= dasherizedModuleName %>';
+import { initialize } from '<%= dasherizedModulePrefix %>/instance-initializers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 import destroyApp from '../../helpers/destroy-app';
 

diff --git a/blueprints/instance-initializer-test/index.js b/blueprints/instance-initializer-test/index.js
@@ -1,14 +1,14 @@
 /*jshint node:true*/
 
-var getDependencyDepth = require('../../lib/utilities/get-dependency-depth');
 var testInfo = require('ember-cli-test-info');
+var stringUtils = require('ember-cli-string-utils');
 
 module.exports = {
   description: 'Generates an instance initializer unit test.',
   locals: function(options) {
     return {
       friendlyTestName: testInfo.name(options.entity.name, "Unit", "Instance Initializer"),
-      dependencyDepth: getDependencyDepth(options)
+      dasherizedModulePrefix: stringUtils.dasherize(options.project.config().modulePrefix)
     };
   }
 };
diff --git a/package.json b/package.json
@@ -63,7 +63,6 @@
     "cpr": "0.4.2",
     "debug": "^2.1.3",
     "diff": "^1.3.1",
-    "ember-cli-get-dependency-depth": "^1.0.0",
     "ember-cli-is-package-missing": "^1.0.0",
     "ember-cli-normalize-entity-name": "^1.0.0",
     "ember-cli-path-utils": "^1.0.0",

diff --git a/tests/acceptance/addon-generate-test.js b/tests/acceptance/addon-generate-test.js
@@ -216,7 +216,7 @@ describe('Acceptance: ember generate in-addon', function() {
         ]
       });
       assertFile('tests/unit/helpers/foo-bar-test.js', {
-        contains: "import { fooBar } from '../../../helpers/foo-bar';"
+        contains: "import { fooBar } from 'dummy/helpers/foo-bar';"
       });
     });
   });
@@ -236,7 +236,7 @@ describe('Acceptance: ember generate in-addon', function() {
         ]
       });
       assertFile('tests/unit/helpers/foo/bar-baz-test.js', {
-        contains: "import { fooBarBaz } from '../../../../helpers/foo/bar-baz';"
+        contains: "import { fooBarBaz } from 'dummy/helpers/foo/bar-baz';"
       });
     });
   });

diff --git a/tests/acceptance/generate-test.js b/tests/acceptance/generate-test.js
@@ -210,7 +210,7 @@ describe('Acceptance: ember generate', function() {
                   "export default Ember.Helper.helper(fooBar);"
       });
       assertFile('tests/unit/helpers/foo-bar-test.js', {
-        contains: "import { fooBar } from '../../../helpers/foo-bar';"
+        contains: "import { fooBar } from 'my-app/helpers/foo-bar';"
       });
     });
   });
@@ -225,7 +225,7 @@ describe('Acceptance: ember generate', function() {
                   "export default Ember.Helper.helper(fooBarBaz);"
       });
       assertFile('tests/unit/helpers/foo/bar-baz-test.js', {
-        contains: "import { fooBarBaz } from '../../../../helpers/foo/bar-baz';"
+        contains: "import { fooBarBaz } from 'my-app/helpers/foo/bar-baz';"
       });
     });
   });
@@ -585,7 +585,7 @@ describe('Acceptance: ember generate', function() {
       });
 
       assertFile('tests/unit/initializers/foo-test.js', {
-        contains: "import FooInitializer from '../../../initializers/foo';"
+        contains: "import FooInitializer from 'my-app/initializers/foo';"
       });
     });
   });
@@ -594,7 +594,7 @@ describe('Acceptance: ember generate', function() {
     return generate(['initializer-test', 'foo']).then(function() {
       assertFile('tests/unit/initializers/foo-test.js', {
         contains: [
-          "import FooInitializer from '../../../initializers/foo';",
+          "import FooInitializer from 'my-app/initializers/foo';",
           "module('Unit | Initializer | foo'",
           "let application;",
           "FooInitializer.initialize(application);"
@@ -617,7 +617,7 @@ describe('Acceptance: ember generate', function() {
       });
 
       assertFile('tests/unit/initializers/foo/bar-test.js', {
-        contains: "import FooBarInitializer from '../../../../initializers/foo/bar';"
+        contains: "import FooBarInitializer from 'my-app/initializers/foo/bar';"
       });
     });
   });
@@ -636,7 +636,7 @@ describe('Acceptance: ember generate', function() {
       });
 
       assertFile('tests/unit/instance-initializers/foo-test.js', {
-        contains: "import { initialize } from '../../../instance-initializers/foo';"
+        contains: "import { initialize } from 'my-app/instance-initializers/foo';"
       });
     });
   });
@@ -655,7 +655,7 @@ describe('Acceptance: ember generate', function() {
       });
 
       assertFile('tests/unit/instance-initializers/foo/bar-test.js', {
-        contains: "import { initialize } from '../../../../instance-initializers/foo/bar';"
+        contains: "import { initialize } from 'my-app/instance-initializers/foo/bar';"
       });
     });
   });

diff --git a/tests/acceptance/in-repo-addon-generate-test.js b/tests/acceptance/in-repo-addon-generate-test.js
@@ -217,7 +217,7 @@ describe('Acceptance: ember generate in-repo-addon', function() {
         ]
       });
       assertFile('tests/unit/helpers/foo-bar-test.js', {
-        contains: "import { fooBar } from '../../../helpers/foo-bar';"
+        contains: "import { fooBar } from 'my-app/helpers/foo-bar';"
       });
     });
   });
@@ -237,7 +237,7 @@ describe('Acceptance: ember generate in-repo-addon', function() {
         ]
       });
       assertFile('tests/unit/helpers/foo/bar-baz-test.js', {
-        contains: "import { fooBarBaz } from '../../../../helpers/foo/bar-baz';"
+        contains: "import { fooBarBaz } from 'my-app/helpers/foo/bar-baz';"
       });
     });
   });

diff --git a/tests/acceptance/pods-generate-test.js b/tests/acceptance/pods-generate-test.js
@@ -668,7 +668,7 @@ describe('Acceptance: ember generate pod', function() {
                   "export default Ember.Helper.helper(fooBar);"
       });
       assertFile('tests/unit/helpers/foo-bar-test.js', {
-        contains: "import { fooBar } from '../../../helpers/foo-bar';"
+        contains: "import { fooBar } from 'my-app/helpers/foo-bar';"
       });
     });
   });
@@ -683,7 +683,7 @@ describe('Acceptance: ember generate pod', function() {
                   "export default Ember.Helper.helper(fooBar);"
       });
       assertFile('tests/unit/helpers/foo-bar-test.js', {
-        contains: "import { fooBar } from '../../../helpers/foo-bar';"
+        contains: "import { fooBar } from 'my-app/helpers/foo-bar';"
       });
     });
   });
@@ -698,7 +698,7 @@ describe('Acceptance: ember generate pod', function() {
                   "export default Ember.Helper.helper(fooBarBaz);"
       });
       assertFile('tests/unit/helpers/foo/bar-baz-test.js', {
-        contains: "import { fooBarBaz } from '../../../../helpers/foo/bar-baz';"
+        contains: "import { fooBarBaz } from 'my-app/helpers/foo/bar-baz';"
       });
     });
   });
@@ -713,7 +713,7 @@ describe('Acceptance: ember generate pod', function() {
                   "export default Ember.Helper.helper(fooBarBaz);"
       });
       assertFile('tests/unit/helpers/foo/bar-baz-test.js', {
-        contains: "import { fooBarBaz } from '../../../../helpers/foo/bar-baz';"
+        contains: "import { fooBarBaz } from 'my-app/helpers/foo/bar-baz';"
       });
     });
   });