Skip to content

Commit

Permalink
Replace getWithDefault (Fixes #1970)
Browse files Browse the repository at this point in the history
Deprecated by Ember RFC#554
  • Loading branch information
gitKrystan authored and chancancode committed Jun 7, 2020
1 parent 4aecc92 commit 90d00f7
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions addon/start-mirage.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { getWithDefault } from '@ember/object';
import readModules from './utils/read-modules';
import Server from './server';
import { singularize, pluralize } from 'ember-inflector';
Expand Down Expand Up @@ -30,10 +29,12 @@ export default function startMirage(owner, { env, baseConfig, testConfig } = {})
}

let environment = env.environment;
let discoverEmberDataModels = getWithDefault(env['ember-cli-mirage'] || {}, 'discoverEmberDataModels', true);
let mirageEnvironment = env['ember-cli-mirage'] || {};
let discoverEmberDataModels = mirageEnvironment.discoverEmberDataModels;
if (discoverEmberDataModels === undefined) { discoverEmberDataModels = true; }
let modules = readModules(env.modulePrefix);
let options = Object.assign(modules, {environment, baseConfig, testConfig, discoverEmberDataModels});
options.trackRequests = env['ember-cli-mirage'].trackRequests;
options.trackRequests = mirageEnvironment.trackRequests;
options.inflector = { singularize, pluralize };

return new Server(options);
Expand Down

0 comments on commit 90d00f7

Please sign in to comment.