Get tests passing -- to get import.meta.glob working in the tests, we…

… need a plugin for import.meta.glob

ember-mirage/src/create-config.js

@@ -13,7 +13,7 @@ export function entityName(path) {
   return camelize(filenameWithoutExt);
 }
 
-export default async function createConfig(mirageImportMap = {}) {
+export async function createConfig(mirageImportMap = {}) {
   return {
     factories: await importEntities(mirageImportMap.factories),
     fixtures: await importEntities(mirageImportMap.fixtures),

ember-mirage/src/index.js

@@ -0,0 +1 @@
+export { createConfig, entityName } from './create-config.js';

ember-mirage/src/test-support/setup-mirage.js

@@ -1,6 +1,23 @@
+import { assert } from '@ember/debug';
 import { settled } from '@ember/test-helpers';
+import { createServer as _createServer } from 'miragejs';
+
+export function setupMirage(hooks = self, { createServer, config }) {
+  assert(
+    `Unexpected arity for setupMirage. Expected 2 (hooks, { createServer, or config })`,
+    arguments.length <= 2 && arguments.length > 0,
+  );
+  assert(
+    `Second argument to setupMirage must be an object and not null`,
+    typeof arguments[1] === 'object' && arguments[1] !== null,
+  );
+  assert(
+    `Second argument to setupMirage must on or both of createServer and/or config. You passed ${Object.keys(arguments[1]).join(', ')}`,
+    'createServer' in arguments[1] || 'config' in arguments[1],
+  );
+
+  createServer ??= _createServer;
 
-export function setupMirage(hooks = self, { createServer }) {
   hooks.beforeEach(async function () {
     if (!this.owner) {
       throw new Error(
@@ -10,7 +27,7 @@ export function setupMirage(hooks = self, { createServer }) {
       );
     }
 
-    this.server = await createServer();
+    this.server = await createServer(config ?? {});
   });
 
   hooks.afterEach(function () {

test-app/app/mirage/servers/create-config.js

@@ -0,0 +1,32 @@
+//import { createConfig } from 'ember-mirage';
+//import defaultRoutes from '../routes/default';
+//
+//export async function config(store) {
+//  const { importEmberDataModels, importEmberDataSerializers } = await import(
+//    'ember-mirage/ember-data'
+//  );
+//
+//  const mirageConfig = await createConfig({
+//    factories: import.meta.glob('./factories/*'),
+//    fixtures: import.meta.glob('./fixtures/*'),
+//    // Don't import our mirage things that will be auto-discovered
+//    // models: import.meta.glob('./models/*'),
+//    // serializers: import.meta.glob('./serializers/*'),
+//    identityManagers: import.meta.glob('./identity-managers/*'),
+//  });
+//
+//  return {
+//    ...mirageConfig,
+//    models: {
+//      // use ember-data model auto discovery
+//      ...importEmberDataModels(store, import.meta.glob('../models/*')),
+//      ...mirageConfig.models,
+//    },
+//    // apply ember-data serializer config details to mirage serializers
+//    serializers: importEmberDataSerializers(store, mirageConfig.serializers),
+//    routes() {
+//      this.config({ routes: defaultRoutes });
+//    },
+//  };
+//}
+//

test-app/app/mirage/servers/default.js → test-app/app/mirage/servers/manual.js

@@ -1,5 +1,3 @@
-import { createServer } from 'miragejs';
-
 import factories from '../factories';
 import mirageModels from '../models';
 import defaultRoutes from '../routes/default';
@@ -28,7 +26,7 @@ export default function (config) {
     },
   };
 
-  return createServer(finalConfig);
+  return finalConfig;
 }
 
 function defineRoutes() {

test-app/tests/acceptance/example-test.js

@@ -1,7 +1,8 @@
 import { currentURL, visit } from '@ember/test-helpers';
+import { createServer } from 'miragejs';
 import { module, test } from 'qunit';
 
-import mirageConfig from 'test-app/mirage/servers/default';
+import mirageConfig from 'test-app/mirage/servers/manual';
 import { setupApplicationTest } from 'test-app/tests/helpers';
 
 import { setupMirage } from 'test-app/tests/test-support/mirage';
@@ -11,6 +12,7 @@ module('Acceptance | example test', function (hooks) {
 
   module('Test with default config', function (hooks) {
     setupMirage(hooks);
+
     test('visiting /example', async function (assert) {
       await visit('/example');
 
@@ -19,7 +21,17 @@ module('Acceptance | example test', function (hooks) {
   });
 
   module('Test with imported config', function (hooks) {
-    setupMirage(hooks, { makeserver: mirageConfig });
+    setupMirage(hooks, { config: mirageConfig });
+    test('visiting /example', async function (assert) {
+      await visit('/example');
+
+      assert.strictEqual(currentURL(), '/example');
+    });
+  });
+
+  module('Test with custom server', function (hooks) {
+    setupMirage(hooks, { createServer: () => createServer(mirageConfig) });
+
     test('visiting /example', async function (assert) {
       await visit('/example');
 

test-app/tests/test-support/mirage.js

@@ -1,10 +1,11 @@
-import mirageConfig from 'test-app/mirage/servers/default';
+import mirageConfig from 'test-app/mirage/servers/manual';
 
 import { setupMirage as _setupMirage } from 'ember-mirage/test-support';
 
-export function setupMirage(hooks, options) {
-  options = options || {};
-  options.makeServer = options.makeServer || mirageConfig;
+import { createServer as _createServer } from 'miragejs';
 
-  return _setupMirage(hooks, options);
+export function setupMirage(hooks, { createServer, config } = {}) {
+  createServer ??= _createServer;
+  config ??= mirageConfig;
+  return _setupMirage(hooks, { createServer, config });
 }