Merge pull request #20116 from bertdeblock/consistent-determination-o…

…f-module-prefix-in-blueprints
emberjs · Jun 12, 2022 · b85ccee · b85ccee
2 parents 92e79ab + 326497b
commit b85ccee
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/blueprints-js/util-test/qunit-files/__root__/__testType__/__name__-test.js b/blueprints-js/util-test/qunit-files/__root__/__testType__/__name__-test.js
@@ -1,4 +1,4 @@
-import <%= camelizedModuleName %> from '<%= dasherizedModulePrefix %>/utils/<%= dasherizedModuleName %>';
+import <%= camelizedModuleName %> from '<%= modulePrefix %>/utils/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 
 module('<%= friendlyTestName %>');

diff --git a/blueprints-js/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js b/blueprints-js/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
@@ -1,4 +1,4 @@
-import <%= camelizedModuleName %> from '<%= dasherizedModulePrefix %>/utils/<%= dasherizedModuleName %>';
+import <%= camelizedModuleName %> from '<%= modulePrefix %>/utils/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 
 module('<%= friendlyTestName %>', function () {

diff --git a/blueprints/initializer-test/index.js b/blueprints/initializer-test/index.js
@@ -2,9 +2,9 @@
 
 const fs = require('fs');
 const path = require('path');
-const stringUtils = require('ember-cli-string-utils');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
@@ -29,10 +29,9 @@ module.exports = useTestFrameworkDetector({
   },
 
   locals: function (options) {
-    let modulePrefix = stringUtils.dasherize(options.project.config().modulePrefix);
     return {
       friendlyTestName: ['Unit', 'Initializer', options.entity.name].join(' | '),
-      modulePrefix,
+      modulePrefix: modulePrefixForProject(options.project),
       destroyAppExists: fs.existsSync(
         path.join(this.project.root, '/tests/helpers/destroy-app.js')
       ),

diff --git a/blueprints/instance-initializer-test/index.js b/blueprints/instance-initializer-test/index.js
@@ -2,9 +2,9 @@
 
 const fs = require('fs');
 const path = require('path');
-const stringUtils = require('ember-cli-string-utils');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
@@ -28,11 +28,9 @@ module.exports = useTestFrameworkDetector({
     };
   },
   locals: function (options) {
-    let modulePrefix = stringUtils.dasherize(options.project.config().modulePrefix);
-
     return {
       friendlyTestName: ['Unit', 'Instance Initializer', options.entity.name].join(' | '),
-      modulePrefix,
+      modulePrefix: modulePrefixForProject(options.project),
       destroyAppExists: fs.existsSync(
         path.join(this.project.root, '/tests/helpers/destroy-app.js')
       ),

diff --git a/blueprints/util-test/index.js b/blueprints/util-test/index.js
@@ -1,9 +1,9 @@
 'use strict';
 
-const stringUtils = require('ember-cli-string-utils');
 const path = require('path');
 
 const maybePolyfillTypeScriptBlueprints = require('../-maybe-polyfill-typescript-blueprints');
+const { modulePrefixForProject } = require('../-utils');
 const useTestFrameworkDetector = require('../test-framework-detector');
 
 module.exports = useTestFrameworkDetector({
@@ -30,7 +30,7 @@ module.exports = useTestFrameworkDetector({
   locals: function (options) {
     return {
       friendlyTestName: ['Unit', 'Utility', options.entity.name].join(' | '),
-      dasherizedModulePrefix: stringUtils.dasherize(options.project.config().modulePrefix),
+      modulePrefix: modulePrefixForProject(options.project),
     };
   },
 });
diff --git a/blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js b/blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js
@@ -1,4 +1,4 @@
-import <%= camelizedModuleName %> from '<%= dasherizedModulePrefix %>/utils/<%= dasherizedModuleName %>';
+import <%= camelizedModuleName %> from '<%= modulePrefix %>/utils/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 
 module('<%= friendlyTestName %>');

diff --git a/blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.ts b/blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.ts
@@ -1,4 +1,4 @@
-import <%= camelizedModuleName %> from '<%= dasherizedModulePrefix %>/utils/<%= dasherizedModuleName %>';
+import <%= camelizedModuleName %> from '<%= modulePrefix %>/utils/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 
 module('<%= friendlyTestName %>', function () {