diff --git a/tests/acceptance/404-test.js b/tests/acceptance/404-test.js index 433db0a02ad..c0813cf6c24 100644 --- a/tests/acceptance/404-test.js +++ b/tests/acceptance/404-test.js @@ -1,12 +1,10 @@ import { currentURL, fillIn, triggerEvent, visit } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; -import setupMirage from '../helpers/setup-mirage'; +import { setupApplicationTest } from 'cargo/tests/helpers'; 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 index 299740991aa..e501d6d3f88 100644 --- a/tests/acceptance/api-token-test.js +++ b/tests/acceptance/api-token-test.js @@ -1,16 +1,15 @@ import { click, currentURL, fillIn, findAll } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; import percySnapshot from '@percy/ember'; import { Response } from 'ember-cli-mirage'; -import setupMirage from '../helpers/setup-mirage'; +import { setupApplicationTest } from 'cargo/tests/helpers'; + 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 index f5263a7837a..b1d28051ae9 100644 --- a/tests/acceptance/categories-test.js +++ b/tests/acceptance/categories-test.js @@ -1,16 +1,15 @@ import { visit } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; import percySnapshot from '@percy/ember'; 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 index 02ec698535e..38d6331b660 100644 --- a/tests/acceptance/crate-following-test.js +++ b/tests/acceptance/crate-following-test.js @@ -1,14 +1,12 @@ import { click, settled, visit, waitFor } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; import { defer } from 'rsvp'; -import setupMirage from '../helpers/setup-mirage'; +import { setupApplicationTest } from 'cargo/tests/helpers'; 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 index 09a52cc9a5a..8e8f07efca7 100644 --- a/tests/acceptance/crate-test.js +++ b/tests/acceptance/crate-test.js @@ -1,17 +1,16 @@ import { click, currentRouteName, currentURL, visit, waitFor } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, skip, test } from 'qunit'; import percySnapshot from '@percy/ember'; import a11yAudit from 'ember-a11y-testing/test-support/audit'; 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 index a75ffa0ed96..8ebd55614b8 100644 --- a/tests/acceptance/crates-test.js +++ b/tests/acceptance/crates-test.js @@ -1,17 +1,16 @@ import { click, currentURL, visit } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; import percySnapshot from '@percy/ember'; import a11yAudit from 'ember-a11y-testing/test-support/audit'; 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 index eb06746ddea..2980524fa4e 100644 --- a/tests/acceptance/dashboard-test.js +++ b/tests/acceptance/dashboard-test.js @@ -1,15 +1,14 @@ import { currentURL } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; import percySnapshot from '@percy/ember'; -import setupMirage from '../helpers/setup-mirage'; +import { setupApplicationTest } from 'cargo/tests/helpers'; + 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 index f65abb9a8b3..0a0aefb136c 100644 --- a/tests/acceptance/email-change-test.js +++ b/tests/acceptance/email-change-test.js @@ -1,13 +1,12 @@ import { click, currentURL, fillIn } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; -import setupMirage from '../helpers/setup-mirage'; +import { setupApplicationTest } from 'cargo/tests/helpers'; + 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 index 0589912ddf9..c4895e66b1f 100644 --- a/tests/acceptance/email-confirmation-test.js +++ b/tests/acceptance/email-confirmation-test.js @@ -1,13 +1,12 @@ import { currentURL } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; -import setupMirage from '../helpers/setup-mirage'; +import { setupApplicationTest } from 'cargo/tests/helpers'; + 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 index ae52fe63fb8..95d14339ff1 100644 --- a/tests/acceptance/front-page-test.js +++ b/tests/acceptance/front-page-test.js @@ -1,5 +1,4 @@ import { click, currentURL, settled, visit, waitFor } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; import { defer } from 'rsvp'; @@ -8,13 +7,13 @@ import percySnapshot from '@percy/ember'; import a11yAudit from 'ember-a11y-testing/test-support/audit'; import { getPageTitle } from 'ember-page-title/test-support'; +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 index 04bcd1766ad..eef8f844bf4 100644 --- a/tests/acceptance/invites-test.js +++ b/tests/acceptance/invites-test.js @@ -1,16 +1,15 @@ import { click, currentURL } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; import percySnapshot from '@percy/ember'; import Response from 'ember-cli-mirage/response'; -import setupMirage from '../helpers/setup-mirage'; +import { setupApplicationTest } from 'cargo/tests/helpers'; + 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 index 1bcb2940df7..f89e8623a65 100644 --- a/tests/acceptance/keyword-test.js +++ b/tests/acceptance/keyword-test.js @@ -1,16 +1,15 @@ import { visit } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; import percySnapshot from '@percy/ember'; 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 index 8bdc4016cf8..01b92c63260 100644 --- a/tests/acceptance/login-test.js +++ b/tests/acceptance/login-test.js @@ -1,5 +1,4 @@ import { click, currentURL, visit, waitFor } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; import { defer } from 'rsvp'; @@ -7,12 +6,11 @@ import { defer } from 'rsvp'; import window from 'ember-window-mock'; import { setupWindowMock } from 'ember-window-mock/test-support'; -import setupMirage from '../helpers/setup-mirage'; +import { setupApplicationTest } from 'cargo/tests/helpers'; 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 index 4372a694b58..cdf82e3f567 100644 --- a/tests/acceptance/logout-test.js +++ b/tests/acceptance/logout-test.js @@ -1,12 +1,10 @@ import { click, currentURL, visit } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; -import setupMirage from '../helpers/setup-mirage'; +import { setupApplicationTest } from 'cargo/tests/helpers'; 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 index ad21692328d..7787c7c05a2 100644 --- a/tests/acceptance/owners-test.js +++ b/tests/acceptance/owners-test.js @@ -1,16 +1,15 @@ import { click, fillIn, visit } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; import percySnapshot from '@percy/ember'; 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 index 85fd481d8ce..99c4978208b 100644 --- a/tests/acceptance/reverse-dependencies-test.js +++ b/tests/acceptance/reverse-dependencies-test.js @@ -1,13 +1,12 @@ import { click, currentURL } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; -import setupMirage from '../helpers/setup-mirage'; +import { setupApplicationTest } from 'cargo/tests/helpers'; + 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 index 1e3aee8bee6..d25586e1b09 100644 --- a/tests/acceptance/search-test.js +++ b/tests/acceptance/search-test.js @@ -1,5 +1,4 @@ import { blur, click, currentURL, fillIn, settled, triggerEvent, visit, waitFor } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; import { defer } from 'rsvp'; @@ -9,13 +8,13 @@ import a11yAudit from 'ember-a11y-testing/test-support/audit'; import { keyDown } from 'ember-keyboard/test-support/test-helpers'; import { getPageTitle } from 'ember-page-title/test-support'; +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 index ff3c2943d39..acd5625eb8c 100644 --- a/tests/acceptance/team-page-test.js +++ b/tests/acceptance/team-page-test.js @@ -1,16 +1,15 @@ import { visit } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; import percySnapshot from '@percy/ember'; 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 index 2e75a8a71c5..1eaf6ae4b24 100644 --- a/tests/acceptance/token-invites-test.js +++ b/tests/acceptance/token-invites-test.js @@ -1,16 +1,15 @@ import { currentURL } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; import percySnapshot from '@percy/ember'; import Response from 'ember-cli-mirage/response'; -import setupMirage from '../helpers/setup-mirage'; +import { setupApplicationTest } from 'cargo/tests/helpers'; + 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 index f604615d637..f94dd506c47 100644 --- a/tests/acceptance/user-page-test.js +++ b/tests/acceptance/user-page-test.js @@ -1,16 +1,15 @@ import { visit } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; import percySnapshot from '@percy/ember'; 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 index fe19096e184..d3f10684254 100644 --- a/tests/bugs/2329-test.js +++ b/tests/bugs/2329-test.js @@ -1,17 +1,16 @@ import { click, currentURL, waitFor } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; import window from 'ember-window-mock'; import { setupWindowMock } from 'ember-window-mock/test-support'; -import setupMirage from '../helpers/setup-mirage'; +import { setupApplicationTest } from 'cargo/tests/helpers'; + 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/components/crate-row-test.js b/tests/components/crate-row-test.js index 29bf448974b..ba34afb405b 100644 --- a/tests/components/crate-row-test.js +++ b/tests/components/crate-row-test.js @@ -1,9 +1,10 @@ import { render } from '@ember/test-helpers'; -import { setupRenderingTest } from 'ember-qunit'; import { module, test } from 'qunit'; import { hbs } from 'ember-cli-htmlbars'; +import { setupRenderingTest } from 'cargo/tests/helpers'; + import setupMirage from '../helpers/setup-mirage'; module('Component | CrateRow', function (hooks) { diff --git a/tests/components/download-graph-test.js b/tests/components/download-graph-test.js index 88323af0897..a930be5e06b 100644 --- a/tests/components/download-graph-test.js +++ b/tests/components/download-graph-test.js @@ -1,5 +1,4 @@ import { click, render, settled, waitFor } from '@ember/test-helpers'; -import { setupRenderingTest } from 'ember-qunit'; import { module, test } from 'qunit'; import Service from '@ember/service'; @@ -10,6 +9,8 @@ import { task } from 'ember-concurrency'; import window from 'ember-window-mock'; import { setupWindowMock } from 'ember-window-mock/test-support'; +import { setupRenderingTest } from 'cargo/tests/helpers'; + module('Component | DownloadGraph', function (hooks) { setupRenderingTest(hooks); setupWindowMock(hooks); diff --git a/tests/helpers/index.js b/tests/helpers/index.js new file mode 100644 index 00000000000..245090d28f2 --- /dev/null +++ b/tests/helpers/index.js @@ -0,0 +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/mirage/categories-test.js b/tests/mirage/categories-test.js index 0dc68f6339d..cb1aabad038 100644 --- a/tests/mirage/categories-test.js +++ b/tests/mirage/categories-test.js @@ -1,8 +1,9 @@ -import { setupTest } from 'ember-qunit'; import { module, test } from 'qunit'; import fetch from 'fetch'; +import { setupTest } from 'cargo/tests/helpers'; + import setupMirage from '../helpers/setup-mirage'; module('Mirage | Categories', function (hooks) { diff --git a/tests/mirage/crates-test.js b/tests/mirage/crates-test.js index 97fcba1aca3..017006acc67 100644 --- a/tests/mirage/crates-test.js +++ b/tests/mirage/crates-test.js @@ -1,8 +1,9 @@ -import { setupTest } from 'ember-qunit'; import { module, test } from 'qunit'; import fetch from 'fetch'; +import { setupTest } from 'cargo/tests/helpers'; + import setupMirage from '../helpers/setup-mirage'; module('Mirage | Crates', function (hooks) { diff --git a/tests/mirage/keywords-test.js b/tests/mirage/keywords-test.js index 3331dacf7ac..3bd23e30a73 100644 --- a/tests/mirage/keywords-test.js +++ b/tests/mirage/keywords-test.js @@ -1,8 +1,9 @@ -import { setupTest } from 'ember-qunit'; import { module, test } from 'qunit'; import fetch from 'fetch'; +import { setupTest } from 'cargo/tests/helpers'; + import setupMirage from '../helpers/setup-mirage'; module('Mirage | Keywords', function (hooks) { diff --git a/tests/mirage/me-test.js b/tests/mirage/me-test.js index bef600a5eab..b09fa77b7fb 100644 --- a/tests/mirage/me-test.js +++ b/tests/mirage/me-test.js @@ -1,9 +1,10 @@ -import { setupTest } from 'ember-qunit'; import { module, test } from 'qunit'; import fetch from 'fetch'; import timekeeper from 'timekeeper'; +import { setupTest } from 'cargo/tests/helpers'; + import setupMirage from '../helpers/setup-mirage'; module('Mirage | /me', function (hooks) { diff --git a/tests/mirage/session-test.js b/tests/mirage/session-test.js index 90d888efc56..af007351027 100644 --- a/tests/mirage/session-test.js +++ b/tests/mirage/session-test.js @@ -1,8 +1,9 @@ -import { setupTest } from 'ember-qunit'; import { module, test } from 'qunit'; import fetch from 'fetch'; +import { setupTest } from 'cargo/tests/helpers'; + import setupMirage from '../helpers/setup-mirage'; module('Mirage | Session', function (hooks) { diff --git a/tests/mirage/summary-test.js b/tests/mirage/summary-test.js index 08e462ac575..60b5e8f8993 100644 --- a/tests/mirage/summary-test.js +++ b/tests/mirage/summary-test.js @@ -1,8 +1,9 @@ -import { setupTest } from 'ember-qunit'; import { module, test } from 'qunit'; import fetch from 'fetch'; +import { setupTest } from 'cargo/tests/helpers'; + import setupMirage from '../helpers/setup-mirage'; module('Mirage | Summary', function (hooks) { diff --git a/tests/mirage/teams-test.js b/tests/mirage/teams-test.js index c11cc5ce51d..a40701baacf 100644 --- a/tests/mirage/teams-test.js +++ b/tests/mirage/teams-test.js @@ -1,8 +1,9 @@ -import { setupTest } from 'ember-qunit'; import { module, test } from 'qunit'; import fetch from 'fetch'; +import { setupTest } from 'cargo/tests/helpers'; + import setupMirage from '../helpers/setup-mirage'; module('Mirage | Teams', function (hooks) { diff --git a/tests/mirage/users-test.js b/tests/mirage/users-test.js index f712ac34e3d..4cda924eb24 100644 --- a/tests/mirage/users-test.js +++ b/tests/mirage/users-test.js @@ -1,8 +1,9 @@ -import { setupTest } from 'ember-qunit'; import { module, test } from 'qunit'; import fetch from 'fetch'; +import { setupTest } from 'cargo/tests/helpers'; + import setupMirage from '../helpers/setup-mirage'; module('Mirage | Users', function (hooks) { diff --git a/tests/models/crate-test.js b/tests/models/crate-test.js index 9f8527180aa..3f903f5195e 100644 --- a/tests/models/crate-test.js +++ b/tests/models/crate-test.js @@ -1,10 +1,11 @@ -import { setupTest } from 'ember-qunit'; import { module, test } from 'qunit'; import AdapterError from '@ember-data/adapter/error'; import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { setupTest } from 'cargo/tests/helpers'; + module('Model | Crate', function (hooks) { setupTest(hooks); setupMirage(hooks); diff --git a/tests/models/user-test.js b/tests/models/user-test.js index 95e9ebd95fc..e95a3df0290 100644 --- a/tests/models/user-test.js +++ b/tests/models/user-test.js @@ -1,6 +1,7 @@ -import { setupTest } from 'ember-qunit'; import { module, test } from 'qunit'; +import { setupTest } from 'cargo/tests/helpers'; + import setupMirage from '../helpers/setup-mirage'; module('Model | User', function (hooks) { diff --git a/tests/modifiers/highlight-syntax-test.js b/tests/modifiers/highlight-syntax-test.js index 5e480ca1551..22300c0c08e 100644 --- a/tests/modifiers/highlight-syntax-test.js +++ b/tests/modifiers/highlight-syntax-test.js @@ -1,9 +1,10 @@ import { render } from '@ember/test-helpers'; -import { setupRenderingTest } from 'ember-qunit'; import { module, test } from 'qunit'; import { hbs } from 'ember-cli-htmlbars'; +import { setupRenderingTest } from 'cargo/tests/helpers'; + module('Modifier | highlight-syntax', function (hooks) { setupRenderingTest(hooks); diff --git a/tests/routes/category-test.js b/tests/routes/category-test.js index ac757837031..05b6e1ff56e 100644 --- a/tests/routes/category-test.js +++ b/tests/routes/category-test.js @@ -1,13 +1,12 @@ import { currentURL } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; -import setupMirage from '../helpers/setup-mirage'; +import { setupApplicationTest } from 'cargo/tests/helpers'; + 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 index 2fa7c2fb415..be2c494f186 100644 --- a/tests/routes/crate/version/docs-link-test.js +++ b/tests/routes/crate/version/docs-link-test.js @@ -1,12 +1,10 @@ import { visit } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; -import setupMirage from '../../../helpers/setup-mirage'; +import { setupApplicationTest } from 'cargo/tests/helpers'; 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 index 79e1f5117e8..8a8157a4741 100644 --- a/tests/routes/crate/version/model-test.js +++ b/tests/routes/crate/version/model-test.js @@ -1,12 +1,10 @@ import { currentURL, visit } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; -import setupMirage from '../../../helpers/setup-mirage'; +import { setupApplicationTest } from 'cargo/tests/helpers'; 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 index 589d280d654..2da5cd8076a 100644 --- a/tests/routes/github-authorize-test.js +++ b/tests/routes/github-authorize-test.js @@ -1,16 +1,14 @@ import { visit } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; import window from 'ember-window-mock'; import { setupWindowMock } from 'ember-window-mock/test-support'; -import setupMirage from '../helpers/setup-mirage'; +import { setupApplicationTest } from 'cargo/tests/helpers'; 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 index 37399834987..343180497f4 100644 --- a/tests/routes/keyword-test.js +++ b/tests/routes/keyword-test.js @@ -1,13 +1,12 @@ import { currentURL } from '@ember/test-helpers'; -import { setupApplicationTest } from 'ember-qunit'; import { module, test } from 'qunit'; -import setupMirage from '../helpers/setup-mirage'; +import { setupApplicationTest } from 'cargo/tests/helpers'; + 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'); diff --git a/tests/services/redirector-test.js b/tests/services/redirector-test.js index e0499b2eb23..4fc905ff60f 100644 --- a/tests/services/redirector-test.js +++ b/tests/services/redirector-test.js @@ -1,9 +1,10 @@ -import { setupTest } from 'ember-qunit'; import { module, test } from 'qunit'; import window from 'ember-window-mock'; import { setupWindowMock } from 'ember-window-mock/test-support'; +import { setupTest } from 'cargo/tests/helpers'; + const URL = 'https://turbo.fish/'; module('Service | Redirector', function (hooks) { diff --git a/tests/unit/helpers/format-num-test.js b/tests/unit/helpers/format-num-test.js index d088b2d3604..0368ec717a0 100644 --- a/tests/unit/helpers/format-num-test.js +++ b/tests/unit/helpers/format-num-test.js @@ -1,9 +1,10 @@ import { render } from '@ember/test-helpers'; -import { setupRenderingTest } from 'ember-qunit'; import { module, test } from 'qunit'; import { hbs } from 'ember-cli-htmlbars'; +import { setupRenderingTest } from 'cargo/tests/helpers'; + module('Unit | Helper | format-num', function (hooks) { setupRenderingTest(hooks); diff --git a/tests/utils/ajax-test.js b/tests/utils/ajax-test.js index b3f3b6ac53d..d2a0e2c9905 100644 --- a/tests/utils/ajax-test.js +++ b/tests/utils/ajax-test.js @@ -1,6 +1,6 @@ -import { setupTest } from 'ember-qunit'; import { module, test } from 'qunit'; +import { setupTest } from 'cargo/tests/helpers'; import ajax, { AjaxError, HttpError } from 'cargo/utils/ajax'; import setupMirage from '../helpers/setup-mirage';