Fixup tests for addon support.

Author: Robert Jackson

test/fixtures/addon/example-js/classic-to-nested.js

@@ -65,7 +65,8 @@ module.exports = {
       'layout-property-classic': {
         'index.js': [
           'import Component from "@ember/component";',
-          'export default Component.extend({});',
+          'import SomeMixin from "my-addon/mixins/whatever";',
+          'export default Component.extend(SomeMixin, {});',
         ].join('\n'),
         'index.hbs': '{{!-- layout-property-classic.hbs --}}',
       },
@@ -87,16 +88,17 @@ module.exports = {
       },
 
       // A template imported into multiple component classes
-      'first-repeated-import': [
-        '// first-repeated-import.ts',
+      'first-repeated-import.js': [
+        '// first-repeated-import.js',
         'import Component from "@ember/component"',
         'import { layout } from "@ember-decorators/component";',
         'import template from "my-addon/templates/components/repeatedly-imported";',
         '@layout(template)',
         'export default class FirstRepeatedImport extends Component {}',
       ].join('\n'),
-      'second-repeated-import': [
-        '// second-repeated-import.ts',
+
+      'second-repeated-import.js': [
+        '// second-repeated-import.js',
         'import Component from "@ember/component"',
         'import { layout } from "@ember-decorators/component";',
         'import template from "my-addon/templates/components/repeatedly-imported";',

test/fixtures/addon/example-ts/classic-to-nested.js

@@ -50,6 +50,49 @@ module.exports = {
         ].join('\n'),
       },
 
+      'layout-decorator': {
+        'index.hbs': '{{!-- layout-decorator-template.hbs --}}',
+        'index.ts': [
+          'import Component from "@ember/component";',
+          'export default class LayoutDecorator extends Component {}',
+        ].join('\n'),
+      },
+
+      'layout-property-classic': {
+        'index.hbs': '{{!-- layout-property-classic.hbs --}}',
+        'index.ts': [
+          'import Component from "@ember/component";',
+          'import SomeMixin from "my-addon/mixins/whatever";',
+          'export default Component.extend(SomeMixin, {});',
+        ].join('\n'),
+      },
+
+      'layout-property-native': {
+        'index.hbs': '{{!-- layout-property-native.hbs --}}',
+        'index.ts': [
+          'import Component from "@ember/component";',
+          'export default class NativeProperty extends Component {}',
+        ].join('\n'),
+      },
+
+      // A template imported into multiple component classes
+      'first-repeated-import.ts': [
+        '// first-repeated-import.ts',
+        'import Component from "@ember/component"',
+        'import { layout } from "@ember-decorators/component";',
+        'import template from "my-addon/templates/components/repeatedly-imported";',
+        '@layout(template)',
+        'export default class FirstRepeatedImport extends Component {}',
+      ].join('\n'),
+      'second-repeated-import.ts': [
+        '// second-repeated-import.ts',
+        'import Component from "@ember/component"',
+        'import { layout } from "@ember-decorators/component";',
+        'import template from "my-addon/templates/components/repeatedly-imported";',
+        '@layout(template)',
+        'export default class SecondRepeatedImport extends Component {}',
+      ].join('\n'),
+
       // A component with partial
       partials: {
         'with-partial': {
@@ -78,6 +121,7 @@ module.exports = {
           'partial-two-template.hbs': '{{!-- partial-two-template.hbs --}}',
           '-partial-three-template.hbs': '{{!-- partial-three-template.hbs --}}',
         },
+        'repeatedly-imported.hbs': '{{!-- repeatedly-imported.hbs --}}',
       },
     },
   },

test/fixtures/app/example-js/classic-to-nested.js

@@ -96,9 +96,9 @@ module.exports = {
           'partial-two-template.hbs': '{{!-- partial-two-template.hbs --}}',
           '-partial-three-template.hbs': '{{!-- partial-three-template.hbs --}}',
         },
-      },
 
-      'repeatedly-imported.hbs': '{{!-- repeatedly-imported.hbs --}}',
+        'repeatedly-imported.hbs': '{{!-- repeatedly-imported.hbs --}}',
+      },
     },
   },
 };

test/lib/migrator/classic-to-nested-test.js

@@ -3,17 +3,20 @@ const fse = require('fs-extra');
 const fixturify = require('fixturify');
 const path = require('path');
 const Migrator = require('../../../lib/migrator');
+const { setupConsole, resetConsole } = require('../../helpers');
 
 assertDiff.options.strict = true;
 
 describe('structure = nested', function () {
   beforeEach(function () {
     this.tmpPath = 'tmp/process-files';
     fse.mkdirsSync(this.tmpPath);
+    setupConsole();
   });
 
   afterEach(function () {
     fse.removeSync(this.tmpPath);
+    resetConsole();
   });
 
   describe('For an app with component classes written in JavaScript', function () {