Merge pull request miragejs#2375 from bgantzler/remove-reprecations

Remove deprecations for trackRequests, testConfig and baseConfig

addon/start-mirage.js

@@ -9,36 +9,26 @@ import { assert } from '@ember/debug';
 
   @hide
 */
-export default function startMirage(
-  owner,
-  { env, makeServer, baseConfig, testConfig } = {}
-) {
+export default function startMirage(owner, { env, makeServer } = {}) {
   if (!env || !makeServer) {
     if (!owner) {
       throw new Error('You must pass `owner` to startMirage()');
     }
 
     env = env || owner.resolveRegistration('config:environment');
 
-    baseConfig = baseConfig || owner.resolveRegistration('mirage:base-config');
     // These are set from `<app>/initializers/ember-cli-mirage`
-    testConfig = testConfig || owner.resolveRegistration('mirage:test-config');
     makeServer = makeServer || owner.resolveRegistration('mirage:make-server');
   }
 
-  // baseConfig would be a routes function
-
   let environment = env.environment;
-  let mirageEnvironment = env['ember-cli-mirage'] || {};
 
   let modules = readModules(env.modulePrefix);
 
   let options = Object.assign(modules, {
     environment,
-    baseConfig,
-    testConfig,
   });
-  options.trackRequests = mirageEnvironment.trackRequests;
+
   options.inflector = { singularize, pluralize };
 
   // MakeServer must accept at least one param

app/initializers/ember-cli-mirage.js

@@ -2,7 +2,7 @@ import ENV from '../config/environment';
 import getRfc232TestContext from 'ember-cli-mirage/get-rfc232-test-context';
 import startMirageImpl from 'ember-cli-mirage/start-mirage';
 import * as config from '../mirage/config';
-const { default: makeServer, testConfig } = config;
+const { default: makeServer } = config;
 
 //
 // This initializer does two things:
@@ -16,11 +16,6 @@ const { default: makeServer, testConfig } = config;
 export default {
   name: 'ember-cli-mirage',
   initialize(application) {
-    if (testConfig) {
-      application.register('mirage:test-config', testConfig, {
-        instantiate: false,
-      });
-    }
     if (makeServer) {
       application.register('mirage:make-server', makeServer, {
         instantiate: false,
@@ -35,7 +30,7 @@ export default {
 };
 
 export function startMirage(env = ENV) {
-  return startMirageImpl(null, { env, makeServer, testConfig });
+  return startMirageImpl(null, { env, makeServer });
 }
 
 function _shouldUseMirage(env, addonConfig) {

tests/dummy/app/pods/docs/advanced/environment-options/template.md

@@ -42,20 +42,20 @@ if (environment === 'development') {
 
 ## trackRequests
 
-Defaults to `false`.
-
-A boolean that controls whether [Pretender's `trackedRequests` feature](https://github.com/pretenderjs/pretender#tracking-requests) is enabled. By default it is disabled to avoid memory issues during long development sessions.
+A boolean that controls whether [Pretender's `trackRequests` feature](https://github.com/pretenderjs/pretender#tracking-requests) is enabled. By default it is disabled to avoid memory issues during long development sessions.
 
-To enable, set to `true`, for example in testing environments:
+This should be set in the `mirage/config.js` options. Defaults to `false`.
 
 ```js
-// config/environment.js
-module.exports = function(environment) {
-  if (environment === 'test') {
-    ENV['ember-cli-mirage'] = {
-      trackRequests: true
-    };
-  }
+export default function(config) {
+  let finalConfig = {
+    ...config,
+    trackRequests: true,
+    models: { ...discoverEmberDataModels(), ...config.models },
+    routes,
+  };
+
+  return createServer(finalConfig);
 }
 ```