Skip to content

Commit 9582702

Browse files
mansonamansona
committed
fix strange this context issues with tests
1 parent 051bf15 commit 9582702

File tree

6 files changed

+63
-64
lines changed

6 files changed

+63
-64
lines changed

‎tests/components/crate-row-test.gjs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ module('Component | CrateRow', function (hooks) {
1717
this.db.version.create({ crate, num: '1.1.2' });
1818

1919
let store = this.owner.lookup('service:store');
20-
this.crate = await store.findRecord('crate', crate.name);
20+
let crateModel = await store.findRecord('crate', crate.name);
2121

22-
await render(<template><CrateRow @crate={{this.crate}} /></template>);
22+
await render(<template><CrateRow @crate={{crateModel}} /></template>);
2323
assert.dom('[data-test-crate-link]').hasText('foo');
2424
assert.dom('[data-test-version]').hasText('v1.1.2');
2525
assert.dom('[data-test-copy-toml-button]').exists();
@@ -32,9 +32,9 @@ module('Component | CrateRow', function (hooks) {
3232
this.db.version.create({ crate, num: '1.0.0-beta.2' });
3333

3434
let store = this.owner.lookup('service:store');
35-
this.crate = await store.findRecord('crate', crate.name);
35+
let crateModel = await store.findRecord('crate', crate.name);
3636

37-
await render(<template><CrateRow @crate={{this.crate}} /></template>);
37+
await render(<template><CrateRow @crate={{crateModel}} /></template>);
3838
assert.dom('[data-test-crate-link]').hasText('foo');
3939
assert.dom('[data-test-version]').hasText('v1.0.0-beta.3');
4040
assert.dom('[data-test-copy-toml-button]').exists();
@@ -46,9 +46,9 @@ module('Component | CrateRow', function (hooks) {
4646
this.db.version.create({ crate, num: '1.2.3', yanked: true });
4747

4848
let store = this.owner.lookup('service:store');
49-
this.crate = await store.findRecord('crate', crate.name);
49+
let crateModel = await store.findRecord('crate', crate.name);
5050

51-
await render(<template><CrateRow @crate={{this.crate}} /></template>);
51+
await render(<template><CrateRow @crate={{crateModel}} /></template>);
5252
assert.dom('[data-test-crate-link]').hasText('foo');
5353
assert.dom('[data-test-version]').doesNotExist();
5454
assert.dom('[data-test-copy-toml-button]').doesNotExist();

‎tests/components/crate-sidebar/playground-button-test.gjs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ module('Component | CrateSidebar | Playground Button', function (hooks) {
3333
this.db.version.create({ crate, num: '1.0.0' });
3434

3535
let store = this.owner.lookup('service:store');
36-
this.crate = await store.findRecord('crate', crate.name);
37-
this.version = (await this.crate.versions).slice()[0];
38-
await this.crate.loadOwnersTask.perform();
36+
let crateModel = await store.findRecord('crate', crate.name);
37+
let version = (await crateModel.versions).slice()[0];
38+
await crateModel.loadOwnersTask.perform();
3939

40-
await render(<template><CrateSidebar @crate={{this.crate}} @version={{this.version}} /></template>);
40+
await render(<template><CrateSidebar @crate={{crateModel}} @version={{version}} /></template>);
4141
assert.dom('[data-test-playground-button]').doesNotExist();
4242
});
4343

@@ -46,14 +46,14 @@ module('Component | CrateSidebar | Playground Button', function (hooks) {
4646
this.db.version.create({ crate, num: '1.0.0' });
4747

4848
let store = this.owner.lookup('service:store');
49-
this.crate = await store.findRecord('crate', crate.name);
50-
this.version = (await this.crate.versions).slice()[0];
51-
await this.crate.loadOwnersTask.perform();
49+
let crateModel = await store.findRecord('crate', crate.name);
50+
let version = (await crateModel.versions).slice()[0];
51+
await crateModel.loadOwnersTask.perform();
5252

5353
let expectedHref =
5454
'https://play.rust-lang.org/?edition=2021&code=use%20aho_corasick%3B%0A%0Afn%20main()%20%7B%0A%20%20%20%20%2F%2F%20try%20using%20the%20%60aho_corasick%60%20crate%20here%0A%7D';
5555

56-
await render(<template><CrateSidebar @crate={{this.crate}} @version={{this.version}} /></template>);
56+
await render(<template><CrateSidebar @crate={{crateModel}} @version={{version}} /></template>);
5757
assert.dom('[data-test-playground-button]').hasAttribute('href', expectedHref);
5858
});
5959

@@ -65,11 +65,11 @@ module('Component | CrateSidebar | Playground Button', function (hooks) {
6565
this.worker.use(http.get('https://play.rust-lang.org/meta/crates', () => deferred.promise));
6666

6767
let store = this.owner.lookup('service:store');
68-
this.crate = await store.findRecord('crate', crate.name);
69-
this.version = (await this.crate.versions).slice()[0];
70-
await this.crate.loadOwnersTask.perform();
68+
let crateModel = await store.findRecord('crate', crate.name);
69+
let version = (await crateModel.versions).slice()[0];
70+
await crateModel.loadOwnersTask.perform();
7171

72-
render(<template><CrateSidebar @crate={{this.crate}} @version={{this.version}} /></template>);
72+
render(<template><CrateSidebar @crate={{crateModel}} @version={{version}} /></template>);
7373
await waitFor('[data-test-owners]');
7474
assert.dom('[data-test-playground-button]').doesNotExist();
7575

@@ -85,11 +85,11 @@ module('Component | CrateSidebar | Playground Button', function (hooks) {
8585
this.worker.use(http.get('https://play.rust-lang.org/meta/crates', () => error));
8686

8787
let store = this.owner.lookup('service:store');
88-
this.crate = await store.findRecord('crate', crate.name);
89-
this.version = (await this.crate.versions).slice()[0];
90-
await this.crate.loadOwnersTask.perform();
88+
let crateModel = await store.findRecord('crate', crate.name);
89+
let version = (await crateModel.versions).slice()[0];
90+
await crateModel.loadOwnersTask.perform();
9191

92-
await render(<template><CrateSidebar @crate={{this.crate}} @version={{this.version}} /></template>);
92+
await render(<template><CrateSidebar @crate={{crateModel}} @version={{version}} /></template>);
9393
assert.dom('[data-test-playground-button]').doesNotExist();
9494
});
9595
});

‎tests/components/crate-sidebar/toml-snippet-test.gjs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ module('Component | CrateSidebar | toml snippet', function (hooks) {
1414
this.db.version.create({ crate, num: '1.0.0' });
1515

1616
let store = this.owner.lookup('service:store');
17-
this.crate = await store.findRecord('crate', crate.name);
18-
this.version = (await this.crate.versions).slice()[0];
19-
await this.crate.loadOwnersTask.perform();
17+
let crateModel = await store.findRecord('crate', crate.name);
18+
let version = (await crateModel.versions).slice()[0];
19+
await crateModel.loadOwnersTask.perform();
2020

21-
await render(<template><CrateSidebar @crate={{this.crate}} @version={{this.version}} /></template>);
21+
await render(<template><CrateSidebar @crate={{crateModel}} @version={{version}} /></template>);
2222
assert.dom('[title="Copy command to clipboard"]').exists().hasText('cargo add foo');
2323
assert.dom('[title="Copy Cargo.toml snippet to clipboard"]').exists().hasText('foo = "1.0.0"');
2424

2525
await render(
26-
<template><CrateSidebar @crate={{this.crate}} @version={{this.version}} @requestedVersion='1.0.0' /></template>,
26+
<template><CrateSidebar @crate={{crateModel}} @version={{version}} @requestedVersion='1.0.0' /></template>,
2727
);
2828
assert.dom('[title="Copy command to clipboard"]').exists().hasText('cargo add foo@=1.0.0');
2929
assert.dom('[title="Copy Cargo.toml snippet to clipboard"]').exists().hasText('foo = "=1.0.0"');
@@ -34,11 +34,11 @@ module('Component | CrateSidebar | toml snippet', function (hooks) {
3434
this.db.version.create({ crate, num: '1.0.0+abcdef' });
3535

3636
let store = this.owner.lookup('service:store');
37-
this.crate = await store.findRecord('crate', crate.name);
38-
this.version = (await this.crate.versions).slice()[0];
39-
await this.crate.loadOwnersTask.perform();
37+
let crateModel = await store.findRecord('crate', crate.name);
38+
let version = (await crateModel.versions).slice()[0];
39+
await crateModel.loadOwnersTask.perform();
4040

41-
await render(<template><CrateSidebar @crate={{this.crate}} @version={{this.version}} /></template>);
41+
await render(<template><CrateSidebar @crate={{crateModel}} @version={{version}} /></template>);
4242
assert.dom('[title="Copy Cargo.toml snippet to clipboard"]').exists().hasText('foo = "1.0.0"');
4343
});
4444

@@ -47,11 +47,11 @@ module('Component | CrateSidebar | toml snippet', function (hooks) {
4747
this.db.version.create({ crate, num: '1.0.0-alpha+abcdef' });
4848

4949
let store = this.owner.lookup('service:store');
50-
this.crate = await store.findRecord('crate', crate.name);
51-
this.version = (await this.crate.versions).slice()[0];
52-
await this.crate.loadOwnersTask.perform();
50+
let crateModel = await store.findRecord('crate', crate.name);
51+
let version = (await crateModel.versions).slice()[0];
52+
await crateModel.loadOwnersTask.perform();
5353

54-
await render(<template><CrateSidebar @crate={{this.crate}} @version={{this.version}} /></template>);
54+
await render(<template><CrateSidebar @crate={{crateModel}} @version={{version}} /></template>);
5555
assert.dom('[title="Copy Cargo.toml snippet to clipboard"]').exists().hasText('foo = "1.0.0-alpha"');
5656
});
5757
});

‎tests/components/owners-list-test.gjs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ module('Component | OwnersList', function (hooks) {
1717
this.db.crateOwnership.create({ crate, user });
1818

1919
let store = this.owner.lookup('service:store');
20-
this.crate = await store.findRecord('crate', crate.name);
21-
await this.crate.loadOwnersTask.perform();
20+
let crateModel = await store.findRecord('crate', crate.name);
21+
await crateModel.loadOwnersTask.perform();
2222

23-
await render(<template><OwnersList @owners={{this.crate.owners}} /></template>);
23+
await render(<template><OwnersList @owners={{crateModel.owners}} /></template>);
2424
assert.dom('[data-test-owners="detailed"]').exists();
2525
assert.dom('ul > li').exists({ count: 1 });
2626
assert.dom('[data-test-owner-link]').exists({ count: 1 });
@@ -40,10 +40,10 @@ module('Component | OwnersList', function (hooks) {
4040
this.db.crateOwnership.create({ crate, user });
4141

4242
let store = this.owner.lookup('service:store');
43-
this.crate = await store.findRecord('crate', crate.name);
44-
await this.crate.loadOwnersTask.perform();
43+
let crateModel = await store.findRecord('crate', crate.name);
44+
await crateModel.loadOwnersTask.perform();
4545

46-
await render(<template><OwnersList @owners={{this.crate.owners}} /></template>);
46+
await render(<template><OwnersList @owners={{crateModel.owners}} /></template>);
4747
assert.dom('[data-test-owners="detailed"]').exists();
4848
assert.dom('ul > li').exists({ count: 1 });
4949
assert.dom('[data-test-owner-link]').exists({ count: 1 });
@@ -65,10 +65,10 @@ module('Component | OwnersList', function (hooks) {
6565
}
6666

6767
let store = this.owner.lookup('service:store');
68-
this.crate = await store.findRecord('crate', crate.name);
69-
await this.crate.loadOwnersTask.perform();
68+
let crateModel = await store.findRecord('crate', crate.name);
69+
await crateModel.loadOwnersTask.perform();
7070

71-
await render(<template><OwnersList @owners={{this.crate.owners}} /></template>);
71+
await render(<template><OwnersList @owners={{crateModel.owners}} /></template>);
7272
assert.dom('[data-test-owners="detailed"]').exists();
7373
assert.dom('ul > li').exists({ count: 5 });
7474
assert.dom('[data-test-owner-link]').exists({ count: 5 });
@@ -87,10 +87,10 @@ module('Component | OwnersList', function (hooks) {
8787
}
8888

8989
let store = this.owner.lookup('service:store');
90-
this.crate = await store.findRecord('crate', crate.name);
91-
await this.crate.loadOwnersTask.perform();
90+
let crateModel = await store.findRecord('crate', crate.name);
91+
await crateModel.loadOwnersTask.perform();
9292

93-
await render(<template><OwnersList @owners={{this.crate.owners}} /></template>);
93+
await render(<template><OwnersList @owners={{crateModel.owners}} /></template>);
9494
assert.dom('[data-test-owners="basic"]').exists();
9595
assert.dom('ul > li').exists({ count: 6 });
9696
assert.dom('[data-test-owner-link]').exists({ count: 6 });
@@ -113,10 +113,10 @@ module('Component | OwnersList', function (hooks) {
113113
}
114114

115115
let store = this.owner.lookup('service:store');
116-
this.crate = await store.findRecord('crate', crate.name);
117-
await this.crate.loadOwnersTask.perform();
116+
let crateModel = await store.findRecord('crate', crate.name);
117+
await crateModel.loadOwnersTask.perform();
118118

119-
await render(<template><OwnersList @owners={{this.crate.owners}} /></template>);
119+
await render(<template><OwnersList @owners={{crateModel.owners}} /></template>);
120120
assert.dom('[data-test-owners="detailed"]').exists();
121121
assert.dom('ul > li').exists({ count: 5 });
122122
assert.dom('[data-test-owner-link]').exists({ count: 5 });

‎tests/components/privileged-action-test.gjs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ module('Component | PrivilegedAction', hooks => {
1313
// Adds a utility function that renders a PrivilegedAction with all the
1414
// possible content blocks.
1515
this.renderComponent = async function (userAuthorised) {
16-
this.userAuthorised = userAuthorised;
1716
await render(
1817
<template>
19-
<PrivilegedAction @userAuthorised={{this.userAuthorised}}>
18+
<PrivilegedAction @userAuthorised={{userAuthorised}}>
2019
<:default><div data-test-privileged>privileged</div></:default>
2120
<:placeholder><div data-test-placeholder>placeholder</div></:placeholder>
2221
<:unprivileged><div data-test-unprivileged>unprivileged</div></:unprivileged>

‎tests/components/version-list-row-test.gjs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ module('Component | VersionList::Row', function (hooks) {
1818
let crateRecord = await store.findRecord('crate', crate.name);
1919
let versions = (await crateRecord.loadVersionsTask.perform()).slice();
2020
await crateRecord.loadOwnerUserTask.perform();
21-
this.firstVersion = versions.find(it => it.num === '0.4.0-alpha.01');
22-
this.secondVersion = versions.find(it => it.num === '0.3.0-alpha.01');
21+
let firstVersion = versions.find(it => it.num === '0.4.0-alpha.01');
22+
let secondVersion = versions.find(it => it.num === '0.3.0-alpha.01');
2323

24-
await render(<template><Row @version={{this.firstVersion}} /></template>);
24+
await render(<template><Row @version={{firstVersion}} /></template>);
2525
assert.dom('[data-test-release-track]').hasText('0.4');
2626
assert.dom('[data-test-release-track-link]').hasText('0.4.0-alpha.01');
2727

28-
await render(<template><Row @version={{this.secondVersion}} /></template>);
28+
await render(<template><Row @version={{secondVersion}} /></template>);
2929
assert.dom('[data-test-release-track]').hasText('0.3');
3030
assert.dom('[data-test-release-track-link]').hasText('0.3.0-alpha.01');
3131
});
@@ -37,10 +37,10 @@ module('Component | VersionList::Row', function (hooks) {
3737

3838
let store = this.owner.lookup('service:store');
3939
let crateRecord = await store.findRecord('crate', crate.name);
40-
this.version = (await crateRecord.loadVersionsTask.perform()).slice()[0];
40+
let versionModel = (await crateRecord.loadVersionsTask.perform()).slice()[0];
4141
await crateRecord.loadOwnerUserTask.perform();
4242

43-
await render(<template><Row @version={{this.version}} /></template>);
43+
await render(<template><Row @version={{versionModel}} /></template>);
4444
assert.dom('[data-test-release-track]').hasText('?');
4545
assert.dom('[data-test-release-track-link]').hasText(version);
4646
});
@@ -73,17 +73,17 @@ module('Component | VersionList::Row', function (hooks) {
7373
let crateRecord = await store.findRecord('crate', crate.name);
7474
let versions = (await crateRecord.loadVersionsTask.perform()).slice();
7575
await crateRecord.loadOwnerUserTask.perform();
76-
this.firstVersion = versions.find(it => it.num === '0.1.0');
77-
this.secondVersion = versions.find(it => it.num === '0.2.0');
78-
this.thirdVersion = versions.find(it => it.num === '0.3.0');
76+
let firstVersion = versions.find(it => it.num === '0.1.0');
77+
let secondVersion = versions.find(it => it.num === '0.2.0');
78+
let thirdVersion = versions.find(it => it.num === '0.3.0');
7979

80-
await render(<template><Row @version={{this.firstVersion}} /></template>);
80+
await render(<template><Row @version={{firstVersion}} /></template>);
8181
assert.dom('[data-test-feature-list]').doesNotExist();
8282

83-
await render(<template><Row @version={{this.secondVersion}} /></template>);
83+
await render(<template><Row @version={{secondVersion}} /></template>);
8484
assert.dom('[data-test-feature-list]').hasText('1 Feature');
8585

86-
await render(<template><Row @version={{this.thirdVersion}} /></template>);
86+
await render(<template><Row @version={{thirdVersion}} /></template>);
8787
assert.dom('[data-test-feature-list]').hasText('2 Features');
8888
});
8989
});

0 commit comments

Comments
 (0)