cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: use object spread operator rather than merge (#15426)

Browse Source
This commit is contained in:
Dzmitry Shylovich
2017-03-25 00:45:33 +03:00
committed by Victor Berchet
parent 8785b2bf6d
commit c17b912eb9
6 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/testing/src/testing_internal.ts
View File

@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.io/license
*/
import {ɵisPromise as isPromise, ɵmerge as merge} from '@angular/core';
import {ɵisPromise as isPromise} from '@angular/core';
import {global} from '@angular/core/src/util';
import {AsyncTestCompleter} from './async_test_completer';
@ -196,7 +196,7 @@ export class SpyObject {
object = new SpyObject();
}
const m = merge(config, overrides);
const m = {...config, ...overrides};
Object.keys(m).forEach(key => { object.spy(key).and.returnValue(m[key]); });
return object;
}