From 4b8a23a5cbdfe4d24fa35d69694519112ec9ff66 Mon Sep 17 00:00:00 2001
From: Mark David Avery <thewebark@gmail.com>
Date: Wed, 30 Nov 2016 16:25:24 -0800
Subject: [PATCH] Revert "Revert "Revert "Changed the start-app test helper to
 use `Ember.assign` instead of `Ember.merge`."""

This reverts commit 7b282ae9afd46aef9943c765db8aa97a6efc3f83.
---
 blueprints/app/files/tests/helpers/start-app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/blueprints/app/files/tests/helpers/start-app.js b/blueprints/app/files/tests/helpers/start-app.js
index 54c33c16cb..e098f1d5be 100644
--- 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;
 
-  // use defaults, but you can override
-  let attributes = Ember.assign({}, config.APP, attrs);
+  let attributes = Ember.merge({}, config.APP);
+  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
   Ember.run(() => {
     application = Application.create(attributes);