committed by
Misko Hevery
parent
4d35dd4d45
commit
908a0aa7dc
+3
-29
@@ -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,
|
||||
@@ -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';
|
||||
@@ -37,7 +35,7 @@ export function main() {
|
||||
}
|
||||
|
||||
beforeEach( () => {
|
||||
tplResolver = new FakeTemplateResolver();
|
||||
tplResolver = new MockTemplateResolver();
|
||||
compiler = createCompiler(tplResolver, dynamicChangeDetection);
|
||||
});
|
||||
|
||||
@@ -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;
|
||||
@@ -534,4 +508,4 @@ class DoublePipeFactory {
|
||||
create() {
|
||||
return new DoublePipe();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+4
-27
@@ -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';
|
||||
@@ -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';
|
||||
@@ -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(),
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user