Modernize tests (part 1 -- more @glimmer/component)

packages/@ember/-internals/glimmer/tests/integration/application/debug-render-tree-test.ts

@@ -1,7 +1,8 @@
 import { ApplicationTestCase, ModuleBasedTestResolver, moduleFor } from 'internal-test-helpers';
 
 import { ENV } from '@ember/-internals/environment';
-import { Component, setComponentManager } from '@ember/-internals/glimmer';
+import { Component as EmberComponent, setComponentManager } from '@ember/-internals/glimmer';
+import Component from '@glimmer/component';
 import type { InternalOwner } from '@ember/-internals/owner';
 import Route from '@ember/routing/route';
 import Controller from '@ember/controller';
@@ -991,7 +992,7 @@ if (ENV._DEBUG_RENDER_TREE) {
 
         this.add(
           'component:hello-world',
-          setComponentTemplate(precompileTemplate('Hello World'), class extends Component {})
+          setComponentTemplate(precompileTemplate('Hello World'), class extends EmberComponent {})
         );
 
         await this.visit('/');
@@ -1710,8 +1711,8 @@ if (ENV._DEBUG_RENDER_TREE) {
           setComponentTemplate(
             precompileTemplate('{{@name}}'),
             class extends Component {
-              constructor(owner: InternalOwner) {
-                super(owner);
+              constructor(owner: InternalOwner, args: object) {
+                super(owner, args);
                 throw new Error('oops!');
               }
             }

packages/@ember/-internals/glimmer/tests/integration/application/engine-test.js

@@ -5,7 +5,7 @@ import {
   runTaskNext,
 } from 'internal-test-helpers';
 
-import { Component } from '@ember/-internals/glimmer';
+import Component from '@glimmer/component';
 import Route from '@ember/routing/route';
 import { RSVP } from '@ember/-internals/runtime';
 import Controller from '@ember/controller';
@@ -235,9 +235,7 @@ moduleFor(
 
       let sharedLayout = precompileTemplate('{{ambiguous-curlies}}');
 
-      let sharedComponent = class extends Component {
-        layout = sharedLayout;
-      };
+      let sharedComponent = setComponentTemplate(sharedLayout, class extends Component {});
 
       this.add(
         'template:application',

packages/@ember/-internals/glimmer/tests/integration/application/hot-reload-test.js

@@ -1,7 +1,8 @@
 import { moduleFor, ApplicationTestCase, strip, runTask } from 'internal-test-helpers';
 
 import Service, { service } from '@ember/service';
-import { Component, Helper } from '@ember/-internals/glimmer';
+import { Helper } from '@ember/-internals/glimmer';
+import Component from '@glimmer/component';
 import { precompileTemplate } from '@ember/template-compilation';
 import { setComponentTemplate } from '@glimmer/manager';
 import templateOnly from '@ember/component/template-only';
@@ -93,8 +94,8 @@ moduleFor(
       // Create a fresh class/instance so setComponentTemplate doesn't collide
       // with the template already set on the existing class
       let FreshClass;
-      if (ComponentClass && 'extend' in ComponentClass) {
-        FreshClass = ComponentClass.extend({});
+      if (typeof ComponentClass === 'function') {
+        FreshClass = class extends ComponentClass {};
       } else {
         FreshClass = templateOnly();
       }
@@ -190,11 +191,7 @@ moduleFor(
         setComponentTemplate(
           precompileTemplate('x-foo: {{@name}} ({{this.id}})'),
           class extends Component {
-            tagName = '';
-            init() {
-              super.init(...arguments);
-              this.set('id', id++);
-            }
+            id = id++;
           }
         )
       );
@@ -204,11 +201,7 @@ moduleFor(
         setComponentTemplate(
           precompileTemplate('x-bar ({{this.id}})'),
           class extends Component {
-            tagName = '';
-            init() {
-              super.init(...arguments);
-              this.set('id', id++);
-            }
+            id = id++;
           }
         )
       );

packages/@ember/-internals/glimmer/tests/integration/application/rendering-test.js

@@ -3,7 +3,7 @@ import { moduleFor, ApplicationTestCase, strip } from 'internal-test-helpers';
 import Controller from '@ember/controller';
 import Route from '@ember/routing/route';
 import { service } from '@ember/service';
-import { Component } from '@ember/-internals/glimmer';
+import Component from '@glimmer/component';
 import { tracked } from '@ember/-internals/metal';
 import { set } from '@ember/object';
 import { backtrackingMessageFor } from '../../utils/debug-stack';
@@ -509,11 +509,11 @@ moduleFor(
       this.add(
         'component:foo',
         setComponentTemplate(
-          precompileTemplate('Hi {{this.person.name}} from component'),
+          precompileTemplate('Hi {{@person.name}} from component'),
           class extends Component {
-            init() {
-              super.init(...arguments);
-              this.set('person.name', 'Ben');
+            constructor(owner, args) {
+              super(owner, args);
+              set(this.args.person, 'name', 'Ben');
             }
           }
         )

packages/@ember/-internals/glimmer/tests/integration/components/component-template-test.js

@@ -3,7 +3,8 @@ import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
 
 import { setComponentTemplate, getComponentTemplate } from '@glimmer/manager';
 import { precompileTemplate } from '@ember/template-compilation';
-import { Component } from '../../utils/helpers';
+import Component from '@glimmer/component';
+import { Component as EmberComponent } from '../../utils/helpers';
 
 moduleFor(
   'Components test: setComponentTemplate',
@@ -16,11 +17,11 @@ moduleFor(
 
       this.render('<FooBar />');
 
-      this.assertComponentElement(this.firstChild, { content: 'hello' });
+      this.assertText('hello');
 
       runTask(() => this.rerender());
 
-      this.assertComponentElement(this.firstChild, { content: 'hello' });
+      this.assertText('hello');
     }
 
     '@test calling it with primitives asserts'(assert) {
@@ -66,7 +67,7 @@ moduleFor(
 
       let Thing = setComponentTemplate(
         precompileTemplate('hello'),
-        Component.extend().reopenClass({
+        EmberComponent.extend().reopenClass({
           toString() {
             return 'Thing';
           },
@@ -79,7 +80,10 @@ moduleFor(
     }
 
     '@test templates set with setComponentTemplate are inherited (EmberObject.extend())'() {
-      let Parent = setComponentTemplate(precompileTemplate('hello'), class extends Component {});
+      let Parent = setComponentTemplate(
+        precompileTemplate('hello'),
+        class extends EmberComponent {}
+      );
 
       this.owner.register('component:foo-bar', class extends Parent {});
 
@@ -99,11 +103,11 @@ moduleFor(
 
       this.render('<FooBar />');
 
-      this.assertComponentElement(this.firstChild, { content: 'hello' });
+      this.assertText('hello');
 
       runTask(() => this.rerender());
 
-      this.assertComponentElement(this.firstChild, { content: 'hello' });
+      this.assertText('hello');
     }
 
     '@test it can re-assign templates from another class'() {