Skip to content

Commit 7b9f0af

Browse files
rwjbluerwjblue
authored
Merge pull request #18436 from Gaurav0/deprecate_globals_resolver
[DEPRECATION] Deprecate globals resolver
2 parents fbae785 + e7b2c13 commit 7b9f0af

22 files changed

+614
-366
lines changed

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
import { ApplicationTestCase, moduleFor, strip } from 'internal-test-helpers';
1+
import {
2+
ApplicationTestCase,
3+
ModuleBasedTestResolver,
4+
moduleFor,
5+
strip,
6+
} from 'internal-test-helpers';
27

38
import { ENV } from '@ember/-internals/environment';
49
import {
@@ -292,6 +297,7 @@ if (ENV._DEBUG_RENDER_TREE) {
292297
'engine:foo',
293298
class extends Engine {
294299
isFooEngine = true;
300+
Resolver = ModuleBasedTestResolver;
295301

296302
init() {
297303
super.init(...arguments);
@@ -327,6 +333,8 @@ if (ENV._DEBUG_RENDER_TREE) {
327333
this.add(
328334
'engine:bar',
329335
class extends Engine {
336+
Resolver = ModuleBasedTestResolver;
337+
330338
init() {
331339
super.init(...arguments);
332340
this.register(
@@ -670,6 +678,7 @@ if (ENV._DEBUG_RENDER_TREE) {
670678
'engine:foo',
671679
class extends Engine {
672680
isFooEngine = true;
681+
Resolver = ModuleBasedTestResolver;
673682

674683
init() {
675684
super.init(...arguments);

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

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
import { moduleFor, ApplicationTestCase, strip, runTaskNext } from 'internal-test-helpers';
1+
import {
2+
moduleFor,
3+
ApplicationTestCase,
4+
ModuleBasedTestResolver,
5+
strip,
6+
runTaskNext,
7+
} from 'internal-test-helpers';
28

39
import { Component } from '@ember/-internals/glimmer';
410
import { Route } from '@ember/-internals/routing';
@@ -80,6 +86,8 @@ moduleFor(
8086
this.add(
8187
'engine:blog',
8288
Engine.extend({
89+
Resolver: ModuleBasedTestResolver,
90+
8391
init() {
8492
this._super(...arguments);
8593
this.register(
@@ -131,6 +139,8 @@ moduleFor(
131139
this.add(
132140
'engine:chat-engine',
133141
Engine.extend({
142+
Resolver: ModuleBasedTestResolver,
143+
134144
init() {
135145
this._super(...arguments);
136146
this.register('template:application', compile('Engine'));
@@ -167,6 +177,8 @@ moduleFor(
167177
this.add(
168178
'engine:blog',
169179
Engine.extend({
180+
Resolver: ModuleBasedTestResolver,
181+
170182
init() {
171183
this._super(...arguments);
172184
this.register('template:foo', compile('foo partial'));
@@ -202,6 +214,8 @@ moduleFor(
202214
this.add(
203215
'engine:chat-engine',
204216
Engine.extend({
217+
Resolver: ModuleBasedTestResolver,
218+
205219
init() {
206220
this._super(...arguments);
207221
this.register('template:foo', compile('foo partial'));
@@ -230,6 +244,8 @@ moduleFor(
230244
this.add(
231245
'engine:chat-engine',
232246
Engine.extend({
247+
Resolver: ModuleBasedTestResolver,
248+
233249
init() {
234250
this._super(...arguments);
235251
this.register('template:components/foo-bar', compile(`{{partial "troll"}}`));
@@ -289,6 +305,8 @@ moduleFor(
289305
this.add(
290306
'engine:blog',
291307
Engine.extend({
308+
Resolver: ModuleBasedTestResolver,
309+
292310
init() {
293311
this._super(...arguments);
294312

@@ -344,6 +362,8 @@ moduleFor(
344362
this.add(
345363
'engine:blog',
346364
Engine.extend({
365+
Resolver: ModuleBasedTestResolver,
366+
347367
init() {
348368
this._super(...arguments);
349369
this.register(
@@ -486,6 +506,8 @@ moduleFor(
486506
this.add(
487507
'engine:blog',
488508
Engine.extend({
509+
Resolver: ModuleBasedTestResolver,
510+
489511
init() {
490512
this._super(...arguments);
491513
this.register('template:application', compile('Engine{{outlet}}'));

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

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
import { moduleFor, ApplicationTestCase, RenderingTestCase, runTask } from 'internal-test-helpers';
1+
import {
2+
moduleFor,
3+
ApplicationTestCase,
4+
ModuleBasedTestResolver,
5+
RenderingTestCase,
6+
runTask,
7+
} from 'internal-test-helpers';
28

39
import { set } from '@ember/-internals/metal';
410
import { getOwner } from '@ember/-internals/owner';
@@ -48,6 +54,7 @@ moduleFor(
4854
'engine:chat',
4955
Engine.extend({
5056
router: null,
57+
Resolver: ModuleBasedTestResolver,
5158

5259
init() {
5360
this._super(...arguments);
@@ -165,6 +172,8 @@ moduleFor(
165172
'engine:foo',
166173
Engine.extend({
167174
router: null,
175+
Resolver: ModuleBasedTestResolver,
176+
168177
init() {
169178
this._super(...arguments);
170179
this.register(
@@ -180,6 +189,8 @@ moduleFor(
180189
'engine:bar',
181190
Engine.extend({
182191
router: null,
192+
Resolver: ModuleBasedTestResolver,
193+
183194
init() {
184195
this._super(...arguments);
185196
this.register(
@@ -244,6 +255,8 @@ moduleFor(
244255
'engine:foo',
245256
Engine.extend({
246257
router: null,
258+
Resolver: ModuleBasedTestResolver,
259+
247260
init() {
248261
this._super(...arguments);
249262
this.register(
@@ -299,6 +312,8 @@ moduleFor(
299312
'engine:paramEngine',
300313
Engine.extend({
301314
router: null,
315+
Resolver: ModuleBasedTestResolver,
316+
302317
init() {
303318
this._super(...arguments);
304319
this.register(
@@ -393,6 +408,8 @@ moduleFor(
393408
'engine:componentParamEngine',
394409
Engine.extend({
395410
router: null,
411+
Resolver: ModuleBasedTestResolver,
412+
396413
init() {
397414
this._super(...arguments);
398415
this.register(
@@ -429,6 +446,8 @@ if (!EMBER_ROUTING_MODEL_ARG) {
429446
'engine:paramEngine',
430447
Engine.extend({
431448
router: null,
449+
Resolver: ModuleBasedTestResolver,
450+
432451
init() {
433452
this._super(...arguments);
434453
this.register(

0 commit comments

Comments
 (0)