From 0c19ef7d8c970a5f6d0960c57fe270d0cbb930de Mon Sep 17 00:00:00 2001 From: Dan Freeman Date: Fri, 30 Jun 2017 14:33:21 -0400 Subject: [PATCH] Resolve addon file paths correctly in CLI >= 2.12 --- lib/coverage-instrumenter.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/coverage-instrumenter.js b/lib/coverage-instrumenter.js index 17bf5a2d..e5e6f2a0 100644 --- a/lib/coverage-instrumenter.js +++ b/lib/coverage-instrumenter.js @@ -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