Skip to content

Resolve addon file paths correctly in CLI >= 2.12 #127

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

Merged
RobbieTheWagner merged 1 commit into from
Oct 1, 2017
Merged

Resolve addon file paths correctly in CLI >= 2.12 #127

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
8 changes: 4 additions & 4 deletions lib/coverage-instrumenter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ function fixPath(relativePath, name, root, templateExtensions, isAddon) {
);
}

// Handle addons renaming of modules/my-addon
if (relativePath.startsWith('modules/' + name)) {
var regex = new RegExp('^modules/' + name);
relativePath = relativePath.replace(regex, 'addon');
// Handle addons renaming of modules/my-addon or my-addon (depending on ember-cli version)
var regex = new RegExp('^(modules/)?' + name + '/');
if (regex.test(relativePath)) {
relativePath = relativePath.replace(regex, 'addon/');
return (
getPathForRealFile(relativePath, root, templateExtensions) ||
relativePath
Expand Down