Skip to content

Commit 26b8700

Browse files
jurgenwerkjurgenwerk
committed
Implement loader-specific module shimming via virtual network
1 parent 8453a93 commit 26b8700

File tree

9 files changed

+200
-226
lines changed

9 files changed

+200
-226
lines changed

‎packages/host/tests/acceptance/interact-submode-test.gts

+4
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,8 @@ module('Acceptance | interact submode tests', function (hooks) {
313313
assert.dom('[data-test-search-sheet]').doesNotHaveClass('results'); // Search closed
314314

315315
// The card appears on a new stack
316+
await waitFor('[data-test-operator-mode-stack]');
317+
316318
assert.dom('[data-test-operator-mode-stack]').exists({ count: 1 });
317319
assert
318320
.dom(
@@ -640,6 +642,7 @@ module('Acceptance | interact submode tests', function (hooks) {
640642
assert.dom('[data-test-search-sheet]').doesNotHaveClass('prompt'); // Search closed
641643

642644
// There are now 2 stacks
645+
643646
assert.dom('[data-test-operator-mode-stack]').exists({ count: 2 });
644647
assert.dom('[data-test-operator-mode-stack="0"]').includesText('Mango'); // Mango goes on the left stack
645648
assert.dom('[data-test-operator-mode-stack="1"]').includesText('Fadhlan');
@@ -668,6 +671,7 @@ module('Acceptance | interact submode tests', function (hooks) {
668671
assert.dom('[data-test-search-sheet]').doesNotHaveClass('prompt'); // Search closed
669672

670673
// There are now 2 stacks
674+
await waitFor('[data-test-operator-mode-stack="0"]');
671675
assert.dom('[data-test-operator-mode-stack]').exists({ count: 2 });
672676
assert.dom('[data-test-operator-mode-stack="0"]').includesText('Fadhlan');
673677
assert.dom('[data-test-operator-mode-stack="1"]').includesText('Mango'); // Mango gets move onto the right stack

‎packages/host/tests/helpers/index.gts

+1-17
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ async function setupTestRealm({
481481
for (const [path, mod] of Object.entries(contents)) {
482482
if (path.endsWith('.gts') && typeof mod !== 'string') {
483483
let moduleURLString = `${realmURL}${path.replace(/\.gts$/, '')}`;
484-
await shimModule(moduleURLString, mod as object, loader);
484+
loader.shimModule(moduleURLString, mod as object);
485485
}
486486
}
487487
let api = await loader.import<CardAPI>(`${baseRealm.url}card-api`);
@@ -573,22 +573,6 @@ export async function saveCard(instance: CardDef, id: string, loader: Loader) {
573573
return doc;
574574
}
575575

576-
export async function shimModule(
577-
moduleURL: string,
578-
module: Record<string, any>,
579-
loader: Loader,
580-
) {
581-
if (loader) {
582-
loader.shimModule(moduleURL, module);
583-
}
584-
await Promise.all(
585-
Object.keys(module).map(async (name) => {
586-
let m = await loader.import<any>(moduleURL);
587-
m[name];
588-
}),
589-
);
590-
}
591-
592576
export function setupCardLogs(
593577
hooks: NestedHooks,
594578
apiThunk: () => Promise<CardAPI>,

‎packages/host/tests/integration/components/card-basics-test.gts

+33-49
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ module('Integration | card-basics', function (hooks) {
163163
</template>
164164
};
165165
}
166-
await shimModule(`${testRealmURL}test-cards`, { Post, Person }, loader);
166+
loader.shimModule(`${testRealmURL}test-cards`, { Post, Person });
167167

168168
let helloWorld = new Post({
169169
title: 'First Post',
@@ -413,7 +413,7 @@ module('Integration | card-basics', function (hooks) {
413413
};
414414
}
415415

416-
await shimModule(`${testRealmURL}test-cards`, { Guest, Person }, loader);
416+
loader.shimModule(`${testRealmURL}test-cards`, { Guest, Person });
417417

418418
let g1 = new Guest({
419419
name: 'Madeleine',
@@ -470,7 +470,7 @@ module('Integration | card-basics', function (hooks) {
470470
class Person extends CardDef {
471471
@field firstName = contains(StringField);
472472
}
473-
await shimModule(`${testRealmURL}test-cards`, { Person }, loader);
473+
loader.shimModule(`${testRealmURL}test-cards`, { Person });
474474

475475
// deserialize a card with an ID to mark it as "saved"
476476
let card = new Person({ firstName: 'Mango' });
@@ -782,7 +782,7 @@ module('Integration | card-basics', function (hooks) {
782782
@field firstName = contains(StringField);
783783
@field pet = linksTo(Pet);
784784
}
785-
await shimModule(`${testRealmURL}test-cards`, { Person, Pet }, loader);
785+
loader.shimModule(`${testRealmURL}test-cards`, { Person, Pet });
786786

787787
let mango = new Pet({
788788
firstName: 'Mango',
@@ -879,7 +879,7 @@ module('Integration | card-basics', function (hooks) {
879879
@field firstName = contains(StringField);
880880
@field pets = linksToMany(Pet);
881881
}
882-
await shimModule(`${testRealmURL}test-cards`, { Person, Pet }, loader);
882+
loader.shimModule(`${testRealmURL}test-cards`, { Person, Pet });
883883

884884
let mango = new Pet({
885885
firstName: 'Mango',
@@ -967,7 +967,7 @@ module('Integration | card-basics', function (hooks) {
967967
// @ts-expect-error Have to purposefully bypass type-checking in order to get into this runtime error state
968968
@field pet = linksTo(StringField);
969969
}
970-
await shimModule(`${testRealmURL}test-cards`, { Person }, loader);
970+
loader.shimModule(`${testRealmURL}test-cards`, { Person });
971971

972972
try {
973973
new Person({ firstName: 'Hassan', pet: 'Mango' });
@@ -1006,11 +1006,7 @@ module('Integration | card-basics', function (hooks) {
10061006
@field firstName = contains(StringField);
10071007
@field pet = linksTo(Pet);
10081008
}
1009-
await shimModule(
1010-
`${testRealmURL}test-cards`,
1011-
{ Person, Pet, NotAPet },
1012-
loader,
1013-
);
1009+
loader.shimModule(`${testRealmURL}test-cards`, { Person, Pet, NotAPet });
10141010

10151011
let door = new NotAPet({ firstName: 'door' });
10161012
try {
@@ -1060,7 +1056,7 @@ module('Integration | card-basics', function (hooks) {
10601056
</template>
10611057
};
10621058
}
1063-
await shimModule(`${testRealmURL}test-cards`, { Person, Pet }, loader);
1059+
loader.shimModule(`${testRealmURL}test-cards`, { Person, Pet });
10641060

10651061
let vanGogh = new Pet({ firstName: 'Van Gogh' });
10661062
let mango = new Pet({ firstName: 'Mango', friend: vanGogh });
@@ -1149,7 +1145,7 @@ module('Integration | card-basics', function (hooks) {
11491145
</template>
11501146
};
11511147
}
1152-
await shimModule(`${testRealmURL}test-cards`, { Post, Person }, loader);
1148+
loader.shimModule(`${testRealmURL}test-cards`, { Post, Person });
11531149

11541150
let helloWorld = new Post({
11551151
author: new Person({
@@ -1196,16 +1192,12 @@ module('Integration | card-basics', function (hooks) {
11961192
</template>
11971193
};
11981194
}
1199-
await shimModule(
1200-
`${testRealmURL}test-cards`,
1201-
{
1202-
Post,
1203-
Person,
1204-
TestNumber,
1205-
TestString,
1206-
},
1207-
loader,
1208-
);
1195+
loader.shimModule(`${testRealmURL}test-cards`, {
1196+
Post,
1197+
Person,
1198+
TestNumber,
1199+
TestString,
1200+
});
12091201

12101202
let helloWorld = new Post({
12111203
author: new Person({ firstName: 'Arthur', number: 10 }),
@@ -1234,7 +1226,7 @@ module('Integration | card-basics', function (hooks) {
12341226
@field title = contains(title);
12351227
@field author = contains(Person);
12361228
}
1237-
await shimModule(`${testRealmURL}test-cards`, { Post, Person }, loader);
1229+
loader.shimModule(`${testRealmURL}test-cards`, { Post, Person });
12381230

12391231
let helloWorld = new Post({
12401232
title: 'First Post',
@@ -1260,7 +1252,7 @@ module('Integration | card-basics', function (hooks) {
12601252
},
12611253
});
12621254
}
1263-
await shimModule(`${testRealmURL}test-cards`, { Person }, loader);
1255+
loader.shimModule(`${testRealmURL}test-cards`, { Person });
12641256
let helloWorld = new Person({
12651257
firstName: 'Arthur',
12661258
lastName: 'M',
@@ -1300,7 +1292,7 @@ module('Integration | card-basics', function (hooks) {
13001292
</template>
13011293
};
13021294
}
1303-
await shimModule(`${testRealmURL}test-cards`, { Person }, loader);
1295+
loader.shimModule(`${testRealmURL}test-cards`, { Person });
13041296
let helloWorld = new Person({ firstName: 'Arthur', age: 10 });
13051297

13061298
await renderCard(loader, helloWorld, 'atom');
@@ -1376,7 +1368,7 @@ module('Integration | card-basics', function (hooks) {
13761368
</template>
13771369
};
13781370
}
1379-
await shimModule(`${testRealmURL}test-cards`, { Family, Person }, loader);
1371+
loader.shimModule(`${testRealmURL}test-cards`, { Family, Person });
13801372

13811373
let abdelRahmans = new Family({
13821374
people: [
@@ -1452,7 +1444,7 @@ module('Integration | card-basics', function (hooks) {
14521444
</template>
14531445
};
14541446
}
1455-
await shimModule(`${testRealmURL}test-cards`, { Family, Person }, loader);
1447+
loader.shimModule(`${testRealmURL}test-cards`, { Family, Person });
14561448

14571449
let abdelRahmans = new Family({
14581450
people: [
@@ -1498,7 +1490,7 @@ module('Integration | card-basics', function (hooks) {
14981490
</template>
14991491
};
15001492
}
1501-
await shimModule(`${testRealmURL}test-cards`, { Family, Person }, loader);
1493+
loader.shimModule(`${testRealmURL}test-cards`, { Family, Person });
15021494
let mango = new Person({
15031495
firstName: 'Mango',
15041496
});
@@ -1559,16 +1551,12 @@ module('Integration | card-basics', function (hooks) {
15591551
};
15601552
}
15611553

1562-
await shimModule(
1563-
`${testRealmURL}test-cards`,
1564-
{
1565-
Person,
1566-
Employee,
1567-
Customer,
1568-
Group,
1569-
},
1570-
loader,
1571-
);
1554+
loader.shimModule(`${testRealmURL}test-cards`, {
1555+
Person,
1556+
Employee,
1557+
Customer,
1558+
Group,
1559+
});
15721560

15731561
let group = new Group({
15741562
people: [
@@ -1708,7 +1696,7 @@ module('Integration | card-basics', function (hooks) {
17081696
@field firstName = contains(StringField);
17091697
@field languagesSpoken = containsMany(StringField);
17101698
}
1711-
await shimModule(`${testRealmURL}test-cards`, { Person }, loader);
1699+
loader.shimModule(`${testRealmURL}test-cards`, { Person });
17121700
assert.throws(
17131701
() => new Person({ languagesSpoken: 'english' }),
17141702
/Expected array for field value languagesSpoken/,
@@ -1735,7 +1723,7 @@ module('Integration | card-basics', function (hooks) {
17351723
@field title = contains(StringField);
17361724
@field author = contains(Person);
17371725
}
1738-
await shimModule(`${testRealmURL}test-cards`, { Post, Person }, loader);
1726+
loader.shimModule(`${testRealmURL}test-cards`, { Post, Person });
17391727

17401728
let helloWorld = new Post({
17411729
title: 'My Post',
@@ -1777,7 +1765,7 @@ module('Integration | card-basics', function (hooks) {
17771765
},
17781766
});
17791767
}
1780-
await shimModule(`${testRealmURL}test-cards`, { Person }, loader);
1768+
loader.shimModule(`${testRealmURL}test-cards`, { Person });
17811769

17821770
let mango = new Person({ firstName: 'Mango', isCool: true });
17831771
let root = await renderCard(loader, mango, 'isolated');
@@ -1797,7 +1785,7 @@ module('Integration | card-basics', function (hooks) {
17971785
@field isCool = contains(BooleanField);
17981786
@field isHuman = contains(BooleanField);
17991787
}
1800-
await shimModule(`${testRealmURL}test-cards`, { Person }, loader);
1788+
loader.shimModule(`${testRealmURL}test-cards`, { Person });
18011789
let mango = new Person({
18021790
firstName: 'Mango',
18031791
isCool: true,
@@ -1903,7 +1891,7 @@ module('Integration | card-basics', function (hooks) {
19031891
</template>
19041892
};
19051893
}
1906-
await shimModule(`${testRealmURL}test-cards`, { Post, Person }, loader);
1894+
loader.shimModule(`${testRealmURL}test-cards`, { Post, Person });
19071895

19081896
let helloWorld = new Post({
19091897
title: 'First Post',
@@ -2199,11 +2187,7 @@ module('Integration | card-basics', function (hooks) {
21992187
@field favoritePlaces = linksToMany(Country);
22002188
}
22012189

2202-
await shimModule(
2203-
`${testRealmURL}test-cards`,
2204-
{ Country, ContactCard },
2205-
loader,
2206-
);
2190+
loader.shimModule(`${testRealmURL}test-cards`, { Country, ContactCard });
22072191

22082192
let us = new Country({ countryName: 'United States', flag: '🇺🇸' });
22092193
let canada = new Country({ countryName: 'Canada', flag: '🇨🇦' });

‎packages/host/tests/integration/components/card-editor-test.gts

+3-3
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ module('Integration | card-editor', function (hooks) {
238238
</template>
239239
};
240240
}
241-
await shimModule(`${testRealmURL}test-cards`, { TestCard }, loader);
241+
loader.shimModule(`${testRealmURL}test-cards`, { TestCard });
242242
let card = new TestCard({ firstName: 'Mango', lastName: 'Abdel-Rahman' });
243243
await saveCard(card, `${testRealmURL}test-cards/test-card`, loader);
244244

@@ -281,7 +281,7 @@ module('Integration | card-editor', function (hooks) {
281281
</template>
282282
};
283283
}
284-
await shimModule(`${testRealmURL}test-cards`, { TestCard }, loader);
284+
loader.shimModule(`${testRealmURL}test-cards`, { TestCard });
285285

286286
let card = new TestCard({ firstName: 'Mango' });
287287
await saveCard(card, `${testRealmURL}test-cards/test-card`, loader);
@@ -331,7 +331,7 @@ module('Integration | card-editor', function (hooks) {
331331
</template>
332332
};
333333
}
334-
await shimModule(`${testRealmURL}test-cards`, { TestCard }, loader);
334+
loader.shimModule(`${testRealmURL}test-cards`, { TestCard });
335335
let card = new TestCard({ firstName: 'Mango' });
336336
await saveCard(card, `${testRealmURL}test-cards/test-card`, loader);
337337
await renderComponent(

‎packages/host/tests/integration/components/computed-test.gts

+5-5
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ module('Integration | computeds', function (hooks) {
107107
</template>
108108
};
109109
}
110-
await shimModule(`${testRealmURL}test-cards`, { Post, Person }, loader);
110+
loader.shimModule(`${testRealmURL}test-cards`, { Post, Person });
111111

112112
let firstPost = new Post({
113113
title: 'First Post',
@@ -277,7 +277,7 @@ module('Integration | computeds', function (hooks) {
277277
</template>
278278
};
279279
}
280-
await shimModule(`${testRealmURL}test-cards`, { Post, Person }, loader);
280+
loader.shimModule(`${testRealmURL}test-cards`, { Post, Person });
281281

282282
let firstPost = new Post({
283283
title: 'First Post',
@@ -412,7 +412,7 @@ module('Integration | computeds', function (hooks) {
412412
</template>
413413
};
414414
}
415-
await shimModule(`${testRealmURL}test-cards`, { Family, Person }, loader);
415+
loader.shimModule(`${testRealmURL}test-cards`, { Family, Person });
416416

417417
let abdelRahmans = new Family({
418418
people: [
@@ -495,7 +495,7 @@ module('Integration | computeds', function (hooks) {
495495
return totalAge;
496496
}
497497
}
498-
await shimModule(`${testRealmURL}test-cards`, { Family, Person }, loader);
498+
loader.shimModule(`${testRealmURL}test-cards`, { Family, Person });
499499

500500
let family = new Family({
501501
people: [
@@ -571,7 +571,7 @@ module('Integration | computeds', function (hooks) {
571571
</template>
572572
};
573573
}
574-
await shimModule(`${testRealmURL}test-cards`, { Location, Person }, loader);
574+
loader.shimModule(`${testRealmURL}test-cards`, { Location, Person });
575575

576576
let person = new Person({
577577
firstName: 'Mango',

‎packages/host/tests/integration/components/preview-test.gts

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ module('Integration | preview', function (hooks) {
4545
</template>
4646
};
4747
}
48-
await shimModule(`${testRealmURL}test-cards`, { TestCard }, loader);
48+
loader.shimModule(`${testRealmURL}test-cards`, { TestCard });
4949
let card = new TestCard({ firstName: 'Mango ' });
5050
await renderComponent(
5151
class TestDriver extends GlimmerComponent {

0 commit comments

Comments
 (0)