Skip to content

Commit b3a07fe

Browse files
NullVoxPopuliNullVoxPopuli
authored
Merge pull request #21581 from emberjs/nvp/modernize-tests
Modernize tests (part 1 -- more `@glimmer/component`)
2 parents 8730ec0 + 277f47f commit b3a07fe

39 files changed

Lines changed: 282 additions & 294 deletions

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { ApplicationTestCase, ModuleBasedTestResolver, moduleFor } from 'internal-test-helpers';
22

33
import { ENV } from '@ember/-internals/environment';
4-
import { Component, setComponentManager } from '@ember/-internals/glimmer';
4+
import { Component as EmberComponent, setComponentManager } from '@ember/-internals/glimmer';
5+
import Component from '@glimmer/component';
56
import type { InternalOwner } from '@ember/-internals/owner';
67
import Route from '@ember/routing/route';
78
import Controller from '@ember/controller';
@@ -991,7 +992,7 @@ if (ENV._DEBUG_RENDER_TREE) {
991992

992993
this.add(
993994
'component:hello-world',
994-
setComponentTemplate(precompileTemplate('Hello World'), class extends Component {})
995+
setComponentTemplate(precompileTemplate('Hello World'), class extends EmberComponent {})
995996
);
996997

997998
await this.visit('/');
@@ -1710,8 +1711,8 @@ if (ENV._DEBUG_RENDER_TREE) {
17101711
setComponentTemplate(
17111712
precompileTemplate('{{@name}}'),
17121713
class extends Component {
1713-
constructor(owner: InternalOwner) {
1714-
super(owner);
1714+
constructor(owner: InternalOwner, args: object) {
1715+
super(owner, args);
17151716
throw new Error('oops!');
17161717
}
17171718
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
runTaskNext,
66
} from 'internal-test-helpers';
77

8-
import { Component } from '@ember/-internals/glimmer';
8+
import Component from '@glimmer/component';
99
import Route from '@ember/routing/route';
1010
import { RSVP } from '@ember/-internals/runtime';
1111
import Controller from '@ember/controller';
@@ -235,9 +235,7 @@ moduleFor(
235235

236236
let sharedLayout = precompileTemplate('{{ambiguous-curlies}}');
237237

238-
let sharedComponent = class extends Component {
239-
layout = sharedLayout;
240-
};
238+
let sharedComponent = setComponentTemplate(sharedLayout, class extends Component {});
241239

242240
this.add(
243241
'template:application',

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

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { moduleFor, ApplicationTestCase, strip, runTask } from 'internal-test-helpers';
22

33
import Service, { service } from '@ember/service';
4-
import { Component, Helper } from '@ember/-internals/glimmer';
4+
import { Helper } from '@ember/-internals/glimmer';
5+
import Component from '@glimmer/component';
56
import { precompileTemplate } from '@ember/template-compilation';
67
import { setComponentTemplate } from '@glimmer/manager';
78
import templateOnly from '@ember/component/template-only';
@@ -93,8 +94,8 @@ moduleFor(
9394
// Create a fresh class/instance so setComponentTemplate doesn't collide
9495
// with the template already set on the existing class
9596
let FreshClass;
96-
if (ComponentClass && 'extend' in ComponentClass) {
97-
FreshClass = ComponentClass.extend({});
97+
if (typeof ComponentClass === 'function') {
98+
FreshClass = class extends ComponentClass {};
9899
} else {
99100
FreshClass = templateOnly();
100101
}
@@ -190,11 +191,7 @@ moduleFor(
190191
setComponentTemplate(
191192
precompileTemplate('x-foo: {{@name}} ({{this.id}})'),
192193
class extends Component {
193-
tagName = '';
194-
init() {
195-
super.init(...arguments);
196-
this.set('id', id++);
197-
}
194+
id = id++;
198195
}
199196
)
200197
);
@@ -204,11 +201,7 @@ moduleFor(
204201
setComponentTemplate(
205202
precompileTemplate('x-bar ({{this.id}})'),
206203
class extends Component {
207-
tagName = '';
208-
init() {
209-
super.init(...arguments);
210-
this.set('id', id++);
211-
}
204+
id = id++;
212205
}
213206
)
214207
);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { moduleFor, ApplicationTestCase, strip } from 'internal-test-helpers';
33
import Controller from '@ember/controller';
44
import Route from '@ember/routing/route';
55
import { service } from '@ember/service';
6-
import { Component } from '@ember/-internals/glimmer';
6+
import Component from '@glimmer/component';
77
import { tracked } from '@ember/-internals/metal';
88
import { set } from '@ember/object';
99
import { backtrackingMessageFor } from '../../utils/debug-stack';
@@ -509,11 +509,11 @@ moduleFor(
509509
this.add(
510510
'component:foo',
511511
setComponentTemplate(
512-
precompileTemplate('Hi {{this.person.name}} from component'),
512+
precompileTemplate('Hi {{@person.name}} from component'),
513513
class extends Component {
514-
init() {
515-
super.init(...arguments);
516-
this.set('person.name', 'Ben');
514+
constructor(owner, args) {
515+
super(owner, args);
516+
set(this.args.person, 'name', 'Ben');
517517
}
518518
}
519519
)

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import { moduleFor, RenderingTestCase, runTask } from 'internal-test-helpers';
33

44
import { setComponentTemplate, getComponentTemplate } from '@glimmer/manager';
55
import { precompileTemplate } from '@ember/template-compilation';
6-
import { Component } from '../../utils/helpers';
6+
import Component from '@glimmer/component';
7+
import { Component as EmberComponent } from '../../utils/helpers';
78

89
moduleFor(
910
'Components test: setComponentTemplate',
@@ -16,11 +17,11 @@ moduleFor(
1617

1718
this.render('<FooBar />');
1819

19-
this.assertComponentElement(this.firstChild, { content: 'hello' });
20+
this.assertText('hello');
2021

2122
runTask(() => this.rerender());
2223

23-
this.assertComponentElement(this.firstChild, { content: 'hello' });
24+
this.assertText('hello');
2425
}
2526

2627
'@test calling it with primitives asserts'(assert) {
@@ -66,7 +67,7 @@ moduleFor(
6667

6768
let Thing = setComponentTemplate(
6869
precompileTemplate('hello'),
69-
Component.extend().reopenClass({
70+
EmberComponent.extend().reopenClass({
7071
toString() {
7172
return 'Thing';
7273
},
@@ -79,7 +80,10 @@ moduleFor(
7980
}
8081

8182
'@test templates set with setComponentTemplate are inherited (EmberObject.extend())'() {
82-
let Parent = setComponentTemplate(precompileTemplate('hello'), class extends Component {});
83+
let Parent = setComponentTemplate(
84+
precompileTemplate('hello'),
85+
class extends EmberComponent {}
86+
);
8387

8488
this.owner.register('component:foo-bar', class extends Parent {});
8589

@@ -99,11 +103,11 @@ moduleFor(
99103

100104
this.render('<FooBar />');
101105

102-
this.assertComponentElement(this.firstChild, { content: 'hello' });
106+
this.assertText('hello');
103107

104108
runTask(() => this.rerender());
105109

106-
this.assertComponentElement(this.firstChild, { content: 'hello' });
110+
this.assertText('hello');
107111
}
108112

109113
'@test it can re-assign templates from another class'() {

0 commit comments

Comments
 (0)