Merge pull request #18415 from emberjs/fix-component-tests-blueprint

[BUGFIX beta] Fix hbs import path
emberjs · Sep 20, 2019 · 3c45c3b · 3c45c3b
2 parents 22f1951 + 20746cc
commit 3c45c3b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/blueprints/component-test/index.js b/blueprints/component-test/index.js
@@ -62,9 +62,9 @@ module.exports = useTestFrameworkDetector({
       componentPathName = [options.path, dasherizedModuleName].filter(Boolean).join('/');
     }
 
-    let inlinePrecompileModule = this._useSeparateInlinePrecompileAddon()
-      ? 'htmlbars-inline-precompile'
-      : 'ember-cli-htmlbars';
+    let hbsImportStatement = this._useSeparateInlinePrecompileAddon()
+      ? "import hbs from 'htmlbars-inline-precompile';"
+      : "import { hbs } from 'ember-cli-htmlbars';";
 
     let templateInvocation = invocationFor(options);
     let componentName = templateInvocation;
@@ -82,7 +82,7 @@ module.exports = useTestFrameworkDetector({
       closeComponent,
       selfCloseComponent,
       friendlyTestDescription,
-      inlinePrecompileModule,
+      hbsImportStatement,
     };
   },
 

diff --git a/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js b/blueprints/component-test/qunit-rfc-232-files/__root__/__testType__/__path__/__test__.js
@@ -1,7 +1,7 @@
 <% if (testType === 'integration') { %>import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
-import hbs from '<%= inlinePrecompileModule %>';
+<%= hbsImportStatement %>
 
 module('<%= friendlyTestDescription %>', function(hooks) {
   setupRenderingTest(hooks);