mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-01 14:10:37 +02:00
Code Issues Releases Wiki Activity

Upgrade ember-cli to 0.1.7

Browse Source
This commit is contained in:
Toby Zerner
2015-01-21 14:28:28 +10:30
parent 21863759e6
commit bc91f61f17
5 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ember/tests/helpers/start-app.js
View File

@@ -4,16 +4,16 @@ import Router from '../../router';
import config from '../../config/environment';
export default function startApp(attrs) {
var App;
var application;
var attributes = Ember.merge({}, config.APP);
attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
Ember.run(function() {
App = Application.create(attributes);
App.setupForTesting();
App.injectTestHelpers();
application = Application.create(attributes);
application.setupForTesting();
application.injectTestHelpers();
});
return App;
return application;
}