UI: Update Mirage to 1.1.2 (#6166)

ui/mirage/common.js

@@ -1,4 +1,4 @@
-import { faker } from 'ember-cli-mirage';
+import faker from 'faker';
 import { provide } from './utils';
 
 // Realistically, resource reservations have a low cardinality
@@ -19,16 +19,16 @@ export const DATACENTERS = provide(
 );
 
 export const HOSTS = provide(100, () => {
-  const ip = Math.random() > 0.5 ? faker.internet.ip() : `[${ipv6()}]`;
+  const ip = Math.random() > 0.5 ? faker.internet.ip() : `[${faker.internet.ipv6()}]`;
   return `${ip}:${faker.random.number({ min: 4000, max: 4999 })}`;
 });
 
 export function generateResources(options = {}) {
   return {
-    CPU: faker.random.arrayElement(CPU_RESERVATIONS),
-    MemoryMB: faker.random.arrayElement(MEMORY_RESERVATIONS),
-    DiskMB: faker.random.arrayElement(DISK_RESERVATIONS),
-    IOPS: faker.random.arrayElement(IOPS_RESERVATIONS),
+    CPU: faker.helpers.randomize(CPU_RESERVATIONS),
+    MemoryMB: faker.helpers.randomize(MEMORY_RESERVATIONS),
+    DiskMB: faker.helpers.randomize(DISK_RESERVATIONS),
+    IOPS: faker.helpers.randomize(IOPS_RESERVATIONS),
     Networks: generateNetworks(options.networks),
   };
 }
@@ -41,7 +41,7 @@ export function generateNetworks(options = {}) {
       CIDR: '',
       IP: faker.internet.ip(),
       MBits: 10,
-      Mode: faker.random.arrayElement(NETWORK_MODES),
+      Mode: faker.helpers.randomize(NETWORK_MODES),
       ReservedPorts: Array(
         faker.random.number({
           min: options.minPorts != null ? options.minPorts : 0,
@@ -68,17 +68,3 @@ export function generateNetworks(options = {}) {
         })),
     }));
 }
-
-// Faker v4.0 has a built-in ipv6 function. Once Mirage upgrades,
-// this code can be removed.
-function ipv6() {
-  const subnets = [];
-  for (var i = 0; i < 8; i++) {
-    var subnet = [];
-    for (var char = 0; char < 4; char++) {
-      subnet.push(faker.random.number(15).toString(16));
-    }
-    subnets.push(subnet.join(''));
-  }
-  return subnets.join(':');
-}

ui/mirage/factories/agent.js

@@ -1,4 +1,5 @@
-import { Factory, faker } from 'ember-cli-mirage';
+import { Factory } from 'ember-cli-mirage';
+import faker from 'faker';
 import { provide } from '../utils';
 import { DATACENTERS } from '../common';
 
@@ -9,7 +10,7 @@ export default Factory.extend({
   id: i => (i / 100 >= 1 ? `${UUIDS[i]}-${i}` : UUIDS[i]),
   name: () => `nomad@${faker.internet.ip()}`,
 
-  status: faker.list.random(...AGENT_STATUSES),
+  status: faker.helpers.randomize(AGENT_STATUSES),
   serf_port: faker.random.number({ min: 4000, max: 4999 }),
 
   address() {
@@ -20,7 +21,7 @@ export default Factory.extend({
     const rpcPortCandidate = faker.random.number({ min: 4000, max: 4999 });
     return {
       port: rpcPortCandidate === this.serf_port ? rpcPortCandidate + 1 : rpcPortCandidate,
-      dc: faker.list.random(...DATACENTERS)(),
+      dc: faker.helpers.randomize(DATACENTERS),
     };
   },
 });

ui/mirage/factories/alloc-file.js

@@ -1,4 +1,5 @@
-import { Factory, faker, trait } from 'ember-cli-mirage';
+import { Factory, trait } from 'ember-cli-mirage';
+import faker from 'faker';
 import { pickOne } from '../utils';
 
 const REF_TIME = new Date();

ui/mirage/factories/allocation.js

@@ -1,6 +1,7 @@
 import Ember from 'ember';
 import moment from 'moment';
-import { Factory, faker, trait } from 'ember-cli-mirage';
+import { Factory, trait } from 'ember-cli-mirage';
+import faker from 'faker';
 import { provide, pickOne } from '../utils';
 import { generateResources } from '../common';
 
@@ -24,8 +25,8 @@ export default Factory.extend({
 
   namespace: null,
 
-  clientStatus: faker.list.random(...CLIENT_STATUSES),
-  desiredStatus: faker.list.random(...DESIRED_STATUSES),
+  clientStatus: faker.helpers.randomize(CLIENT_STATUSES),
+  desiredStatus: faker.helpers.randomize(DESIRED_STATUSES),
 
   // When true, doesn't create any resources, state, or events
   shallow: false,

ui/mirage/factories/client-stat.js

@@ -1,4 +1,6 @@
-import { Factory, faker } from 'ember-cli-mirage';
+import { Factory } from 'ember-cli-mirage';
+
+import faker from 'faker';
 
 export default Factory.extend({
   allDirStats: () => ({
@@ -12,7 +14,7 @@ export default Factory.extend({
   }),
 
   CPU: () => [
-    Array(faker.list.random(1, 2, 4, 6, 8, 12, 16, 24, 32))
+    Array(faker.helpers.randomize(1, 2, 4, 6, 8, 12, 16, 24, 32))
       .fill(0)
       .map((cpu, index) => ({
         CPU: `cpu${index}`,

ui/mirage/factories/deployment-task-group-summary.js

@@ -1,4 +1,6 @@
-import { Factory, faker } from 'ember-cli-mirage';
+import { Factory } from 'ember-cli-mirage';
+
+import faker from 'faker';
 
 const REF_TIME = new Date();
 

ui/mirage/factories/deployment.js

@@ -1,4 +1,5 @@
-import { Factory, faker, trait } from 'ember-cli-mirage';
+import { Factory, trait } from 'ember-cli-mirage';
+import faker from 'faker';
 import { provide } from '../utils';
 
 const UUIDS = provide(100, faker.random.uuid.bind(faker.random));
@@ -10,11 +11,11 @@ export default Factory.extend({
   jobId: null,
   versionNumber: null,
 
-  status: faker.list.random(...DEPLOYMENT_STATUSES),
+  status: faker.helpers.randomize(DEPLOYMENT_STATUSES),
   statusDescription: () => faker.lorem.sentence(),
 
   notActive: trait({
-    status: faker.list.random(...DEPLOYMENT_STATUSES.without('running')),
+    status: faker.helpers.randomize(DEPLOYMENT_STATUSES.without('running')),
   }),
 
   active: trait({

ui/mirage/factories/evaluation.js

@@ -1,5 +1,6 @@
 import Ember from 'ember';
-import { Factory, faker, trait } from 'ember-cli-mirage';
+import { Factory, trait } from 'ember-cli-mirage';
+import faker from 'faker';
 import { provide, pickOne } from '../utils';
 import { DATACENTERS } from '../common';
 
@@ -46,9 +47,9 @@ export default Factory.extend({
 
   priority: () => faker.random.number(100),
 
-  type: faker.list.random(...EVAL_TYPES),
-  triggeredBy: faker.list.random(...EVAL_TRIGGERED_BY),
-  status: faker.list.random(...EVAL_STATUSES),
+  type: faker.helpers.randomize(EVAL_TYPES),
+  triggeredBy: faker.helpers.randomize(EVAL_TRIGGERED_BY),
+  status: faker.helpers.randomize(EVAL_STATUSES),
   statusDescription: () => faker.lorem.sentence(),
 
   failedTGAllocs: null,

ui/mirage/factories/job-summary.js

@@ -1,4 +1,6 @@
-import { Factory, faker, trait } from 'ember-cli-mirage';
+import { Factory, trait } from 'ember-cli-mirage';
+
+import faker from 'faker';
 
 export default Factory.extend({
   // Hidden property used to compute the Summary hash

ui/mirage/factories/job-version.js

@@ -1,4 +1,6 @@
-import { Factory, faker } from 'ember-cli-mirage';
+import { Factory } from 'ember-cli-mirage';
+
+import faker from 'faker';
 
 const REF_TIME = new Date();
 

ui/mirage/factories/job.js

@@ -1,5 +1,6 @@
 import { assign } from '@ember/polyfills';
-import { Factory, faker, trait } from 'ember-cli-mirage';
+import { Factory, trait } from 'ember-cli-mirage';
+import faker from 'faker';
 import { provide, provider, pickOne } from '../utils';
 import { DATACENTERS } from '../common';
 
@@ -9,7 +10,9 @@ const JOB_STATUSES = ['pending', 'running', 'dead'];
 
 export default Factory.extend({
   id: i =>
-    `${faker.list.random(...JOB_PREFIXES)()}-${faker.hacker.noun().dasherize()}-${i}`.toLowerCase(),
+    `${faker.helpers.randomize(
+      JOB_PREFIXES
+    )}-${faker.hacker.noun().dasherize()}-${i}`.toLowerCase(),
 
   name() {
     return this.id;
@@ -18,14 +21,12 @@ export default Factory.extend({
   groupsCount: () => faker.random.number({ min: 1, max: 2 }),
 
   region: () => 'global',
-  type: faker.list.random(...JOB_TYPES),
+  type: faker.helpers.randomize(JOB_TYPES),
   priority: () => faker.random.number(100),
   all_at_once: faker.random.boolean,
-  status: faker.list.random(...JOB_STATUSES),
-  datacenters: provider(
-    () => faker.random.number({ min: 1, max: 4 }),
-    faker.list.random(...DATACENTERS)
-  ),
+  status: faker.helpers.randomize(JOB_STATUSES),
+  datacenters: () =>
+    faker.helpers.shuffle(DATACENTERS).slice(0, faker.random.number({ min: 1, max: 4 })),
 
   childrenCount: () => faker.random.number({ min: 1, max: 2 }),
 

ui/mirage/factories/namespace.js

@@ -1,4 +1,6 @@
-import { Factory, faker } from 'ember-cli-mirage';
+import { Factory } from 'ember-cli-mirage';
+
+import faker from 'faker';
 
 export default Factory.extend({
   id: i => (i === 0 ? 'default' : `namespace-${i}`),

ui/mirage/factories/node-event.js

@@ -1,11 +1,12 @@
-import { Factory, faker } from 'ember-cli-mirage';
+import { Factory } from 'ember-cli-mirage';
+import faker from 'faker';
 import { provide } from '../utils';
 
 const REF_TIME = new Date();
 const STATES = provide(10, faker.system.fileExt.bind(faker.system));
 
 export default Factory.extend({
-  subsystem: faker.list.random(...STATES),
+  subsystem: faker.helpers.randomize(STATES),
   message: () => faker.lorem.sentence(),
   time: () => faker.date.past(2 / 365, REF_TIME),
   details: null,

ui/mirage/factories/node.js

@@ -1,4 +1,5 @@
-import { Factory, faker, trait } from 'ember-cli-mirage';
+import { Factory, trait } from 'ember-cli-mirage';
+import faker from 'faker';
 import { provide } from '../utils';
 import { DATACENTERS, HOSTS, generateResources } from '../common';
 import moment from 'moment';
@@ -12,10 +13,10 @@ export default Factory.extend({
   id: i => (i / 100 >= 1 ? `${UUIDS[i]}-${i}` : UUIDS[i]),
   name: i => `nomad@${HOSTS[i % HOSTS.length]}`,
 
-  datacenter: faker.list.random(...DATACENTERS),
-  nodeClass: faker.list.random(...NODE_CLASSES),
+  datacenter: faker.helpers.randomize(DATACENTERS),
+  nodeClass: faker.helpers.randomize(NODE_CLASSES),
   drain: faker.random.boolean,
-  status: faker.list.random(...NODE_STATUSES),
+  status: faker.helpers.randomize(NODE_STATUSES),
   tls_enabled: faker.random.boolean,
   schedulingEligibility: () => (faker.random.boolean() ? 'eligible' : 'ineligible'),
 

ui/mirage/factories/policy.js

@@ -1,4 +1,5 @@
-import { Factory, faker } from 'ember-cli-mirage';
+import { Factory } from 'ember-cli-mirage';
+import faker from 'faker';
 
 export default Factory.extend({
   id: () => faker.hacker.verb(),

ui/mirage/factories/service.js

@@ -1,4 +1,5 @@
-import { Factory, faker } from 'ember-cli-mirage';
+import { Factory } from 'ember-cli-mirage';
+import faker from 'faker';
 import { provide } from '../utils';
 
 export default Factory.extend({

ui/mirage/factories/task-event.js

@@ -1,11 +1,12 @@
-import { Factory, faker } from 'ember-cli-mirage';
+import { Factory } from 'ember-cli-mirage';
+import faker from 'faker';
 import { provide } from '../utils';
 
 const REF_TIME = new Date();
 const STATES = provide(10, faker.system.fileExt.bind(faker.system));
 
 export default Factory.extend({
-  type: faker.list.random(...STATES),
+  type: faker.helpers.randomize(STATES),
 
   signal: () => '',
   exitCode: () => null,

ui/mirage/factories/task-group.js

@@ -1,4 +1,5 @@
-import { Factory, faker } from 'ember-cli-mirage';
+import { Factory } from 'ember-cli-mirage';
+import faker from 'faker';
 
 const DISK_RESERVATIONS = [200, 500, 1000, 2000, 5000, 10000, 100000];
 
@@ -8,7 +9,7 @@ export default Factory.extend({
 
   ephemeralDisk: () => ({
     Sticky: faker.random.boolean(),
-    SizeMB: faker.random.arrayElement(DISK_RESERVATIONS),
+    SizeMB: faker.helpers.randomize(DISK_RESERVATIONS),
     Migrate: faker.random.boolean(),
   }),
 

ui/mirage/factories/task-state.js

@@ -1,11 +1,12 @@
-import { Factory, faker } from 'ember-cli-mirage';
+import { Factory } from 'ember-cli-mirage';
+import faker from 'faker';
 
 const TASK_STATUSES = ['pending', 'running', 'finished', 'failed'];
 const REF_TIME = new Date();
 
 export default Factory.extend({
   name: () => '!!!this should be set by the allocation that owns this task state!!!',
-  state: faker.list.random(...TASK_STATUSES),
+  state: faker.helpers.randomize(TASK_STATUSES),
   kind: null,
   startedAt: faker.date.past(2 / 365, REF_TIME),
   finishedAt() {

ui/mirage/factories/task.js

@@ -1,4 +1,5 @@
-import { Factory, faker } from 'ember-cli-mirage';
+import { Factory } from 'ember-cli-mirage';
+import faker from 'faker';
 import { generateResources } from '../common';
 
 const DRIVERS = ['docker', 'java', 'rkt', 'qemu', 'exec', 'raw_exec'];
@@ -10,7 +11,7 @@ export default Factory.extend({
   JobID: '',
 
   name: id => `task-${faker.hacker.noun().dasherize()}-${id}`,
-  driver: faker.list.random(...DRIVERS),
+  driver: faker.helpers.randomize(DRIVERS),
 
   Resources: generateResources,
 });

ui/mirage/factories/token.js

@@ -1,4 +1,5 @@
-import { Factory, faker } from 'ember-cli-mirage';
+import { Factory } from 'ember-cli-mirage';
+import faker from 'faker';
 
 export default Factory.extend({
   id: () => faker.random.uuid(),

ui/mirage/utils.js

@@ -1,4 +1,4 @@
-import { faker } from 'ember-cli-mirage';
+import faker from 'faker';
 
 export function provide(count, provider) {
   if (typeof count === 'function') {

ui/package.json

@@ -53,7 +53,7 @@
     "ember-cli-htmlbars": "^3.0.0",
     "ember-cli-htmlbars-inline-precompile": "^1.0.3",
     "ember-cli-inject-live-reload": "^2.0.1",
-    "ember-cli-mirage": "^0.4.3",
+    "ember-cli-mirage": "^1.1.2",
     "ember-cli-moment-shim": "^3.5.0",
     "ember-cli-page-object": "^1.15.1",
     "ember-cli-qunit": "^4.3.2",
@@ -85,6 +85,7 @@
     "ember-test-selectors": "^2.1.0",
     "ember-truth-helpers": "^2.0.0",
     "eslint": "^5.16.0",
+    "faker": "^4.1.0",
     "flat": "^4.0.0",
     "fuse.js": "^3.4.4",
     "husky": "^1.3.1",
@@ -93,6 +94,7 @@
     "lint-staged": "^8.1.5",
     "loader.js": "^4.7.0",
     "lodash.intersection": "^4.4.0",
+    "pretender": "^3.0.1",
     "prettier": "^1.4.4",
     "query-string": "^5.0.0",
     "qunit-dom": "^0.9.0",

ui/tests/acceptance/allocation-detail-test.js

@@ -3,7 +3,7 @@ import { currentURL } from '@ember/test-helpers';
 import { assign } from '@ember/polyfills';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import Allocation from 'nomad-ui/tests/pages/allocations/detail';
 import moment from 'moment';
 

ui/tests/acceptance/application-errors-test.js

@@ -1,7 +1,7 @@
 import { currentURL, visit } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import ClientsList from 'nomad-ui/tests/pages/clients/list';
 import JobsList from 'nomad-ui/tests/pages/jobs/list';
 import Job from 'nomad-ui/tests/pages/jobs/detail';

ui/tests/acceptance/client-detail-test.js

@@ -2,7 +2,7 @@ import { currentURL } from '@ember/test-helpers';
 import { assign } from '@ember/polyfills';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import { formatBytes } from 'nomad-ui/helpers/format-bytes';
 import formatDuration from 'nomad-ui/utils/format-duration';
 import moment from 'moment';

ui/tests/acceptance/clients-list-test.js

@@ -1,7 +1,7 @@
 import { currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import ClientsList from 'nomad-ui/tests/pages/clients/list';
 
 module('Acceptance | clients list', function(hooks) {

ui/tests/acceptance/job-allocations-test.js

@@ -1,7 +1,7 @@
 import { currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import Allocations from 'nomad-ui/tests/pages/jobs/job/allocations';
 
 let job;

ui/tests/acceptance/job-definition-test.js

@@ -1,7 +1,7 @@
 import { currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import setupCodeMirror from 'nomad-ui/tests/helpers/codemirror';
 import Definition from 'nomad-ui/tests/pages/jobs/job/definition';
 

ui/tests/acceptance/job-deployments-test.js

@@ -2,7 +2,7 @@ import { currentURL } from '@ember/test-helpers';
 import { get } from '@ember/object';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import moment from 'moment';
 import Deployments from 'nomad-ui/tests/pages/jobs/job/deployments';
 

ui/tests/acceptance/job-detail-test.js

@@ -2,7 +2,7 @@ import { currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { selectChoose } from 'ember-power-select/test-support';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import moduleForJob from 'nomad-ui/tests/helpers/module-for-job';
 import JobDetail from 'nomad-ui/tests/pages/jobs/detail';
 import JobsList from 'nomad-ui/tests/pages/jobs/list';

ui/tests/acceptance/job-evaluations-test.js

@@ -1,7 +1,7 @@
 import { currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import Evaluations from 'nomad-ui/tests/pages/jobs/job/evaluations';
 
 let job;

ui/tests/acceptance/job-run-test.js

@@ -2,7 +2,7 @@ import { currentURL } from '@ember/test-helpers';
 import { assign } from '@ember/polyfills';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import setupCodeMirror from 'nomad-ui/tests/helpers/codemirror';
 import JobRun from 'nomad-ui/tests/pages/jobs/run';
 

ui/tests/acceptance/job-versions-test.js

@@ -1,7 +1,7 @@
 import { currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import Versions from 'nomad-ui/tests/pages/jobs/job/versions';
 import moment from 'moment';
 

ui/tests/acceptance/jobs-list-test.js

@@ -1,7 +1,7 @@
 import { currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import JobsList from 'nomad-ui/tests/pages/jobs/list';
 
 module('Acceptance | jobs list', function(hooks) {

ui/tests/acceptance/namespaces-test.js

@@ -1,6 +1,6 @@
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import { selectChoose } from 'ember-power-select/test-support';
 import JobsList from 'nomad-ui/tests/pages/jobs/list';
 

ui/tests/acceptance/regions-test.js

@@ -2,7 +2,7 @@ import { currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import { selectChoose } from 'ember-power-select/test-support';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import JobsList from 'nomad-ui/tests/pages/jobs/list';
 import ClientsList from 'nomad-ui/tests/pages/clients/list';
 import PageLayout from 'nomad-ui/tests/pages/layout';

ui/tests/acceptance/server-detail-test.js

@@ -1,7 +1,7 @@
 import { currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import ServerDetail from 'nomad-ui/tests/pages/servers/detail';
 
 let agent;

ui/tests/acceptance/servers-list-test.js

@@ -1,7 +1,7 @@
 import { currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import { findLeader } from '../../mirage/config';
 import ServersList from 'nomad-ui/tests/pages/servers/list';
 

ui/tests/acceptance/task-detail-test.js

@@ -1,7 +1,7 @@
 import { currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import Task from 'nomad-ui/tests/pages/allocations/task/detail';
 import moment from 'moment';
 

ui/tests/acceptance/task-group-detail-test.js

@@ -1,7 +1,7 @@
 import { currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import { formatBytes } from 'nomad-ui/helpers/format-bytes';
 import TaskGroup from 'nomad-ui/tests/pages/jobs/job/task-group';
 import JobsList from 'nomad-ui/tests/pages/jobs/list';

ui/tests/acceptance/task-logs-test.js

@@ -2,7 +2,7 @@ import { currentURL } from '@ember/test-helpers';
 import { run } from '@ember/runloop';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import TaskLogs from 'nomad-ui/tests/pages/allocations/task/logs';
 
 let allocation;

ui/tests/acceptance/token-test.js

@@ -1,7 +1,7 @@
 import { find } from '@ember/test-helpers';
 import { module, skip, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import Tokens from 'nomad-ui/tests/pages/settings/tokens';
 import Jobs from 'nomad-ui/tests/pages/jobs/list';
 import JobDetail from 'nomad-ui/tests/pages/jobs/detail';

ui/tests/helpers/module-for-job.js

@@ -1,7 +1,7 @@
 import { currentURL } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'ember-cli-mirage/test-support';
 import JobDetail from 'nomad-ui/tests/pages/jobs/detail';
 
 export default function moduleForJob(title, context, jobFactory, additionalTests) {

ui/tests/integration/list-table-test.js

@@ -1,7 +1,7 @@
 import { findAll, find, render } from '@ember/test-helpers';
 import { module, skip, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
-import { faker } from 'ember-cli-mirage';
+import faker from 'faker';
 import hbs from 'htmlbars-inline-precompile';
 
 module('Integration | Component | list table', function(hooks) {