Skip to content

test: introduce TemplateResolver mock #768

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
pkozlowski-opensource wants to merge 1 commit into from
Closed

test: introduce TemplateResolver mock #768

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
28 changes: 28 additions & 0 deletions modules/angular2/src/mock/template_resolver_mock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import {Map, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
import {Type, isPresent} from 'angular2/src/facade/lang';

import {Template} from 'angular2/src/core/annotations/template';
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';

export class MockTemplateResolver extends TemplateResolver {
_cmpTemplates: Map;

constructor() {
super();
this._cmpTemplates = MapWrapper.create();
}

setTemplate(component: Type, template: Template) {
MapWrapper.set(this._cmpTemplates, component, template);
}

resolve(component: Type): Template {
var override = MapWrapper.get(this._cmpTemplates, component);

if (isPresent(override)) {
return override;
}

return super.resolve(component);
}
}
32 changes: 3 additions & 29 deletions modules/angular2/test/core/compiler/integration_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'angular2/test_lib';

import {DOM} from 'angular2/src/facade/dom';
import {Map, MapWrapper} from 'angular2/src/facade/collection';
import {Type, isPresent} from 'angular2/src/facade/lang';

import {Injector} from 'angular2/di';
import {Lexer, Parser, ChangeDetector, dynamicChangeDetection,
Expand All @@ -12,7 +10,7 @@ import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader';
import {NativeShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_strategy';
import {TemplateLoader} from 'angular2/src/core/compiler/template_loader';
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';
import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock';
import {BindingPropagationConfig} from 'angular2/src/core/compiler/binding_propagation_config';

import {Decorator, Component, Viewport} from 'angular2/src/core/annotations/annotations';
Expand All @@ -37,7 +35,7 @@ export function main() {
}

beforeEach( () => {
tplResolver = new FakeTemplateResolver();
tplResolver = new MockTemplateResolver();
compiler = createCompiler(tplResolver, dynamicChangeDetection);
});

Expand Down Expand Up @@ -492,30 +490,6 @@ class MyService {
}
}

class FakeTemplateResolver extends TemplateResolver {
_cmpTemplates: Map;

constructor() {
super();
this._cmpTemplates = MapWrapper.create();
}

setTemplate(component: Type, template: Template) {
MapWrapper.set(this._cmpTemplates, component, template);
}

resolve(component: Type): Template {
var override = MapWrapper.get(this._cmpTemplates, component);

if (isPresent(override)) {
return override;
}

return super.resolve(component);
}
}


class DoublePipe extends Pipe {
supports(obj) {
return true;
Expand All @@ -534,4 +508,4 @@ class DoublePipeFactory {
create() {
return new DoublePipe();
}
}
}
31 changes: 4 additions & 27 deletions modules/angular2/test/core/compiler/shadow_dom/shadow_dom_emulation_integration_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'angular2/test_lib';

import {StringMapWrapper, MapWrapper, List} from 'angular2/src/facade/collection';
import {isPresent, Type} from 'angular2/src/facade/lang';
import {StringMapWrapper, List} from 'angular2/src/facade/collection';
import {Type} from 'angular2/src/facade/lang';

import {Injector} from 'angular2/di';
import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'angular2/change_detection';
Expand All @@ -14,7 +14,7 @@ import {ShadowDomStrategy,
NativeShadowDomStrategy,
EmulatedShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_strategy';
import {TemplateLoader} from 'angular2/src/core/compiler/template_loader';
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';
import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock';

import {Decorator, Component, Viewport} from 'angular2/src/core/annotations/annotations';
import {Template} from 'angular2/src/core/annotations/template';
Expand All @@ -34,7 +34,7 @@ export function main() {
var compiler, tplResolver;

beforeEach(() => {
tplResolver = new FakeTemplateResolver();
tplResolver = new MockTemplateResolver();
compiler = new Compiler(dynamicChangeDetection,
new TemplateLoader(null),
new DirectiveMetadataReader(),
Expand Down Expand Up @@ -337,26 +337,3 @@ function createView(pv) {
view.hydrate(new Injector([]), null, {});
return view;
}

class FakeTemplateResolver extends TemplateResolver {
_cmpTemplates: Map;

constructor() {
super();
this._cmpTemplates = MapWrapper.create();
}

setTemplate(component: Type, template: Template) {
MapWrapper.set(this._cmpTemplates, component, template);
}

resolve(component: Type): Template {
var override = MapWrapper.get(this._cmpTemplates, component);

if (isPresent(override)) {
return override;
}

return super.resolve(component);
}
}
33 changes: 5 additions & 28 deletions modules/angular2/test/directives/foreach_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'angular2/test_lib';

import {DOM} from 'angular2/src/facade/dom';
import {Map, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
import {Type, isPresent} from 'angular2/src/facade/lang';
import {ListWrapper} from 'angular2/src/facade/collection';

import {Injector} from 'angular2/di';
import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'angular2/change_detection';
Expand All @@ -11,18 +10,19 @@ import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader';
import {NativeShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_strategy';
import {TemplateLoader} from 'angular2/src/core/compiler/template_loader';
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';

import {Decorator, Component, Viewport} from 'angular2/src/core/annotations/annotations';
import {Template} from 'angular2/src/core/annotations/template';
import {Decorator, Component, Viewport} from 'angular2/src/core/annotations/annotations';

import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock';

import {Foreach} from 'angular2/src/directives/foreach';

export function main() {
describe('foreach', () => {
var view, cd, compiler, component, tplResolver;
beforeEach(() => {
tplResolver = new FakeTemplateResolver();
tplResolver = new MockTemplateResolver();
compiler = new Compiler(dynamicChangeDetection, new TemplateLoader(null),
new DirectiveMetadataReader(), new Parser(new Lexer()), new CompilerCache(),
new NativeShadowDomStrategy(), tplResolver);
Expand Down Expand Up @@ -234,26 +234,3 @@ class TestComponent {
this.items = [1, 2];
}
}

class FakeTemplateResolver extends TemplateResolver {
_cmpTemplates: Map;

constructor() {
super();
this._cmpTemplates = MapWrapper.create();
}

setTemplate(component: Type, template: Template) {
MapWrapper.set(this._cmpTemplates, component, template);
}

resolve(component: Type): Template {
var override = MapWrapper.get(this._cmpTemplates, component);

if (isPresent(override)) {
return override;
}

return super.resolve(component);
}
}
30 changes: 3 additions & 27 deletions modules/angular2/test/directives/if_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import {describe, xit, it, expect, beforeEach, ddescribe, iit, el, IS_DARTIUM} from 'angular2/test_lib';

import {DOM} from 'angular2/src/facade/dom';
import {Map, MapWrapper} from 'angular2/src/facade/collection';
import {Type, isPresent} from 'angular2/src/facade/lang';

import {Injector} from 'angular2/di';
import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'angular2/change_detection';
Expand All @@ -11,19 +9,20 @@ import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader';
import {NativeShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_strategy';
import {TemplateLoader} from 'angular2/src/core/compiler/template_loader';
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';

import {Component} from 'angular2/src/core/annotations/annotations';
import {Template} from 'angular2/src/core/annotations/template';

import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock';

import {If} from 'angular2/src/directives/if';

export function main() {
describe('if directive', () => {
var view, cd, compiler, component, tplResolver;

beforeEach(() => {
tplResolver = new FakeTemplateResolver();
tplResolver = new MockTemplateResolver();
compiler = new Compiler(dynamicChangeDetection, new TemplateLoader(null),
new DirectiveMetadataReader(), new Parser(new Lexer()), new CompilerCache(),
new NativeShadowDomStrategy(), tplResolver);
Expand Down Expand Up @@ -219,26 +218,3 @@ class TestComponent {
this.nullCondition = null;
}
}

class FakeTemplateResolver extends TemplateResolver {
_cmpTemplates: Map;

constructor() {
super();
this._cmpTemplates = MapWrapper.create();
}

setTemplate(component: Type, template: Template) {
MapWrapper.set(this._cmpTemplates, component, template);
}

resolve(component: Type): Template {
var override = MapWrapper.get(this._cmpTemplates, component);

if (isPresent(override)) {
return override;
}

return super.resolve(component);
}
}
29 changes: 2 additions & 27 deletions modules/angular2/test/directives/non_bindable_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'angular2/test_lib';
import {DOM} from 'angular2/src/facade/dom';
import {Map, MapWrapper} from 'angular2/src/facade/collection';
import {Type, isPresent} from 'angular2/src/facade/lang';
import {Injector} from 'angular2/di';
import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'angular2/change_detection';
import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
Expand All @@ -10,15 +8,15 @@ import {NativeShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_str
import {Decorator, Component} from 'angular2/src/core/annotations/annotations';
import {Template} from 'angular2/src/core/annotations/template';
import {TemplateLoader} from 'angular2/src/core/compiler/template_loader';
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';
import {NgElement} from 'angular2/src/core/dom/element';
import {NonBindable} from 'angular2/src/directives/non_bindable';
import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock';

export function main() {
describe('non-bindable', () => {
var view, cd, compiler, component, tplResolver;
beforeEach(() => {
tplResolver = new FakeTemplateResolver();
tplResolver = new MockTemplateResolver();
compiler = new Compiler(dynamicChangeDetection, new TemplateLoader(null),
new DirectiveMetadataReader(), new Parser(new Lexer()), new CompilerCache(),
new NativeShadowDomStrategy(), tplResolver);
Expand Down Expand Up @@ -90,26 +88,3 @@ class TestDecorator {
DOM.addClass(el.domElement, 'compiled');
}
}

class FakeTemplateResolver extends TemplateResolver {
_cmpTemplates: Map;

constructor() {
super();
this._cmpTemplates = MapWrapper.create();
}

setTemplate(component: Type, template: Template) {
MapWrapper.set(this._cmpTemplates, component, template);
}

resolve(component: Type): Template {
var override = MapWrapper.get(this._cmpTemplates, component);

if (isPresent(override)) {
return override;
}

return super.resolve(component);
}
}
29 changes: 2 additions & 27 deletions modules/angular2/test/directives/switch_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'angular2/test_lib';
import {DOM} from 'angular2/src/facade/dom';
import {Map, MapWrapper} from 'angular2/src/facade/collection';
import {Type, isPresent} from 'angular2/src/facade/lang';
import {Injector} from 'angular2/di';
import {Lexer, Parser, dynamicChangeDetection} from 'angular2/change_detection';
import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
Expand All @@ -10,14 +8,14 @@ import {NativeShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_str
import {Component} from 'angular2/src/core/annotations/annotations';
import {Template} from 'angular2/src/core/annotations/template';
import {TemplateLoader} from 'angular2/core';
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';
import {Switch, SwitchWhen, SwitchDefault} from 'angular2/src/directives/switch';
import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock';

export function main() {
describe('switch', () => {
var view, cd, compiler, component, tplResolver;
beforeEach(() => {
tplResolver = new FakeTemplateResolver();
tplResolver = new MockTemplateResolver();
compiler = new Compiler(dynamicChangeDetection, new TemplateLoader(null),
new DirectiveMetadataReader(), new Parser(new Lexer()), new CompilerCache(),
new NativeShadowDomStrategy(), tplResolver);
Expand Down Expand Up @@ -166,26 +164,3 @@ class TestComponent {
this.when2 = null;
}
}

class FakeTemplateResolver extends TemplateResolver {
_cmpTemplates: Map;

constructor() {
super();
this._cmpTemplates = MapWrapper.create();
}

setTemplate(component: Type, template: Template) {
MapWrapper.set(this._cmpTemplates, component, template);
}

resolve(component: Type): Template {
var override = MapWrapper.get(this._cmpTemplates, component);

if (isPresent(override)) {
return override;
}

return super.resolve(component);
}
}
Loading