Skip to content

feat(tests): add TestComponentBuilder #2172

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

Merged
juliemr merged 1 commit into from
May 28, 2015
Merged

feat(tests): add TestComponentBuilder #2172

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
25 changes: 13 additions & 12 deletions modules/angular2/src/mock/template_resolver_mock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@ import {Type, isPresent, BaseException, stringify, isBlank} from 'angular2/src/f
import {View} from 'angular2/src/core/annotations_impl/view';
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';


export class MockTemplateResolver extends TemplateResolver {
_templates: Map<Type, View>;
_views: Map<Type, View>;
_inlineTemplates: Map<Type, string>;
_templateCache: Map<Type, View>;
_viewCache: Map<Type, View>;
_directiveOverrides: Map<Type, Map<Type, Type>>;

constructor() {
super();
this._templates = MapWrapper.create();
this._views = MapWrapper.create();
this._inlineTemplates = MapWrapper.create();
this._templateCache = MapWrapper.create();
this._viewCache = MapWrapper.create();
this._directiveOverrides = MapWrapper.create();
}

Expand All @@ -26,7 +27,7 @@ export class MockTemplateResolver extends TemplateResolver {
*/
setView(component: Type, view: View): void {
this._checkOverrideable(component);
MapWrapper.set(this._templates, component, view);
MapWrapper.set(this._views, component, view);
}

/**
Expand All @@ -47,7 +48,7 @@ export class MockTemplateResolver extends TemplateResolver {
* @param {Type} from
* @param {Type} to
*/
overrideTemplateDirective(component: Type, from: Type, to: Type): void {
overrideViewDirective(component: Type, from: Type, to: Type): void {
this._checkOverrideable(component);

var overrides = MapWrapper.get(this._directiveOverrides, component);
Expand All @@ -62,20 +63,20 @@ export class MockTemplateResolver extends TemplateResolver {

/**
* Returns the {@link View} for a component:
* - Set the {@link View} to the overridden template when it exists or fallback to the default
* - Set the {@link View} to the overridden view when it exists or fallback to the default
* `TemplateResolver`,
* see `setView`.
* - Override the directives, see `overrideTemplateDirective`.
* - Override the directives, see `overrideViewDirective`.

@vicb vicb May 27, 2015

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

there is a remaining "template" 2l up

@juliemr juliemr May 27, 2015

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

done.

* - Override the @View definition, see `setInlineTemplate`.
*
* @param component
* @returns {ViewDefinition}
*/
resolve(component: Type): View {
var view = MapWrapper.get(this._templateCache, component);
var view = MapWrapper.get(this._viewCache, component);
if (isPresent(view)) return view;

view = MapWrapper.get(this._templates, component);
view = MapWrapper.get(this._views, component);
if (isBlank(view)) {
view = super.resolve(component);
}
Expand Down Expand Up @@ -106,7 +107,7 @@ export class MockTemplateResolver extends TemplateResolver {
view = new View({template: inlineTemplate, templateUrl: null, directives: view.directives});
}

MapWrapper.set(this._templateCache, component, view);
MapWrapper.set(this._viewCache, component, view);
return view;
}

Expand All @@ -119,7 +120,7 @@ export class MockTemplateResolver extends TemplateResolver {
* @param {Type} component
*/
_checkOverrideable(component: Type): void {
var cached = MapWrapper.get(this._templateCache, component);
var cached = MapWrapper.get(this._viewCache, component);

if (isPresent(cached)) {
throw new BaseException(
Expand Down
4 changes: 3 additions & 1 deletion modules/angular2/src/test_lib/test_bed.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {DOM} from 'angular2/src/dom/dom_adapter';

/**
* @exportedAs angular2/test
* TODO(juliemr): Deprecate in favor of TestComponentBuilder
*/
@Injectable()
export class TestBed {
Expand Down Expand Up @@ -61,7 +62,7 @@ export class TestBed {
* @param {Type} to
*/
overrideDirective(component: Type, from: Type, to: Type): void {
this._injector.get(TemplateResolver).overrideTemplateDirective(component, from, to);
this._injector.get(TemplateResolver).overrideViewDirective(component, from, to);
}

/**
Expand Down Expand Up @@ -107,6 +108,7 @@ export class TestBed {
/**
* Proxy to `AppView` return by `createView` in {@link TestBed} which offers a high level API for
* tests.
* TODO(juliemr): Deprecate in favor of TestElement
*/
export class ViewProxy {
_componentRef: ComponentRef;
Expand Down
Loading