equal
deleted
inserted
replaced
3 import config from '../../config/environment'; |
3 import config from '../../config/environment'; |
4 |
4 |
5 export default function startApp(attrs) { |
5 export default function startApp(attrs) { |
6 let application; |
6 let application; |
7 |
7 |
8 let attributes = Ember.merge({}, config.APP); |
8 // use defaults, but you can override |
9 attributes = Ember.merge(attributes, attrs); // use defaults, but you can override; |
9 let attributes = Ember.assign({}, config.APP, attrs); |
10 |
10 |
11 Ember.run(() => { |
11 Ember.run(() => { |
12 application = Application.create(attributes); |
12 application = Application.create(attributes); |
13 application.setupForTesting(); |
13 application.setupForTesting(); |
14 application.injectTestHelpers(); |
14 application.injectTestHelpers(); |