Skip to content

fix(ivy): apply all overrides from TestBed, not the last one only #27734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AndrewKushnir wants to merge 1 commit into from
Closed

fix(ivy): apply all overrides from TestBed, not the last one only #27734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions packages/core/testing/src/resolvers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,18 @@ export interface Resolver<T> { resolve(type: Type<any>): T|null; }
* Allows to override ivy metadata for tests (via the `TestBed`).
*/
abstract class OverrideResolver<T> implements Resolver<T> {
private overrides = new Map<Type<any>, MetadataOverride<T>>();
private overrides = new Map<Type<any>, MetadataOverride<T>[]>();
private resolved = new Map<Type<any>, T|null>();

abstract get type(): any;

setOverrides(overrides: Array<[Type<any>, MetadataOverride<T>]>) {
this.overrides.clear();
overrides.forEach(([type, override]) => this.overrides.set(type, override));
overrides.forEach(([type, override]) => {
const overrides = this.overrides.get(type) || [];
overrides.push(override);
this.overrides.set(type, overrides);
});
}

getAnnotation(type: Type<any>): T|null {
Expand All @@ -42,10 +46,12 @@ abstract class OverrideResolver<T> implements Resolver<T> {
if (!resolved) {
resolved = this.getAnnotation(type);
if (resolved) {
const override = this.overrides.get(type);
if (override) {
const overrides = this.overrides.get(type);
if (overrides) {
const overrider = new MetadataOverrider();
resolved = overrider.overrideMetadata(this.type, resolved, override);
overrides.forEach(override => {
resolved = overrider.overrideMetadata(this.type, resolved !, override);
});
}
}
this.resolved.set(type, resolved);
Expand Down
11 changes: 5 additions & 6 deletions packages/platform-browser/test/testing_public_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,12 +388,11 @@ class CompWithUrlTemplate {
.overridePipe(SomePipe, {set: {name: 'somePipe'}})
.overridePipe(SomePipe, {add: {pure: false}});
});
fixmeIvy('FW-788: Support metadata override in TestBed (for AOT-compiled components)')
.it('should work', () => {
const compFixture = TestBed.createComponent(SomeComponent);
compFixture.detectChanges();
expect(compFixture.nativeElement).toHaveText('transformed hello');
});
it('should work', () => {

@alxhub alxhub Dec 19, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test name makes me sad :(

const compFixture = TestBed.createComponent(SomeComponent);
compFixture.detectChanges();
expect(compFixture.nativeElement).toHaveText('transformed hello');
});
});

describe('template', () => {
Expand Down