diff --git a/modules/angular2/test/core/compiler/pipeline/element_binder_builder_spec.js b/modules/angular2/test/core/compiler/pipeline/element_binder_builder_spec.js index 7dbf916740..f891f5dbec 100644 --- a/modules/angular2/test/core/compiler/pipeline/element_binder_builder_spec.js +++ b/modules/angular2/test/core/compiler/pipeline/element_binder_builder_spec.js @@ -29,13 +29,13 @@ export function main() { return new CompilePipeline([ new MockStep((parent, current, control) => { var hasBinding = false; - if (isPresent(current.element.getAttribute('text-binding'))) { + if (isPresent(DOM.getAttribute(current.element, 'text-binding'))) { MapWrapper.forEach(textNodeBindings, (v,k) => { current.addTextNodeBinding(k, parser.parseBinding(v, null)); }); hasBinding = true; } - if (isPresent(current.element.getAttribute('prop-binding'))) { + if (isPresent(DOM.getAttribute(current.element, 'prop-binding'))) { if (isPresent(propertyBindings)) { MapWrapper.forEach(propertyBindings, (v,k) => { current.addPropertyBinding(k, parser.parseBinding(v, null)); @@ -43,13 +43,13 @@ export function main() { } hasBinding = true; } - if (isPresent(current.element.getAttribute('event-binding'))) { + if (isPresent(DOM.getAttribute(current.element, 'event-binding'))) { MapWrapper.forEach(eventBindings, (v,k) => { current.addEventBinding(k, parser.parseAction(v, null)); }); hasBinding = true; } - if (isPresent(current.element.getAttribute('directives'))) { + if (isPresent(DOM.getAttribute(current.element, 'directives'))) { hasBinding = true; for (var i=0; i { diff --git a/modules/angular2/test/core/compiler/pipeline/pipeline_spec.js b/modules/angular2/test/core/compiler/pipeline/pipeline_spec.js index 0e29a4b633..0a411e4a53 100644 --- a/modules/angular2/test/core/compiler/pipeline/pipeline_spec.js +++ b/modules/angular2/test/core/compiler/pipeline/pipeline_spec.js @@ -105,7 +105,7 @@ export function main() { var newChild = new CompileElement(el('
')); var pipeline = new CompilePipeline([ new MockStep((parent, current, control) => { - if (StringWrapper.equals(current.element.id, '1')) { + if (StringWrapper.equals(DOM.getAttribute(current.element, 'id'), '1')) { control.addChild(newChild); } }), @@ -144,9 +144,9 @@ export class IgnoreChildrenStep extends CompileStep { function logEntry(log, parent, current) { var parentId = ''; if (isPresent(parent)) { - parentId = parent.element.getAttribute('id')+'<'; + parentId = DOM.getAttribute(parent.element, 'id') + '<'; } - ListWrapper.push(log, parentId+current.element.getAttribute('id')); + ListWrapper.push(log, parentId + DOM.getAttribute(current.element, 'id')); } function createLoggerStep(log) { @@ -158,7 +158,7 @@ function createLoggerStep(log) { function createWrapperStep(wrapperId, log) { var nextElementId = 0; return new MockStep((parent, current, control) => { - var parentCountStr = current.element.getAttribute(wrapperId); + var parentCountStr = DOM.getAttribute(current.element, wrapperId); if (isPresent(parentCountStr)) { var parentCount = NumberWrapper.parseInt(parentCountStr, 10); while (parentCount > 0) { diff --git a/modules/angular2/test/core/compiler/pipeline/proto_element_injector_builder_spec.js b/modules/angular2/test/core/compiler/pipeline/proto_element_injector_builder_spec.js index b4a98a1b28..6426cfb302 100644 --- a/modules/angular2/test/core/compiler/pipeline/proto_element_injector_builder_spec.js +++ b/modules/angular2/test/core/compiler/pipeline/proto_element_injector_builder_spec.js @@ -1,5 +1,6 @@ import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'angular2/test_lib'; import {isPresent, isBlank} from 'angular2/src/facade/lang'; +import {DOM} from 'angular2/src/dom/dom_adapter'; import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; import {ProtoElementInjectorBuilder} from 'angular2/src/core/compiler/pipeline/proto_element_injector_builder'; @@ -33,11 +34,11 @@ export function main() { } var reader = new DirectiveMetadataReader(); return new CompilePipeline([new MockStep((parent, current, control) => { - if (isPresent(current.element.getAttribute('viewroot'))) { + if (isPresent(DOM.getAttribute(current.element, 'viewroot'))) { current.isViewRoot = true; } - if (isPresent(current.element.getAttribute('directives'))) { + if (isPresent(DOM.getAttribute(current.element, 'directives'))) { for (var i=0; i { function createPipeline(variableBindings = null) { return new CompilePipeline([new MockStep((parent, current, control) => { - if (isPresent(current.element.getAttribute('viewroot'))) { + if (isPresent(DOM.getAttribute(current.element, 'viewroot'))) { current.isViewRoot = true; } - if (isPresent(current.element.getAttribute('var-binding'))) { + if (isPresent(DOM.getAttribute(current.element, 'var-binding'))) { current.variableBindings = MapWrapper.createFromStringMap(variableBindings); } current.inheritedElementBinder = new ElementBinder(null, null, null); diff --git a/modules/angular2/test/core/compiler/pipeline/view_splitter_spec.js b/modules/angular2/test/core/compiler/pipeline/view_splitter_spec.js index a93441c20b..c85088daae 100644 --- a/modules/angular2/test/core/compiler/pipeline/view_splitter_spec.js +++ b/modules/angular2/test/core/compiler/pipeline/view_splitter_spec.js @@ -25,6 +25,7 @@ export function main() { it('should move the content into a new