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

refactor: remove facade/collection (#14837)

Browse Source
This commit is contained in:
Miško Hevery
2017-03-01 14:10:59 -08:00
committed by Chuck Jazdzewski
parent 4fe0b90948
commit b0e0839075
27 changed files with 149 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/@angular/core/testing/testing_internal.ts
View File

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