Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consistent determination of modulePrefix in blueprints #20116

Merged
merged 1 commit into from
Jun 12, 2022
Merged

Consistent determination of modulePrefix in blueprints #20116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion blueprints-js/util-test/qunit-files/__root__/__testType__/__name__-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import <%= camelizedModuleName %> from '<%= dasherizedModulePrefix %>/utils/<%= dasherizedModuleName %>';
import <%= camelizedModuleName %> from '<%= modulePrefix %>/utils/<%= dasherizedModuleName %>';
import { module, test } from 'qunit';

module('<%= friendlyTestName %>');
Expand Down
2 changes: 1 addition & 1 deletion blueprints-js/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import <%= camelizedModuleName %> from '<%= dasherizedModulePrefix %>/utils/<%= dasherizedModuleName %>';
import <%= camelizedModuleName %> from '<%= modulePrefix %>/utils/<%= dasherizedModuleName %>';
import { module, test } from 'qunit';

module('<%= friendlyTestName %>', function () {
Expand Down
5 changes: 2 additions & 3 deletions blueprints/initializer-test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand All @@ -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')
),
Expand Down
6 changes: 2 additions & 4 deletions blueprints/instance-initializer-test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand All @@ -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')
),
Expand Down
4 changes: 2 additions & 2 deletions blueprints/util-test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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({
Expand All @@ -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),
};
},
});
2 changes: 1 addition & 1 deletion blueprints/util-test/qunit-files/__root__/__testType__/__name__-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import <%= camelizedModuleName %> from '<%= dasherizedModulePrefix %>/utils/<%= dasherizedModuleName %>';
import <%= camelizedModuleName %> from '<%= modulePrefix %>/utils/<%= dasherizedModuleName %>';
import { module, test } from 'qunit';

module('<%= friendlyTestName %>');
Expand Down
2 changes: 1 addition & 1 deletion blueprints/util-test/qunit-rfc-232-files/__root__/__testType__/__name__-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import <%= camelizedModuleName %> from '<%= dasherizedModulePrefix %>/utils/<%= dasherizedModuleName %>';
import <%= camelizedModuleName %> from '<%= modulePrefix %>/utils/<%= dasherizedModuleName %>';
import { module, test } from 'qunit';

module('<%= friendlyTestName %>', function () {
Expand Down