tests/helpers: Add setupMirage() call to setupApplicationTest()

Turbo87 · Turbo87 · commit 592c68d25fa8 · 2021-02-07T12:24:42.000+01:00
diff --git a/tests/acceptance/404-test.js b/tests/acceptance/404-test.js
@@ -3,11 +3,8 @@ import { module, test } from 'qunit';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
-import setupMirage from '../helpers/setup-mirage';
-
 module('Acceptance | 404', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   test('/unknown-route shows a 404 page', async function (assert) {
     await visit('/unknown-route');
diff --git a/tests/acceptance/api-token-test.js b/tests/acceptance/api-token-test.js
@@ -6,12 +6,10 @@ import { Response } from 'ember-cli-mirage';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
-import setupMirage from '../helpers/setup-mirage';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | api-tokens', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   function prepare(context) {
     let user = context.server.create('user', {
diff --git a/tests/acceptance/categories-test.js b/tests/acceptance/categories-test.js
@@ -7,11 +7,9 @@ import a11yAudit from 'ember-a11y-testing/test-support/audit';
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
 import axeConfig from '../axe-config';
-import setupMirage from '../helpers/setup-mirage';
 
 module('Acceptance | categories', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   test('listing categories', async function (assert) {
     this.owner.lookup('service:intl').locale = 'en';
diff --git a/tests/acceptance/crate-following-test.js b/tests/acceptance/crate-following-test.js
@@ -5,11 +5,8 @@ import { defer } from 'rsvp';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
-import setupMirage from '../helpers/setup-mirage';
-
 module('Acceptance | Crate following', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   function prepare(context, { loggedIn = true, following = false } = {}) {
     let server = context.server;
diff --git a/tests/acceptance/crate-test.js b/tests/acceptance/crate-test.js
@@ -8,11 +8,9 @@ import { getPageTitle } from 'ember-page-title/test-support';
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
 import axeConfig from '../axe-config';
-import setupMirage from '../helpers/setup-mirage';
 
 module('Acceptance | crate page', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   test('visiting a crate page from the front page', async function (assert) {
     this.server.create('crate', { name: 'nanomsg', newest_version: '0.6.1' });
diff --git a/tests/acceptance/crates-test.js b/tests/acceptance/crates-test.js
@@ -8,11 +8,9 @@ import { getPageTitle } from 'ember-page-title/test-support';
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
 import axeConfig from '../axe-config';
-import setupMirage from '../helpers/setup-mirage';
 
 module('Acceptance | crates page', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   // should match the default set in the crates controller
   const per_page = 50;
diff --git a/tests/acceptance/dashboard-test.js b/tests/acceptance/dashboard-test.js
@@ -5,12 +5,10 @@ import percySnapshot from '@percy/ember';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
-import setupMirage from '../helpers/setup-mirage';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | Dashboard', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   test('redirects to / when not logged in', async function (assert) {
     await visit('/dashboard');
diff --git a/tests/acceptance/email-change-test.js b/tests/acceptance/email-change-test.js
@@ -3,12 +3,10 @@ import { module, test } from 'qunit';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
-import setupMirage from '../helpers/setup-mirage';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | Email Change', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   test('happy path', async function (assert) {
     let user = this.server.create('user', { email: 'old@email.com' });
diff --git a/tests/acceptance/email-confirmation-test.js b/tests/acceptance/email-confirmation-test.js
@@ -3,12 +3,10 @@ import { module, test } from 'qunit';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
-import setupMirage from '../helpers/setup-mirage';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | Email Confirmation', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   test('unauthenticated happy path', async function (assert) {
     let user = this.server.create('user', { emailVerificationToken: 'badc0ffee' });
diff --git a/tests/acceptance/front-page-test.js b/tests/acceptance/front-page-test.js
@@ -11,11 +11,9 @@ import { setupApplicationTest } from 'cargo/tests/helpers';
 
 import { summary } from '../../mirage/route-handlers/summary';
 import axeConfig from '../axe-config';
-import setupMirage from '../helpers/setup-mirage';
 
 module('Acceptance | front page', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   test('visiting /', async function (assert) {
     this.owner.lookup('service:intl').locale = 'en';
diff --git a/tests/acceptance/invites-test.js b/tests/acceptance/invites-test.js
@@ -6,12 +6,10 @@ import Response from 'ember-cli-mirage/response';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
-import setupMirage from '../helpers/setup-mirage';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | /me/pending-invites', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   function prepare(context) {
     let user = context.server.create('user');
diff --git a/tests/acceptance/keyword-test.js b/tests/acceptance/keyword-test.js
@@ -7,11 +7,9 @@ import a11yAudit from 'ember-a11y-testing/test-support/audit';
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
 import axeConfig from '../axe-config';
-import setupMirage from '../helpers/setup-mirage';
 
 module('Acceptance | keywords', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   test('keyword/:keyword_id index default sort is recent-downloads', async function (assert) {
     this.server.create('keyword', { keyword: 'network' });
diff --git a/tests/acceptance/login-test.js b/tests/acceptance/login-test.js
@@ -8,12 +8,9 @@ import { setupWindowMock } from 'ember-window-mock/test-support';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
-import setupMirage from '../helpers/setup-mirage';
-
 module('Acceptance | Login', function (hooks) {
   setupApplicationTest(hooks);
   setupWindowMock(hooks);
-  setupMirage(hooks);
 
   test('successful login', async function (assert) {
     let deferred = defer();
diff --git a/tests/acceptance/logout-test.js b/tests/acceptance/logout-test.js
@@ -3,11 +3,8 @@ import { module, test } from 'qunit';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
-import setupMirage from '../helpers/setup-mirage';
-
 module('Acceptance | Logout', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   test('successful logout', async function (assert) {
     let user = this.server.create('user', { name: 'John Doe' });
diff --git a/tests/acceptance/owners-test.js b/tests/acceptance/owners-test.js
@@ -7,11 +7,9 @@ import a11yAudit from 'ember-a11y-testing/test-support/audit';
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
 import axeConfig from '../axe-config';
-import setupMirage from '../helpers/setup-mirage';
 
 module('Acceptance | /crates/:name/owners', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   test('listing crate owners', async function (assert) {
     this.server.loadFixtures();
diff --git a/tests/acceptance/reverse-dependencies-test.js b/tests/acceptance/reverse-dependencies-test.js
@@ -3,12 +3,10 @@ import { module, test } from 'qunit';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
-import setupMirage from '../helpers/setup-mirage';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | /crates/:crate_id/reverse_dependencies', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   function prepare({ server }) {
     let foo = server.create('crate', { name: 'foo' });
diff --git a/tests/acceptance/search-test.js b/tests/acceptance/search-test.js
@@ -12,11 +12,9 @@ import { setupApplicationTest } from 'cargo/tests/helpers';
 
 import { list as listCrates } from '../../mirage/route-handlers/crates';
 import axeConfig from '../axe-config';
-import setupMirage from '../helpers/setup-mirage';
 
 module('Acceptance | search', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   test('searching for "rust"', async function (assert) {
     this.server.loadFixtures();
diff --git a/tests/acceptance/team-page-test.js b/tests/acceptance/team-page-test.js
@@ -7,11 +7,9 @@ import a11yAudit from 'ember-a11y-testing/test-support/audit';
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
 import axeConfig from '../axe-config';
-import setupMirage from '../helpers/setup-mirage';
 
 module('Acceptance | team page', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   test('has team organization display', async function (assert) {
     this.server.loadFixtures();
diff --git a/tests/acceptance/token-invites-test.js b/tests/acceptance/token-invites-test.js
@@ -6,12 +6,10 @@ import Response from 'ember-cli-mirage/response';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
-import setupMirage from '../helpers/setup-mirage';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Acceptance | /accept-invite/:token', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   test('visiting to /accept-invite shows 404 page', async function (assert) {
     await visit('/accept-invite');
diff --git a/tests/acceptance/user-page-test.js b/tests/acceptance/user-page-test.js
@@ -7,11 +7,9 @@ import a11yAudit from 'ember-a11y-testing/test-support/audit';
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
 import axeConfig from '../axe-config';
-import setupMirage from '../helpers/setup-mirage';
 
 module('Acceptance | user page', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   test('has user display', async function (assert) {
     this.server.loadFixtures();
diff --git a/tests/bugs/2329-test.js b/tests/bugs/2329-test.js
@@ -6,13 +6,11 @@ import { setupWindowMock } from 'ember-window-mock/test-support';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
-import setupMirage from '../helpers/setup-mirage';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Bug #2329', function (hooks) {
   setupApplicationTest(hooks);
   setupWindowMock(hooks);
-  setupMirage(hooks);
 
   test('is fixed', async function (assert) {
     let user = this.server.create('user');
diff --git a/tests/helpers/index.js b/tests/helpers/index.js
@@ -1,8 +1,11 @@
 import { setupApplicationTest as upstreamSetupApplicationTest } from 'ember-qunit';
 
+import setupMirage from './setup-mirage';
+
 export { setupTest, setupRenderingTest } from 'ember-qunit';
 
 // see http://emberjs.github.io/rfcs/0637-customizable-test-setups.html
 export function setupApplicationTest(hooks, options) {
   upstreamSetupApplicationTest(hooks, options);
+  setupMirage(hooks);
 }
diff --git a/tests/routes/category-test.js b/tests/routes/category-test.js
@@ -3,12 +3,10 @@ import { module, test } from 'qunit';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
-import setupMirage from '../helpers/setup-mirage';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Route | category', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   test("shows an error message if the category can't be found", async function (assert) {
     await visit('/categories/unknown');
diff --git a/tests/routes/crate/version/docs-link-test.js b/tests/routes/crate/version/docs-link-test.js
@@ -3,11 +3,8 @@ import { module, test } from 'qunit';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
-import setupMirage from '../../../helpers/setup-mirage';
-
 module('Route | crate.version | docs link', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   test('shows regular documentation link', async function (assert) {
     this.server.create('crate', { name: 'foo', documentation: 'https://foo.io/docs' });
diff --git a/tests/routes/crate/version/model-test.js b/tests/routes/crate/version/model-test.js
@@ -3,11 +3,8 @@ import { module, test } from 'qunit';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
-import setupMirage from '../../../helpers/setup-mirage';
-
 module('Route | crate.version | model() hook', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   module('with explicit version number in the URL', function () {
     test('shows yanked versions', async function (assert) {
diff --git a/tests/routes/github-authorize-test.js b/tests/routes/github-authorize-test.js
@@ -6,12 +6,9 @@ import { setupWindowMock } from 'ember-window-mock/test-support';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
-import setupMirage from '../helpers/setup-mirage';
-
 module('Route | github-authorized', function (hooks) {
   setupApplicationTest(hooks);
   setupWindowMock(hooks);
-  setupMirage(hooks);
 
   test('forwards code and state to window.opener.postMessage()', async function (assert) {
     let message = null;
diff --git a/tests/routes/keyword-test.js b/tests/routes/keyword-test.js
@@ -3,12 +3,10 @@ import { module, test } from 'qunit';
 
 import { setupApplicationTest } from 'cargo/tests/helpers';
 
-import setupMirage from '../helpers/setup-mirage';
 import { visit } from '../helpers/visit-ignoring-abort';
 
 module('Route | keyword', function (hooks) {
   setupApplicationTest(hooks);
-  setupMirage(hooks);
 
   test("shows an error message if the keyword can't be found", async function (assert) {
     await visit('/keywords/unknown');
