import Ember from 'ember';
import Application from '../../app';
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);

  Ember.run(() => {
    application = Application.create(attributes);
    application.setupForTesting();
    application.injectTestHelpers();
  });

  return application;
}

@@ -165,16 +165,59 @@
 ication;
+%0A  let assign = Ember.assign %7C%7C Ember.merge
 %0A%0A  // u
@@ -269,22 +269,16 @@
 butes = 
-Ember.
 assign(%7B

Fix tests for ember v2.4.x