Merge pull request #708 from Gaurav0/fix_glimmer_integration_test_bugs

Fix glimmer integration test bugs

Author: Gaurav0

app/mixins/files.js

@@ -114,7 +114,7 @@ export default Mixin.create({
 
     let isGlimmer = await this.emberCli.twiddleJson.hasAddon(this.model, '@glimmer/component');
 
-    if (this.isPathInvalid('component', path)) {
+    if (!isGlimmer && this.isPathInvalid('component', path)) {
       return;
     }
 

app/mixins/test-files.js

@@ -56,7 +56,7 @@ export default Mixin.create({
     let openComponent = descriptor => `<${descriptor}>`;
     let closeComponent = descriptor => `</${descriptor}>`;
     let selfCloseComponent = descriptor => `<${descriptor} />`;
-    let hbsImportStatement = `import hbs from 'htmlbars-inline-precomipile';`;
+    let hbsImportStatement = `import hbs from 'htmlbars-inline-precompile';`;
 
     const fileProperties = this.emberCli.buildProperties(blueprint, {
       testType: 'integration',

tests/acceptance/gist-test.js

@@ -149,7 +149,7 @@ module('Acceptance | gist', function(hooks) {
     assert.deepEqual(columnFiles, [jsFile, hbsFile], 'Added files are displayed');
   });
 
-  test('component without hyphen fails', async function(assert) {
+  test('ember component without hyphen fails', async function(assert) {
     assert.expect(2);
 
     let called = false;
@@ -159,7 +159,32 @@ module('Acceptance | gist', function(hooks) {
     };
     promptValue = "components/some-dir/mycomp";
 
-    await visit('/');
+    await runGist([
+      {
+        filename: 'application.template.hbs',
+        content: 'hello world!'
+      },
+      {
+        filename: 'twiddle.json',
+        content: `{
+          "version": "0.17.0",
+          "EmberENV": {
+            "FEATURES": {}
+          },
+          "options": {
+            "use_pods": false,
+            "enable-testing": false
+          },
+          "dependencies": {
+            "jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.js",
+            "ember": "3.12.1",
+            "ember-template-compiler": "3.12.1",
+            "ember-testing": "3.12.1"
+          },
+          "addons": {}
+        }`
+      }
+    ]);
     await click('.add-component-link');
     await click(firstFilePicker());
     assert.ok(called, "alert was called");