fix strange this context issues with tests

Author: mansona

tests/components/crate-row-test.gjs

@@ -17,9 +17,9 @@ module('Component | CrateRow', function (hooks) {
     this.db.version.create({ crate, num: '1.1.2' });
 
     let store = this.owner.lookup('service:store');
-    this.crate = await store.findRecord('crate', crate.name);
+    let crateModel = await store.findRecord('crate', crate.name);
 
-    await render(<template><CrateRow @crate={{this.crate}} /></template>);
+    await render(<template><CrateRow @crate={{crateModel}} /></template>);
     assert.dom('[data-test-crate-link]').hasText('foo');
     assert.dom('[data-test-version]').hasText('v1.1.2');
     assert.dom('[data-test-copy-toml-button]').exists();
@@ -32,9 +32,9 @@ module('Component | CrateRow', function (hooks) {
     this.db.version.create({ crate, num: '1.0.0-beta.2' });
 
     let store = this.owner.lookup('service:store');
-    this.crate = await store.findRecord('crate', crate.name);
+    let crateModel = await store.findRecord('crate', crate.name);
 
-    await render(<template><CrateRow @crate={{this.crate}} /></template>);
+    await render(<template><CrateRow @crate={{crateModel}} /></template>);
     assert.dom('[data-test-crate-link]').hasText('foo');
     assert.dom('[data-test-version]').hasText('v1.0.0-beta.3');
     assert.dom('[data-test-copy-toml-button]').exists();
@@ -46,9 +46,9 @@ module('Component | CrateRow', function (hooks) {
     this.db.version.create({ crate, num: '1.2.3', yanked: true });
 
     let store = this.owner.lookup('service:store');
-    this.crate = await store.findRecord('crate', crate.name);
+    let crateModel = await store.findRecord('crate', crate.name);
 
-    await render(<template><CrateRow @crate={{this.crate}} /></template>);
+    await render(<template><CrateRow @crate={{crateModel}} /></template>);
     assert.dom('[data-test-crate-link]').hasText('foo');
     assert.dom('[data-test-version]').doesNotExist();
     assert.dom('[data-test-copy-toml-button]').doesNotExist();

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

@@ -33,11 +33,11 @@ module('Component | CrateSidebar | Playground Button', function (hooks) {
     this.db.version.create({ crate, num: '1.0.0' });
 
     let store = this.owner.lookup('service:store');
-    this.crate = await store.findRecord('crate', crate.name);
-    this.version = (await this.crate.versions).slice()[0];
-    await this.crate.loadOwnersTask.perform();
+    let crateModel = await store.findRecord('crate', crate.name);
+    let version = (await crateModel.versions).slice()[0];
+    await crateModel.loadOwnersTask.perform();
 
-    await render(<template><CrateSidebar @crate={{this.crate}} @version={{this.version}} /></template>);
+    await render(<template><CrateSidebar @crate={{crateModel}} @version={{version}} /></template>);
     assert.dom('[data-test-playground-button]').doesNotExist();
   });
 
@@ -46,14 +46,14 @@ module('Component | CrateSidebar | Playground Button', function (hooks) {
     this.db.version.create({ crate, num: '1.0.0' });
 
     let store = this.owner.lookup('service:store');
-    this.crate = await store.findRecord('crate', crate.name);
-    this.version = (await this.crate.versions).slice()[0];
-    await this.crate.loadOwnersTask.perform();
+    let crateModel = await store.findRecord('crate', crate.name);
+    let version = (await crateModel.versions).slice()[0];
+    await crateModel.loadOwnersTask.perform();
 
     let expectedHref =
       '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';
 
-    await render(<template><CrateSidebar @crate={{this.crate}} @version={{this.version}} /></template>);
+    await render(<template><CrateSidebar @crate={{crateModel}} @version={{version}} /></template>);
     assert.dom('[data-test-playground-button]').hasAttribute('href', expectedHref);
   });
 
@@ -65,11 +65,11 @@ module('Component | CrateSidebar | Playground Button', function (hooks) {
     this.worker.use(http.get('https://play.rust-lang.org/meta/crates', () => deferred.promise));
 
     let store = this.owner.lookup('service:store');
-    this.crate = await store.findRecord('crate', crate.name);
-    this.version = (await this.crate.versions).slice()[0];
-    await this.crate.loadOwnersTask.perform();
+    let crateModel = await store.findRecord('crate', crate.name);
+    let version = (await crateModel.versions).slice()[0];
+    await crateModel.loadOwnersTask.perform();
 
-    render(<template><CrateSidebar @crate={{this.crate}} @version={{this.version}} /></template>);
+    render(<template><CrateSidebar @crate={{crateModel}} @version={{version}} /></template>);
     await waitFor('[data-test-owners]');
     assert.dom('[data-test-playground-button]').doesNotExist();
 
@@ -85,11 +85,11 @@ module('Component | CrateSidebar | Playground Button', function (hooks) {
     this.worker.use(http.get('https://play.rust-lang.org/meta/crates', () => error));
 
     let store = this.owner.lookup('service:store');
-    this.crate = await store.findRecord('crate', crate.name);
-    this.version = (await this.crate.versions).slice()[0];
-    await this.crate.loadOwnersTask.perform();
+    let crateModel = await store.findRecord('crate', crate.name);
+    let version = (await crateModel.versions).slice()[0];
+    await crateModel.loadOwnersTask.perform();
 
-    await render(<template><CrateSidebar @crate={{this.crate}} @version={{this.version}} /></template>);
+    await render(<template><CrateSidebar @crate={{crateModel}} @version={{version}} /></template>);
     assert.dom('[data-test-playground-button]').doesNotExist();
   });
 });

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

@@ -14,16 +14,16 @@ module('Component | CrateSidebar | toml snippet', function (hooks) {
     this.db.version.create({ crate, num: '1.0.0' });
 
     let store = this.owner.lookup('service:store');
-    this.crate = await store.findRecord('crate', crate.name);
-    this.version = (await this.crate.versions).slice()[0];
-    await this.crate.loadOwnersTask.perform();
+    let crateModel = await store.findRecord('crate', crate.name);
+    let version = (await crateModel.versions).slice()[0];
+    await crateModel.loadOwnersTask.perform();
 
-    await render(<template><CrateSidebar @crate={{this.crate}} @version={{this.version}} /></template>);
+    await render(<template><CrateSidebar @crate={{crateModel}} @version={{version}} /></template>);
     assert.dom('[title="Copy command to clipboard"]').exists().hasText('cargo add foo');
     assert.dom('[title="Copy Cargo.toml snippet to clipboard"]').exists().hasText('foo = "1.0.0"');
 
     await render(
-      <template><CrateSidebar @crate={{this.crate}} @version={{this.version}} @requestedVersion='1.0.0' /></template>,
+      <template><CrateSidebar @crate={{crateModel}} @version={{version}} @requestedVersion='1.0.0' /></template>,
     );
     assert.dom('[title="Copy command to clipboard"]').exists().hasText('cargo add foo@=1.0.0');
     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) {
     this.db.version.create({ crate, num: '1.0.0+abcdef' });
 
     let store = this.owner.lookup('service:store');
-    this.crate = await store.findRecord('crate', crate.name);
-    this.version = (await this.crate.versions).slice()[0];
-    await this.crate.loadOwnersTask.perform();
+    let crateModel = await store.findRecord('crate', crate.name);
+    let version = (await crateModel.versions).slice()[0];
+    await crateModel.loadOwnersTask.perform();
 
-    await render(<template><CrateSidebar @crate={{this.crate}} @version={{this.version}} /></template>);
+    await render(<template><CrateSidebar @crate={{crateModel}} @version={{version}} /></template>);
     assert.dom('[title="Copy Cargo.toml snippet to clipboard"]').exists().hasText('foo = "1.0.0"');
   });
 
@@ -47,11 +47,11 @@ module('Component | CrateSidebar | toml snippet', function (hooks) {
     this.db.version.create({ crate, num: '1.0.0-alpha+abcdef' });
 
     let store = this.owner.lookup('service:store');
-    this.crate = await store.findRecord('crate', crate.name);
-    this.version = (await this.crate.versions).slice()[0];
-    await this.crate.loadOwnersTask.perform();
+    let crateModel = await store.findRecord('crate', crate.name);
+    let version = (await crateModel.versions).slice()[0];
+    await crateModel.loadOwnersTask.perform();
 
-    await render(<template><CrateSidebar @crate={{this.crate}} @version={{this.version}} /></template>);
+    await render(<template><CrateSidebar @crate={{crateModel}} @version={{version}} /></template>);
     assert.dom('[title="Copy Cargo.toml snippet to clipboard"]').exists().hasText('foo = "1.0.0-alpha"');
   });
 });

tests/components/owners-list-test.gjs

@@ -17,10 +17,10 @@ module('Component | OwnersList', function (hooks) {
     this.db.crateOwnership.create({ crate, user });
 
     let store = this.owner.lookup('service:store');
-    this.crate = await store.findRecord('crate', crate.name);
-    await this.crate.loadOwnersTask.perform();
+    let crateModel = await store.findRecord('crate', crate.name);
+    await crateModel.loadOwnersTask.perform();
 
-    await render(<template><OwnersList @owners={{this.crate.owners}} /></template>);
+    await render(<template><OwnersList @owners={{crateModel.owners}} /></template>);
     assert.dom('[data-test-owners="detailed"]').exists();
     assert.dom('ul > li').exists({ count: 1 });
     assert.dom('[data-test-owner-link]').exists({ count: 1 });
@@ -40,10 +40,10 @@ module('Component | OwnersList', function (hooks) {
     this.db.crateOwnership.create({ crate, user });
 
     let store = this.owner.lookup('service:store');
-    this.crate = await store.findRecord('crate', crate.name);
-    await this.crate.loadOwnersTask.perform();
+    let crateModel = await store.findRecord('crate', crate.name);
+    await crateModel.loadOwnersTask.perform();
 
-    await render(<template><OwnersList @owners={{this.crate.owners}} /></template>);
+    await render(<template><OwnersList @owners={{crateModel.owners}} /></template>);
     assert.dom('[data-test-owners="detailed"]').exists();
     assert.dom('ul > li').exists({ count: 1 });
     assert.dom('[data-test-owner-link]').exists({ count: 1 });
@@ -65,10 +65,10 @@ module('Component | OwnersList', function (hooks) {
     }
 
     let store = this.owner.lookup('service:store');
-    this.crate = await store.findRecord('crate', crate.name);
-    await this.crate.loadOwnersTask.perform();
+    let crateModel = await store.findRecord('crate', crate.name);
+    await crateModel.loadOwnersTask.perform();
 
-    await render(<template><OwnersList @owners={{this.crate.owners}} /></template>);
+    await render(<template><OwnersList @owners={{crateModel.owners}} /></template>);
     assert.dom('[data-test-owners="detailed"]').exists();
     assert.dom('ul > li').exists({ count: 5 });
     assert.dom('[data-test-owner-link]').exists({ count: 5 });
@@ -87,10 +87,10 @@ module('Component | OwnersList', function (hooks) {
     }
 
     let store = this.owner.lookup('service:store');
-    this.crate = await store.findRecord('crate', crate.name);
-    await this.crate.loadOwnersTask.perform();
+    let crateModel = await store.findRecord('crate', crate.name);
+    await crateModel.loadOwnersTask.perform();
 
-    await render(<template><OwnersList @owners={{this.crate.owners}} /></template>);
+    await render(<template><OwnersList @owners={{crateModel.owners}} /></template>);
     assert.dom('[data-test-owners="basic"]').exists();
     assert.dom('ul > li').exists({ count: 6 });
     assert.dom('[data-test-owner-link]').exists({ count: 6 });
@@ -113,10 +113,10 @@ module('Component | OwnersList', function (hooks) {
     }
 
     let store = this.owner.lookup('service:store');
-    this.crate = await store.findRecord('crate', crate.name);
-    await this.crate.loadOwnersTask.perform();
+    let crateModel = await store.findRecord('crate', crate.name);
+    await crateModel.loadOwnersTask.perform();
 
-    await render(<template><OwnersList @owners={{this.crate.owners}} /></template>);
+    await render(<template><OwnersList @owners={{crateModel.owners}} /></template>);
     assert.dom('[data-test-owners="detailed"]').exists();
     assert.dom('ul > li').exists({ count: 5 });
     assert.dom('[data-test-owner-link]').exists({ count: 5 });

tests/components/privileged-action-test.gjs

@@ -13,10 +13,9 @@ module('Component | PrivilegedAction', hooks => {
     // Adds a utility function that renders a PrivilegedAction with all the
     // possible content blocks.
     this.renderComponent = async function (userAuthorised) {
-      this.userAuthorised = userAuthorised;
       await render(
         <template>
-          <PrivilegedAction @userAuthorised={{this.userAuthorised}}>
+          <PrivilegedAction @userAuthorised={{userAuthorised}}>
             <:default><div data-test-privileged>privileged</div></:default>
             <:placeholder><div data-test-placeholder>placeholder</div></:placeholder>
             <:unprivileged><div data-test-unprivileged>unprivileged</div></:unprivileged>

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

@@ -18,14 +18,14 @@ module('Component | VersionList::Row', function (hooks) {
     let crateRecord = await store.findRecord('crate', crate.name);
     let versions = (await crateRecord.loadVersionsTask.perform()).slice();
     await crateRecord.loadOwnerUserTask.perform();
-    this.firstVersion = versions.find(it => it.num === '0.4.0-alpha.01');
-    this.secondVersion = versions.find(it => it.num === '0.3.0-alpha.01');
+    let firstVersion = versions.find(it => it.num === '0.4.0-alpha.01');
+    let secondVersion = versions.find(it => it.num === '0.3.0-alpha.01');
 
-    await render(<template><Row @version={{this.firstVersion}} /></template>);
+    await render(<template><Row @version={{firstVersion}} /></template>);
     assert.dom('[data-test-release-track]').hasText('0.4');
     assert.dom('[data-test-release-track-link]').hasText('0.4.0-alpha.01');
 
-    await render(<template><Row @version={{this.secondVersion}} /></template>);
+    await render(<template><Row @version={{secondVersion}} /></template>);
     assert.dom('[data-test-release-track]').hasText('0.3');
     assert.dom('[data-test-release-track-link]').hasText('0.3.0-alpha.01');
   });
@@ -37,10 +37,10 @@ module('Component | VersionList::Row', function (hooks) {
 
     let store = this.owner.lookup('service:store');
     let crateRecord = await store.findRecord('crate', crate.name);
-    this.version = (await crateRecord.loadVersionsTask.perform()).slice()[0];
+    let versionModel = (await crateRecord.loadVersionsTask.perform()).slice()[0];
     await crateRecord.loadOwnerUserTask.perform();
 
-    await render(<template><Row @version={{this.version}} /></template>);
+    await render(<template><Row @version={{versionModel}} /></template>);
     assert.dom('[data-test-release-track]').hasText('?');
     assert.dom('[data-test-release-track-link]').hasText(version);
   });
@@ -73,17 +73,17 @@ module('Component | VersionList::Row', function (hooks) {
     let crateRecord = await store.findRecord('crate', crate.name);
     let versions = (await crateRecord.loadVersionsTask.perform()).slice();
     await crateRecord.loadOwnerUserTask.perform();
-    this.firstVersion = versions.find(it => it.num === '0.1.0');
-    this.secondVersion = versions.find(it => it.num === '0.2.0');
-    this.thirdVersion = versions.find(it => it.num === '0.3.0');
+    let firstVersion = versions.find(it => it.num === '0.1.0');
+    let secondVersion = versions.find(it => it.num === '0.2.0');
+    let thirdVersion = versions.find(it => it.num === '0.3.0');
 
-    await render(<template><Row @version={{this.firstVersion}} /></template>);
+    await render(<template><Row @version={{firstVersion}} /></template>);
     assert.dom('[data-test-feature-list]').doesNotExist();
 
-    await render(<template><Row @version={{this.secondVersion}} /></template>);
+    await render(<template><Row @version={{secondVersion}} /></template>);
     assert.dom('[data-test-feature-list]').hasText('1 Feature');
 
-    await render(<template><Row @version={{this.thirdVersion}} /></template>);
+    await render(<template><Row @version={{thirdVersion}} /></template>);
     assert.dom('[data-test-feature-list]').hasText('2 Features');
   });
 });