Skip to content

Commit 8b46279

Browse files
committed
fix(deprication): updated to fix the outdated merge and use object.assign instead
1 parent 1d35f3d commit 8b46279

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

tests/helpers/start-app.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import Application from '../../app';
22
import config from '../../config/environment';
3-
import { merge } from '@ember/polyfills';
43
import { run } from '@ember/runloop';
54

65
export default function startApp(attrs) {
7-
let attributes = merge({}, config.APP);
6+
let attributes = Object.assign({}, config.APP);
87
attributes.autoboot = true;
9-
attributes = merge(attributes, attrs); // use defaults, but you can override;
8+
attributes = Object.assign(attributes, attrs); // use defaults, but you can override;
109

1110
return run(() => {
1211
let application = Application.create(attributes);

0 commit comments

Comments
 (0)