Changed the start-app test helper to use Ember.assign instead of `E…

…mber.merge`.
ember-cli · Aug 19, 2016 · ff58fc0 · ff58fc0
1 parent e807c07
commit ff58fc0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/blueprints/app/files/tests/helpers/start-app.js b/blueprints/app/files/tests/helpers/start-app.js
@@ -5,8 +5,8 @@ import config from '../../config/environment';
 export default function startApp(attrs) {
   let application;
 
-  let attributes = Ember.merge({}, config.APP);
-  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
+  // use defaults, but you can override
+  let attributes = Ember.assign({}, config.APP, attrs);
 
   Ember.run(() => {
     application = Application.create(attributes);