cargdev/angular
1
0
Fork 0
Code Issues 15 Pull Requests Actions Packages Projects Releases Wiki Activity

repackaging: all the repackaging changes squashed

Browse Source
This commit is contained in:
Igor Minar
2016-04-28 17:50:03 -07:00
committed by Misko Hevery
parent 505da6c0a8
commit a66cdb469f
860 changed files with 7869 additions and 4985 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
modules/@angular/core/test/linker/change_detection_integration_spec.ts
View File

@ -7,17 +7,18 @@ import {
expect,
beforeEach,
afterEach,
tick,
fakeAsync,
TestComponentBuilder,
ComponentFixture,
inject,
beforeEachProviders
} from 'angular2/testing_internal';
} from '@angular/core/testing/testing_internal';
import {
fakeAsync,
flushMicrotasks,
Log,
tick,
} from '@angular/core/testing';
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
import {
IS_DART,
Type,
isPresent,
isBlank,
isNumber,
@ -25,20 +26,21 @@ import {
FunctionWrapper,
NumberWrapper,
normalizeBool
} from 'angular2/src/facade/lang';
import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
import {MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
import {DOM} from 'angular2/src/platform/dom/dom_adapter';
} from '../../src/facade/lang';
import {BaseException, WrappedException} from '../../src/facade/exceptions';
import {MapWrapper, StringMapWrapper} from '../../src/facade/collection';
import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
import {
PipeTransform,
ChangeDetectionStrategy,
WrappedValue,
} from 'angular2/src/core/change_detection/change_detection';
} from '@angular/core/src/change_detection/change_detection';
import {OnDestroy} from 'angular2/src/core/metadata/lifecycle_hooks';
import {OnDestroy} from '@angular/core/src/metadata/lifecycle_hooks';
import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async';
import {IS_DART, Type} from '../../src/facade/lang';
import {EventEmitter, ObservableWrapper} from '../../src/facade/async';
import {
@ -65,15 +67,15 @@ import {
AfterContentChecked,
AfterViewInit,
AfterViewChecked
} from 'angular2/core';
import {By} from 'angular2/platform/common_dom';
import {AsyncPipe} from 'angular2/common';
} from '@angular/core';
import {By} from '@angular/platform-browser/src/dom/debug/by';
import {AsyncPipe} from '@angular/common';
import {ElementSchemaRegistry} from 'angular2/src/compiler/schema/element_schema_registry';
import {MockSchemaRegistry} from '../../compiler/schema_registry_mock';
import {TEST_PROVIDERS} from '../../compiler/test_bindings';
import {DebugDomRootRenderer, DebugDomRenderer} from 'angular2/src/core/debug/debug_renderer';
import {DomRootRenderer} from 'angular2/src/platform/dom/dom_renderer';
import {ElementSchemaRegistry} from '@angular/compiler/src/schema/element_schema_registry';
import {MockSchemaRegistry} from '@angular/compiler/testing';
import {TEST_PROVIDERS} from '@angular/compiler/test/test_bindings';
import {DebugDomRenderer} from '@angular/core/src/debug/debug_renderer';
import {DomRootRenderer} from '@angular/platform-browser/src/dom/dom_renderer';
export function main() {
var tcb: TestComponentBuilder;
@ -117,7 +119,7 @@ export function main() {
describe(`ChangeDetection`, () => {
// On CJS fakeAsync is not supported...
if (!DOM.supportsDOMEvents()) return;
if (!getDOM().supportsDOMEvents()) return;
beforeEachProviders(() => [
RenderLog,

57
modules/@angular/core/test/linker/dynamic_component_loader_spec.ts
View File

@ -1,30 +1,27 @@
import {
AsyncTestCompleter,
beforeEach,
ddescribe,
xdescribe,
describe,
el,
dispatchEvent,
expect,
iit,
inject,
beforeEachProviders,
it,
xit,
TestComponentBuilder,
ComponentFixture
} from 'angular2/testing_internal';
import {Predicate} from 'angular2/src/facade/collection';
import {Injector, OnDestroy, DebugElement, Type, ViewContainerRef, ViewChild} from 'angular2/core';
import {Component, ViewMetadata} from 'angular2/src/core/metadata';
import {DynamicComponentLoader} from 'angular2/src/core/linker/dynamic_component_loader';
import {ElementRef} from 'angular2/src/core/linker/element_ref';
import {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens';
import {DOM} from 'angular2/src/platform/dom/dom_adapter';
import {BaseException} from 'angular2/src/facade/exceptions';
import {PromiseWrapper} from 'angular2/src/facade/promise';
} from '@angular/core/testing/testing_internal';
import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
import {Predicate} from '../../src/facade/collection';
import {Injector, OnDestroy, DebugElement, Type, ViewContainerRef, ViewChild} from '@angular/core';
import {Component, ViewMetadata} from '@angular/core/src/metadata';
import {DynamicComponentLoader} from '@angular/core/src/linker/dynamic_component_loader';
import {ElementRef} from '@angular/core/src/linker/element_ref';
import {DOCUMENT} from '@angular/platform-browser/src/dom/dom_tokens';
import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
import {BaseException} from '../../src/facade/exceptions';
import {PromiseWrapper} from '../../src/facade/promise';
import {el} from '@angular/platform-browser/testing';
export function main() {
describe('DynamicComponentLoader', function() {
@ -32,7 +29,7 @@ export function main() {
it('should work',
inject([DynamicComponentLoader, TestComponentBuilder, AsyncTestCompleter],
(loader: DynamicComponentLoader, tcb: TestComponentBuilder, async) => {
tcb.createAsync(MyComp).then((tc) => {
tcb.createAsync(MyComp3).then((tc) => {
tc.detectChanges();
loader.loadNextToLocation(DynamicallyLoaded,
tc.componentInstance.viewContainerRef)
@ -48,7 +45,7 @@ export function main() {
inject(
[DynamicComponentLoader, TestComponentBuilder, AsyncTestCompleter],
(loader: DynamicComponentLoader, tcb: TestComponentBuilder, async) => {
tcb.createAsync(MyComp).then((tc) => {
tcb.createAsync(MyComp3).then((tc) => {
tc.detectChanges();
loader.loadNextToLocation(DynamicallyLoaded, tc.componentInstance.viewContainerRef)
.then(ref => {
@ -71,7 +68,7 @@ export function main() {
it('should update host properties',
inject([DynamicComponentLoader, TestComponentBuilder, AsyncTestCompleter],
(loader: DynamicComponentLoader, tcb: TestComponentBuilder, async) => {
tcb.createAsync(MyComp).then((tc) => {
tcb.createAsync(MyComp3).then((tc) => {
tc.detectChanges();
loader.loadNextToLocation(DynamicallyLoadedWithHostProps,
@ -94,7 +91,7 @@ export function main() {
it('should leave the view tree in a consistent state if hydration fails',
inject([DynamicComponentLoader, TestComponentBuilder, AsyncTestCompleter],
(loader: DynamicComponentLoader, tcb: TestComponentBuilder, async) => {
tcb.createAsync(MyComp).then((tc: ComponentFixture<any>) => {
tcb.createAsync(MyComp3).then((tc: ComponentFixture<any>) => {
tc.detectChanges();
PromiseWrapper.catchError(
loader.loadNextToLocation(DynamicallyLoadedThrows,
@ -111,11 +108,11 @@ export function main() {
it('should allow to pass projectable nodes',
inject([DynamicComponentLoader, TestComponentBuilder, AsyncTestCompleter],
(loader: DynamicComponentLoader, tcb: TestComponentBuilder, async) => {
tcb.createAsync(MyComp).then((tc) => {
tcb.createAsync(MyComp3).then((tc) => {
tc.detectChanges();
loader.loadNextToLocation(DynamicallyLoadedWithNgContent,
tc.componentInstance.viewContainerRef, null,
[[DOM.createTextNode('hello')]])
[[getDOM().createTextNode('hello')]])
.then(ref => {
tc.detectChanges();
var newlyInsertedElement = tc.debugElement.childNodes[1].nativeNode;
@ -128,7 +125,7 @@ export function main() {
it('should not throw if not enough projectable nodes are passed in',
inject([DynamicComponentLoader, TestComponentBuilder, AsyncTestCompleter],
(loader: DynamicComponentLoader, tcb: TestComponentBuilder, async) => {
tcb.createAsync(MyComp).then((tc) => {
tcb.createAsync(MyComp3).then((tc) => {
tc.detectChanges();
loader.loadNextToLocation(DynamicallyLoadedWithNgContent,
tc.componentInstance.viewContainerRef, null, [])
@ -143,7 +140,7 @@ export function main() {
inject([AsyncTestCompleter, DynamicComponentLoader, DOCUMENT, Injector],
(async, loader: DynamicComponentLoader, doc, injector: Injector) => {
var rootEl = createRootElement(doc, 'child-cmp');
DOM.appendChild(doc.body, rootEl);
getDOM().appendChild(doc.body, rootEl);
loader.loadAsRoot(ChildComp, null, injector)
.then((componentRef) => {
var el = new ComponentFixture<any>(componentRef, null, false);
@ -172,9 +169,9 @@ export function main() {
inject([AsyncTestCompleter, DynamicComponentLoader, DOCUMENT, Injector],
(async, loader: DynamicComponentLoader, doc, injector: Injector) => {
var rootEl = createRootElement(doc, 'dummy');
DOM.appendChild(doc.body, rootEl);
getDOM().appendChild(doc.body, rootEl);
loader.loadAsRoot(DynamicallyLoadedWithNgContent, null, injector, null,
[[DOM.createTextNode('hello')]])
[[getDOM().createTextNode('hello')]])
.then((_) => {
expect(rootEl).toHaveText('dynamic(hello)');
@ -188,12 +185,12 @@ export function main() {
}
function createRootElement(doc: any, name: string): any {
var nodes = DOM.querySelectorAll(doc, name);
var nodes = getDOM().querySelectorAll(doc, name);
for (var i = 0; i < nodes.length; i++) {
DOM.remove(nodes[i]);
getDOM().remove(nodes[i]);
}
var rootEl = el(`<${name}></${name}>`);
DOM.appendChild(doc.body, rootEl);
getDOM().appendChild(doc.body, rootEl);
return rootEl;
}
@ -235,7 +232,7 @@ class DynamicallyLoadedWithNgContent {
}
@Component({selector: 'my-comp', directives: [], template: '<div #loc></div>'})
class MyComp {
class MyComp3 {
ctxBoolProp: boolean;
@ViewChild('loc', {read: ViewContainerRef}) viewContainerRef: ViewContainerRef;

2
modules/@angular/core/test/linker/integration_dart_spec.dart
View File

@ -4,7 +4,7 @@ library angular2.test.di.integration_dart_spec;
import 'package:angular2/angular2.dart';
import 'package:angular2/core.dart';
import 'package:angular2/src/core/debug/debug_node.dart';
import 'package:angular2/testing_internal.dart';
import 'package:@angular/core/testing/testing_internal.dart';
import 'package:observe/observe.dart';
import 'package:angular2/src/core/change_detection/differs/default_iterable_differ.dart';
import 'package:angular2/src/core/change_detection/change_detection.dart';

173
modules/@angular/core/test/linker/integration_spec.ts
View File

@ -1,28 +1,24 @@
import {
AsyncTestCompleter,
beforeEach,
ddescribe,
xdescribe,
describe,
el,
dispatchEvent,
expect,
iit,
inject,
beforeEachProviders,
it,
xit,
} from '@angular/core/testing/testing_internal';
import {
containsRegexp,
stringifyElement,
TestComponentBuilder,
fakeAsync,
tick,
clearPendingTimers,
ComponentFixture
} from 'angular2/testing_internal';
import {DOM} from 'angular2/src/platform/dom/dom_adapter';
clearPendingTimers
} from '@angular/core/testing';
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
import {
Type,
isPresent,
@ -31,15 +27,14 @@ import {
global,
stringify,
isBlank,
IS_DART
} from 'angular2/src/facade/lang';
import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
} from '../../src/facade/lang';
import {BaseException, WrappedException} from '../../src/facade/exceptions';
import {
PromiseWrapper,
EventEmitter,
ObservableWrapper,
PromiseCompleter,
} from 'angular2/src/facade/async';
} from '../../src/facade/async';
import {
Injector,
@ -55,17 +50,17 @@ import {
SkipSelfMetadata,
OnDestroy,
ReflectiveInjector
} from 'angular2/core';
} from '@angular/core';
import {NgIf, NgFor, AsyncPipe} from 'angular2/common';
import {NgIf, NgFor, AsyncPipe} from '@angular/common';
import {
PipeTransform,
ChangeDetectorRef,
ChangeDetectionStrategy
} from 'angular2/src/core/change_detection/change_detection';
} from '@angular/core/src/change_detection/change_detection';
import {CompilerConfig} from 'angular2/compiler';
import {CompilerConfig} from '@angular/compiler';
import {
Directive,
@ -78,18 +73,20 @@ import {
Output,
HostBinding,
HostListener
} from 'angular2/src/core/metadata';
} from '@angular/core/src/metadata';
import {QueryList} from 'angular2/src/core/linker/query_list';
import {QueryList} from '@angular/core/src/linker/query_list';
import {ViewContainerRef} from 'angular2/src/core/linker/view_container_ref';
import {EmbeddedViewRef} from 'angular2/src/core/linker/view_ref';
import {ViewContainerRef} from '@angular/core/src/linker/view_container_ref';
import {EmbeddedViewRef} from '@angular/core/src/linker/view_ref';
import {ComponentResolver} from 'angular2/src/core/linker/component_resolver';
import {ElementRef} from 'angular2/src/core/linker/element_ref';
import {TemplateRef_, TemplateRef} from 'angular2/src/core/linker/template_ref';
import {ComponentResolver} from '@angular/core/src/linker/component_resolver';
import {ElementRef} from '@angular/core/src/linker/element_ref';
import {TemplateRef, TemplateRef_} from '@angular/core/src/linker/template_ref';
import {Renderer} from 'angular2/src/core/render';
import {Renderer} from '@angular/core/src/render';
import {IS_DART} from '../../src/facade/lang';
import {el, dispatchEvent} from '@angular/platform-browser/testing';
const ANCHOR_ELEMENT = /*@ts2dart_const*/ new OpaqueToken('AnchorElement');
@ -167,13 +164,13 @@ function declareTests(isJit: boolean) {
fixture.debugElement.componentInstance.ctxProp = 'Initial aria label';
fixture.detectChanges();
expect(
DOM.getAttribute(fixture.debugElement.children[0].nativeElement, 'aria-label'))
getDOM().getAttribute(fixture.debugElement.children[0].nativeElement, 'aria-label'))
.toEqual('Initial aria label');
fixture.debugElement.componentInstance.ctxProp = 'Changed aria label';
fixture.detectChanges();
expect(
DOM.getAttribute(fixture.debugElement.children[0].nativeElement, 'aria-label'))
getDOM().getAttribute(fixture.debugElement.children[0].nativeElement, 'aria-label'))
.toEqual('Changed aria label');
async.done();
@ -190,12 +187,12 @@ function declareTests(isJit: boolean) {
fixture.debugElement.componentInstance.ctxProp = 'bar';
fixture.detectChanges();
expect(DOM.getAttribute(fixture.debugElement.children[0].nativeElement, 'foo'))
expect(getDOM().getAttribute(fixture.debugElement.children[0].nativeElement, 'foo'))
.toEqual('bar');
fixture.debugElement.componentInstance.ctxProp = null;
fixture.detectChanges();
expect(DOM.hasAttribute(fixture.debugElement.children[0].nativeElement, 'foo'))
expect(getDOM().hasAttribute(fixture.debugElement.children[0].nativeElement, 'foo'))
.toBeFalsy();
async.done();
@ -212,12 +209,12 @@ function declareTests(isJit: boolean) {
fixture.debugElement.componentInstance.ctxProp = '10';
fixture.detectChanges();
expect(DOM.getStyle(fixture.debugElement.children[0].nativeElement, 'height'))
expect(getDOM().getStyle(fixture.debugElement.children[0].nativeElement, 'height'))
.toEqual('10px');
fixture.debugElement.componentInstance.ctxProp = null;
fixture.detectChanges();
expect(DOM.getStyle(fixture.debugElement.children[0].nativeElement, 'height'))
expect(getDOM().getStyle(fixture.debugElement.children[0].nativeElement, 'height'))
.toEqual('');
async.done();
@ -272,12 +269,12 @@ function declareTests(isJit: boolean) {
fixture.debugElement.componentInstance.ctxProp = 'Some <span>HTML</span>';
fixture.detectChanges();
expect(DOM.getInnerHTML(fixture.debugElement.children[0].nativeElement))
expect(getDOM().getInnerHTML(fixture.debugElement.children[0].nativeElement))
.toEqual('Some <span>HTML</span>');
fixture.debugElement.componentInstance.ctxProp = 'Some other <div>HTML</div>';
fixture.detectChanges();
expect(DOM.getInnerHTML(fixture.debugElement.children[0].nativeElement))
expect(getDOM().getInnerHTML(fixture.debugElement.children[0].nativeElement))
.toEqual('Some other <div>HTML</div>');
async.done();
@ -480,7 +477,7 @@ function declareTests(isJit: boolean) {
fixture.detectChanges();
var childNodesOfWrapper = DOM.childNodes(fixture.debugElement.nativeElement);
var childNodesOfWrapper = getDOM().childNodes(fixture.debugElement.nativeElement);
// 1 template + 2 copies.
expect(childNodesOfWrapper.length).toBe(3);
expect(childNodesOfWrapper[1]).toHaveText('hello');
@ -495,9 +492,9 @@ function declareTests(isJit: boolean) {
.createAsync(MyComp)
.then((fixture) => {
var childNodesOfWrapper = DOM.childNodes(fixture.debugElement.nativeElement);
var childNodesOfWrapper = getDOM().childNodes(fixture.debugElement.nativeElement);
expect(childNodesOfWrapper.length).toBe(1);
expect(DOM.isCommentNode(childNodesOfWrapper[0])).toBe(true);
expect(getDOM().isCommentNode(childNodesOfWrapper[0])).toBe(true);
async.done();
});
}));
@ -515,7 +512,7 @@ function declareTests(isJit: boolean) {
.then((fixture) => {
fixture.detectChanges();
var childNodesOfWrapper = DOM.childNodes(fixture.debugElement.nativeElement);
var childNodesOfWrapper = getDOM().childNodes(fixture.debugElement.nativeElement);
// 1 template + 2 copies.
expect(childNodesOfWrapper.length).toBe(3);
expect(childNodesOfWrapper[1]).toHaveText('hello');
@ -705,7 +702,7 @@ function declareTests(isJit: boolean) {
.then((fixture) => {
fixture.detectChanges();
// Get the element at index 2, since index 0 is the <template>.
expect(DOM.childNodes(fixture.debugElement.nativeElement)[2])
expect(getDOM().childNodes(fixture.debugElement.nativeElement)[2])
.toHaveText("1-hello");
async.done();
@ -766,7 +763,7 @@ function declareTests(isJit: boolean) {
async.done();
})}));
if (DOM.supportsDOMEvents()) {
if (getDOM().supportsDOMEvents()) {
it("should allow to destroy a component from within a host event handler",
fakeAsync(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
@ -855,7 +852,7 @@ function declareTests(isJit: boolean) {
async.done();
})}));
if (DOM.supportsDOMEvents()) {
if (getDOM().supportsDOMEvents()) {
it('should be checked when an async pipe requests a check',
fakeAsync(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
tcb =
@ -1063,16 +1060,16 @@ function declareTests(isJit: boolean) {
.then((fixture) => {
var tc = fixture.debugElement.children[0];
var listener = tc.inject(DirectiveListeningDomEvent);
dispatchEvent(DOM.getGlobalEventTarget("window"), 'domEvent');
dispatchEvent(getDOM().getGlobalEventTarget("window"), 'domEvent');
expect(listener.eventTypes).toEqual(['window_domEvent']);
listener.eventTypes = [];
dispatchEvent(DOM.getGlobalEventTarget("document"), 'domEvent');
dispatchEvent(getDOM().getGlobalEventTarget("document"), 'domEvent');
expect(listener.eventTypes).toEqual(['document_domEvent', 'window_domEvent']);
fixture.destroy();
listener.eventTypes = [];
dispatchEvent(DOM.getGlobalEventTarget("body"), 'domEvent');
dispatchEvent(getDOM().getGlobalEventTarget("body"), 'domEvent');
expect(listener.eventTypes).toEqual([]);
async.done();
@ -1090,7 +1087,7 @@ function declareTests(isJit: boolean) {
.then((fixture) => {
fixture.detectChanges();
expect(DOM.getAttribute(fixture.debugElement.children[0].nativeElement, "role"))
expect(getDOM().getAttribute(fixture.debugElement.children[0].nativeElement, "role"))
.toEqual("button");
async.done();
@ -1120,7 +1117,7 @@ function declareTests(isJit: boolean) {
}));
if (DOM.supportsDOMEvents()) {
if (getDOM().supportsDOMEvents()) {
it('should support preventing default on render events',
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder,
async) => {
@ -1136,17 +1133,17 @@ function declareTests(isJit: boolean) {
.createAsync(MyComp)
.then((fixture) => {
var dispatchedEvent = DOM.createMouseEvent('click');
var dispatchedEvent2 = DOM.createMouseEvent('click');
DOM.dispatchEvent(fixture.debugElement.children[0].nativeElement,
var dispatchedEvent = getDOM().createMouseEvent('click');
var dispatchedEvent2 = getDOM().createMouseEvent('click');
getDOM().dispatchEvent(fixture.debugElement.children[0].nativeElement,
dispatchedEvent);
DOM.dispatchEvent(fixture.debugElement.children[1].nativeElement,
getDOM().dispatchEvent(fixture.debugElement.children[1].nativeElement,
dispatchedEvent2);
expect(DOM.isPrevented(dispatchedEvent)).toBe(true);
expect(DOM.isPrevented(dispatchedEvent2)).toBe(false);
expect(DOM.getChecked(fixture.debugElement.children[0].nativeElement))
expect(getDOM().isPrevented(dispatchedEvent)).toBe(true);
expect(getDOM().isPrevented(dispatchedEvent2)).toBe(false);
expect(getDOM().getChecked(fixture.debugElement.children[0].nativeElement))
.toBeFalsy();
expect(DOM.getChecked(fixture.debugElement.children[1].nativeElement))
expect(getDOM().getChecked(fixture.debugElement.children[1].nativeElement))
.toBeTruthy();
async.done();
});
@ -1172,7 +1169,7 @@ function declareTests(isJit: boolean) {
var listener = tc.inject(DirectiveListeningDomEvent);
var listenerother = tc.inject(DirectiveListeningDomEventOther);
dispatchEvent(DOM.getGlobalEventTarget("window"), 'domEvent');
dispatchEvent(getDOM().getGlobalEventTarget("window"), 'domEvent');
expect(listener.eventTypes).toEqual(['window_domEvent']);
expect(listenerother.eventType).toEqual('other_domEvent');
expect(globalCounter).toEqual(1);
@ -1180,12 +1177,12 @@ function declareTests(isJit: boolean) {
fixture.debugElement.componentInstance.ctxBoolProp = false;
fixture.detectChanges();
dispatchEvent(DOM.getGlobalEventTarget("window"), 'domEvent');
dispatchEvent(getDOM().getGlobalEventTarget("window"), 'domEvent');
expect(globalCounter).toEqual(1);
fixture.debugElement.componentInstance.ctxBoolProp = true;
fixture.detectChanges();
dispatchEvent(DOM.getGlobalEventTarget("window"), 'domEvent');
dispatchEvent(getDOM().getGlobalEventTarget("window"), 'domEvent');
expect(globalCounter).toEqual(2);
// need to destroy to release all remaining global event listeners
@ -1382,7 +1379,7 @@ function declareTests(isJit: boolean) {
}))
.createAsync(MyComp)
.then((fixture) => {
expect(DOM.querySelectorAll(fixture.debugElement.nativeElement, 'script').length)
expect(getDOM().querySelectorAll(fixture.debugElement.nativeElement, 'script').length)
.toEqual(0);
async.done();
});
@ -1438,7 +1435,7 @@ function declareTests(isJit: boolean) {
PromiseWrapper.catchError(tcb.createAsync(MyComp), (e) => {
var c = e.context;
expect(DOM.nodeName(c.componentRenderElement).toUpperCase()).toEqual("DIV");
expect(getDOM().nodeName(c.componentRenderElement).toUpperCase()).toEqual("DIV");
expect((<Injector>c.injector).get).toBeTruthy();
async.done();
return null;
@ -1457,8 +1454,8 @@ function declareTests(isJit: boolean) {
throw "Should throw";
} catch (e) {
var c = e.context;
expect(DOM.nodeName(c.renderNode).toUpperCase()).toEqual("INPUT");
expect(DOM.nodeName(c.componentRenderElement).toUpperCase()).toEqual("DIV");
expect(getDOM().nodeName(c.renderNode).toUpperCase()).toEqual("INPUT");
expect(getDOM().nodeName(c.componentRenderElement).toUpperCase()).toEqual("DIV");
expect((<Injector>c.injector).get).toBeTruthy();
expect(c.source).toContain(":0:7");
expect(c.context).toBe(fixture.debugElement.componentInstance);
@ -1489,7 +1486,7 @@ function declareTests(isJit: boolean) {
});
}));
if (DOM.supportsDOMEvents()) { // this is required to use fakeAsync
if (getDOM().supportsDOMEvents()) { // this is required to use fakeAsync
it('should provide an error context when an error happens in an event handler',
fakeAsync(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
tcb = tcb.overrideView(
@ -1511,8 +1508,8 @@ function declareTests(isJit: boolean) {
clearPendingTimers();
var c = e.context;
expect(DOM.nodeName(c.renderNode).toUpperCase()).toEqual("SPAN");
expect(DOM.nodeName(c.componentRenderElement).toUpperCase()).toEqual("DIV");
expect(getDOM().nodeName(c.renderNode).toUpperCase()).toEqual("SPAN");
expect(getDOM().nodeName(c.componentRenderElement).toUpperCase()).toEqual("DIV");
expect((<Injector>c.injector).get).toBeTruthy();
expect(c.context).toBe(fixture.debugElement.componentInstance);
expect(c.references["local"]).toBeDefined();
@ -1660,7 +1657,7 @@ function declareTests(isJit: boolean) {
fixture.debugElement.componentInstance.ctxProp = "TITLE";
fixture.detectChanges();
var el = DOM.querySelector(fixture.debugElement.nativeElement, "span");
var el = getDOM().querySelector(fixture.debugElement.nativeElement, "span");
expect(isBlank(el.title) || el.title == '').toBeTruthy();
async.done();
@ -1679,7 +1676,7 @@ function declareTests(isJit: boolean) {
fixture.debugElement.componentInstance.ctxProp = "TITLE";
fixture.detectChanges();
var el = DOM.querySelector(fixture.debugElement.nativeElement, "span");
var el = getDOM().querySelector(fixture.debugElement.nativeElement, "span");
expect(el.title).toEqual("TITLE");
async.done();
@ -1704,7 +1701,7 @@ function declareTests(isJit: boolean) {
fixture.debugElement.componentInstance.ctxProp = 'hello';
fixture.detectChanges();
expect(DOM.getInnerHTML(fixture.debugElement.nativeElement))
expect(getDOM().getInnerHTML(fixture.debugElement.nativeElement))
.toContain('ng-reflect-dir-prop="hello"');
async.done();
});
@ -1720,7 +1717,7 @@ function declareTests(isJit: boolean) {
fixture.debugElement.componentInstance.ctxBoolProp = true;
fixture.detectChanges();
expect(DOM.getInnerHTML(fixture.debugElement.nativeElement))
expect(getDOM().getInnerHTML(fixture.debugElement.nativeElement))
.toContain('"ng\-reflect\-ng\-if"\: "true"');
async.done();
});
@ -1810,13 +1807,13 @@ function declareTests(isJit: boolean) {
dir.myAttr = "aaa";
fixture.detectChanges();
expect(DOM.getOuterHTML(fixture.debugElement.children[0].nativeElement))
expect(getDOM().getOuterHTML(fixture.debugElement.children[0].nativeElement))
.toContain('my-attr="aaa"');
async.done();
});
}));
if (DOM.supportsDOMEvents()) {
if (getDOM().supportsDOMEvents()) {
it('should support event decorators',
fakeAsync(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
tcb =
@ -1849,7 +1846,7 @@ function declareTests(isJit: boolean) {
fixture.detectChanges();
var dir = fixture.debugElement.children[0].inject(DirectiveWithPropDecorators);
var native = fixture.debugElement.children[0].nativeElement;
DOM.dispatchEvent(native, DOM.createMouseEvent('click'));
getDOM().dispatchEvent(native, getDOM().createMouseEvent('click'));
expect(dir.target).toBe(native);
async.done();
@ -1874,7 +1871,7 @@ function declareTests(isJit: boolean) {
});
if (DOM.supportsDOMEvents()) {
if (getDOM().supportsDOMEvents()) {
describe('svg', () => {
it('should support svg elements',
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder,
@ -1884,20 +1881,20 @@ function declareTests(isJit: boolean) {
.createAsync(MyComp)
.then((fixture) => {
var el = fixture.debugElement.nativeElement;
var svg = DOM.childNodes(el)[0];
var use = DOM.childNodes(svg)[0];
expect(DOM.getProperty(<Element>svg, 'namespaceURI'))
var svg = getDOM().childNodes(el)[0];
var use = getDOM().childNodes(svg)[0];
expect(getDOM().getProperty(<Element>svg, 'namespaceURI'))
.toEqual('http://www.w3.org/2000/svg');
expect(DOM.getProperty(<Element>use, 'namespaceURI'))
expect(getDOM().getProperty(<Element>use, 'namespaceURI'))
.toEqual('http://www.w3.org/2000/svg');
if (!IS_DART) {
var firstAttribute = DOM.getProperty(<Element>use, 'attributes')[0];
var firstAttribute = getDOM().getProperty(<Element>use, 'attributes')[0];
expect(firstAttribute.name).toEqual('xlink:href');
expect(firstAttribute.namespaceURI).toEqual('http://www.w3.org/1999/xlink');
} else {
// For Dart where '_Attr' has no instance getter 'namespaceURI'
expect(DOM.getOuterHTML(<HTMLElement>use)).toContain('xmlns:xlink');
expect(getDOM().getOuterHTML(<HTMLElement>use)).toContain('xmlns:xlink');
}
async.done();
@ -1914,8 +1911,8 @@ function declareTests(isJit: boolean) {
tcb.overrideView(SomeCmp, new ViewMetadata({template: '<svg:use xlink:href="#id" />'}))
.createAsync(SomeCmp)
.then((fixture) => {
let useEl = DOM.firstChild(fixture.debugElement.nativeElement);
expect(DOM.getAttributeNS(useEl, 'http://www.w3.org/1999/xlink', 'href'))
let useEl = getDOM().firstChild(fixture.debugElement.nativeElement);
expect(getDOM().getAttributeNS(useEl, 'http://www.w3.org/1999/xlink', 'href'))
.toEqual('#id');
async.done();
});
@ -1929,18 +1926,18 @@ function declareTests(isJit: boolean) {
.createAsync(SomeCmp)
.then((fixture) => {
let cmp = fixture.debugElement.componentInstance;
let useEl = DOM.firstChild(fixture.debugElement.nativeElement);
let useEl = getDOM().firstChild(fixture.debugElement.nativeElement);
cmp.value = "#id";
fixture.detectChanges();
expect(DOM.getAttributeNS(useEl, 'http://www.w3.org/1999/xlink', 'href'))
expect(getDOM().getAttributeNS(useEl, 'http://www.w3.org/1999/xlink', 'href'))
.toEqual('#id');
cmp.value = null;
fixture.detectChanges();
expect(DOM.hasAttributeNS(useEl, 'http://www.w3.org/1999/xlink', 'href'))
expect(getDOM().hasAttributeNS(useEl, 'http://www.w3.org/1999/xlink', 'href'))
.toEqual(false);
async.done();
@ -1964,7 +1961,7 @@ class SimpleImperativeViewComponent {
constructor(self: ElementRef, renderer: Renderer) {
var hostElement = self.nativeElement;
DOM.appendChild(hostElement, el('hello imp view'));
getDOM().appendChild(hostElement, el('hello imp view'));
}
}
@ -2510,7 +2507,7 @@ class SomeImperativeViewport {
this.view = this.vc.createEmbeddedView(this.templateRef);
var nodes = this.view.rootNodes;
for (var i = 0; i < nodes.length; i++) {
DOM.appendChild(this.anchor, nodes[i]);
getDOM().appendChild(this.anchor, nodes[i]);
}
}
}
@ -2527,14 +2524,14 @@ class ComponentWithoutView {
@Directive({selector: '[no-duplicate]'})
class DuplicateDir {
constructor(elRef: ElementRef) {
DOM.setText(elRef.nativeElement, DOM.getText(elRef.nativeElement) + 'noduplicate');
getDOM().setText(elRef.nativeElement, getDOM().getText(elRef.nativeElement) + 'noduplicate');
}
}
@Directive({selector: '[no-duplicate]'})
class OtherDuplicateDir {
constructor(elRef: ElementRef) {
DOM.setText(elRef.nativeElement, DOM.getText(elRef.nativeElement) + 'othernoduplicate');
getDOM().setText(elRef.nativeElement, getDOM().getText(elRef.nativeElement) + 'othernoduplicate');
}
}

57
modules/@angular/core/test/linker/projection_integration_spec.ts
View File

@ -1,26 +1,19 @@
import {
AsyncTestCompleter,
beforeEach,
ddescribe,
xdescribe,
describe,
el,
dispatchEvent,
expect,
iit,
inject,
beforeEachProviders,
it,
xit,
containsRegexp,
stringifyElement,
TestComponentBuilder,
ComponentFixture,
fakeAsync,
tick
} from 'angular2/testing_internal';
} from '@angular/core/testing/testing_internal';
import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
import {DOM} from 'angular2/src/platform/dom/dom_adapter';
import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
import {
bind,
@ -33,11 +26,11 @@ import {
ViewContainerRef,
ViewEncapsulation,
ViewMetadata
} from 'angular2/core';
} from '@angular/core';
import {
By,
} from 'angular2/platform/common_dom';
import {getAllDebugNodes} from 'angular2/src/core/debug/debug_node';
} from '@angular/platform-browser/src/dom/debug/by';
import {getAllDebugNodes} from '@angular/core/src/debug/debug_node';
export function main() {
describe('projection', () => {
@ -473,7 +466,7 @@ export function main() {
});
}));
if (DOM.supportsNativeShadowDOM()) {
if (getDOM().supportsNativeShadowDOM()) {
it('should support native content projection and isolate styles per component',
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
tcb.overrideView(MainComp, new ViewMetadata({
@ -483,7 +476,7 @@ export function main() {
}))
.createAsync(MainComp)
.then((main) => {
var childNodes = DOM.childNodes(main.debugElement.nativeElement);
var childNodes = getDOM().childNodes(main.debugElement.nativeElement);
expect(childNodes[0]).toHaveText('div {color: red}SIMPLE1(A)');
expect(childNodes[1]).toHaveText('div {color: blue}SIMPLE2(B)');
main.destroy();
@ -492,7 +485,7 @@ export function main() {
}));
}
if (DOM.supportsDOMEvents()) {
if (getDOM().supportsDOMEvents()) {
it('should support non emulated styles',
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
tcb.overrideView(MainComp, new ViewMetadata({
@ -504,12 +497,12 @@ export function main() {
.createAsync(MainComp)
.then((main) => {
var mainEl = main.debugElement.nativeElement;
var div1 = DOM.firstChild(mainEl);
var div2 = DOM.createElement('div');
DOM.setAttribute(div2, 'class', 'redStyle');
DOM.appendChild(mainEl, div2);
expect(DOM.getComputedStyle(div1).color).toEqual('rgb(255, 0, 0)');
expect(DOM.getComputedStyle(div2).color).toEqual('rgb(255, 0, 0)');
var div1 = getDOM().firstChild(mainEl);
var div2 = getDOM().createElement('div');
getDOM().setAttribute(div2, 'class', 'redStyle');
getDOM().appendChild(mainEl, div2);
expect(getDOM().getComputedStyle(div1).color).toEqual('rgb(255, 0, 0)');
expect(getDOM().getComputedStyle(div2).color).toEqual('rgb(255, 0, 0)');
async.done();
});
}));
@ -524,11 +517,11 @@ export function main() {
.createAsync(MainComp)
.then((main) => {
var mainEl = main.debugElement.nativeElement;
var div1 = DOM.firstChild(mainEl);
var div2 = DOM.createElement('div');
DOM.appendChild(mainEl, div2);
expect(DOM.getComputedStyle(div1).color).toEqual('rgb(255, 0, 0)');
expect(DOM.getComputedStyle(div2).color).toEqual('rgb(0, 0, 0)');
var div1 = getDOM().firstChild(mainEl);
var div2 = getDOM().createElement('div');
getDOM().appendChild(mainEl, div2);
expect(getDOM().getComputedStyle(div1).color).toEqual('rgb(255, 0, 0)');
expect(getDOM().getComputedStyle(div2).color).toEqual('rgb(0, 0, 0)');
async.done();
});
}));
@ -567,7 +560,7 @@ export function main() {
.createAsync(MainComp)
.then((main) => {
main.detectChanges();
expect(DOM.getInnerHTML(main.debugElement.nativeElement))
expect(getDOM().getInnerHTML(main.debugElement.nativeElement))
.toEqual('<cmp-a><cmp-b><cmp-d><d>cmp-d</d></cmp-d></cmp-b>' +
'<cmp-c><c>cmp-c</c></cmp-c></cmp-a>');
async.done();
@ -583,7 +576,7 @@ export function main() {
.createAsync(MainComp)
.then((main) => {
main.detectChanges();
expect(DOM.getInnerHTML(main.debugElement.nativeElement))
expect(getDOM().getInnerHTML(main.debugElement.nativeElement))
.toEqual('<cmp-a1>a1<cmp-b11>b11</cmp-b11><cmp-b12>b12</cmp-b12></cmp-a1>' +
'<cmp-a2>a2<cmp-b21>b21</cmp-b21><cmp-b22>b22</cmp-b22></cmp-a2>');
async.done();
@ -788,7 +781,7 @@ class Tree {
class CmpD {
tagName: string;
constructor(elementRef: ElementRef) {
this.tagName = DOM.tagName(elementRef.nativeElement).toLowerCase();
this.tagName = getDOM().tagName(elementRef.nativeElement).toLowerCase();
}
}
@ -797,7 +790,7 @@ class CmpD {
class CmpC {
tagName: string;
constructor(elementRef: ElementRef) {
this.tagName = DOM.tagName(elementRef.nativeElement).toLowerCase();
this.tagName = getDOM().tagName(elementRef.nativeElement).toLowerCase();
}
}

211
modules/@angular/core/test/linker/query_integration_spec.ts
View File

@ -1,19 +1,18 @@
import {
AsyncTestCompleter,
beforeEach,
ddescribe,
describe,
el,
expect,
iit,
inject,
it,
xit,
TestComponentBuilder,
} from 'angular2/testing_internal';
} from '@angular/core/testing/testing_internal';
import {TestComponentBuilder} from '@angular/compiler/testing';
import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
import {isPresent} from 'angular2/src/facade/lang';
import {ObservableWrapper} from 'angular2/src/facade/async';
import {isPresent} from '../../src/facade/lang';
import {ObservableWrapper} from '../../src/facade/async';
import {
Component,
@ -32,9 +31,9 @@ import {
AfterViewInit,
AfterContentChecked,
AfterViewChecked
} from 'angular2/core';
import {NgIf, NgFor} from 'angular2/common';
import {asNativeElements, ViewContainerRef} from 'angular2/core';
} from '@angular/core';
import {NgIf, NgFor} from '@angular/common';
import {asNativeElements, ViewContainerRef} from '@angular/core';
export function main() {
describe('Query API', () => {
@ -47,8 +46,8 @@ export function main() {
'</div></needs-query>' +
'<div text="4"></div>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
@ -63,8 +62,8 @@ export function main() {
var template =
'<needs-content-children #q><div text="foo"></div></needs-content-children>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
@ -84,20 +83,20 @@ export function main() {
var template =
'<needs-content-child #q><div *ngIf="shouldShow" text="foo"></div></needs-content-child>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.debugElement.componentInstance.shouldShow = true;
view.detectChanges();
var q: NeedsContentChild = view.debugElement.children[0].references['q'];
expect(q.log).toEqual([["setter", "foo"], ["init", "foo"], ["check", "foo"]]);
expect(q.logs).toEqual([["setter", "foo"], ["init", "foo"], ["check", "foo"]]);
view.debugElement.componentInstance.shouldShow = false;
view.detectChanges();
expect(q.log).toEqual([
expect(q.logs).toEqual([
["setter", "foo"],
["init", "foo"],
["check", "foo"],
@ -113,18 +112,18 @@ export function main() {
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template = '<needs-view-child #q></needs-view-child>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
var q: NeedsViewChild = view.debugElement.children[0].references['q'];
expect(q.log).toEqual([["setter", "foo"], ["init", "foo"], ["check", "foo"]]);
expect(q.logs).toEqual([["setter", "foo"], ["init", "foo"], ["check", "foo"]]);
q.shouldShow = false;
view.detectChanges();
expect(q.log).toEqual([
expect(q.logs).toEqual([
["setter", "foo"],
["init", "foo"],
["check", "foo"],
@ -139,30 +138,30 @@ export function main() {
it('should contain the first view child accross embedded views',
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template = '<needs-view-child #q></needs-view-child>';
tcb.overrideTemplate(MyComp, template)
tcb.overrideTemplate(MyComp0, template)
.overrideTemplate(
NeedsViewChild,
'<div *ngIf="true"><div *ngIf="shouldShow" text="foo"></div></div><div *ngIf="shouldShow2" text="bar"></div>')
.createAsync(MyComp)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
var q: NeedsViewChild = view.debugElement.children[0].references['q'];
expect(q.log).toEqual([["setter", "foo"], ["init", "foo"], ["check", "foo"]]);
expect(q.logs).toEqual([["setter", "foo"], ["init", "foo"], ["check", "foo"]]);
q.shouldShow = false;
q.shouldShow2 = true;
q.log = [];
q.logs = [];
view.detectChanges();
expect(q.log).toEqual([["setter", "bar"], ["check", "bar"]]);
expect(q.logs).toEqual([["setter", "bar"], ["check", "bar"]]);
q.shouldShow = false;
q.shouldShow2 = false;
q.log = [];
q.logs = [];
view.detectChanges();
expect(q.log).toEqual([["setter", null], ["check", null]]);
expect(q.logs).toEqual([["setter", null], ["check", null]]);
async.done();
});
@ -176,8 +175,8 @@ export function main() {
'</div></needs-query-desc>' +
'<div text="5"></div>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
expect(asNativeElements(view.debugElement.children)).toHaveText('2|3|4|');
@ -192,8 +191,8 @@ export function main() {
'<needs-query text="2"><div text="3"></div></needs-query>' +
'<div text="4"></div>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
expect(asNativeElements(view.debugElement.children)).toHaveText('2|3|');
@ -209,8 +208,8 @@ export function main() {
'<needs-query text="2"><div *ngIf="shouldShow" [text]="\'3\'"></div></needs-query>' +
'<div text="4"></div>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
@ -231,8 +230,8 @@ export function main() {
'<needs-query text="2"><div *ngIf="shouldShow" [text]="\'3\'"></div></needs-query>' +
'<div text="4"></div>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((fixture) => {
fixture.debugElement.componentInstance.shouldShow = true;
fixture.detectChanges();
@ -249,8 +248,8 @@ export function main() {
'<needs-query text="2"><div *ngFor="let i of list" [text]="i"></div></needs-query>' +
'<div text="4"></div>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
@ -269,27 +268,27 @@ export function main() {
it('should find TemplateRefs in the light and shadow dom',
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template = '<needs-tpl><template><div>light</div></template></needs-tpl>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
.then((view) => {
view.detectChanges();
var needsTpl: NeedsTpl = view.debugElement.children[0].inject(NeedsTpl);
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
var needsTpl: NeedsTpl = view.debugElement.children[0].inject(NeedsTpl);
expect(needsTpl.vc.createEmbeddedView(needsTpl.query.first).rootNodes[0])
.toHaveText('light');
expect(needsTpl.vc.createEmbeddedView(needsTpl.viewQuery.first).rootNodes[0])
.toHaveText('shadow');
expect(needsTpl.vc.createEmbeddedView(needsTpl.query.first).rootNodes[0])
.toHaveText('light');
expect(needsTpl.vc.createEmbeddedView(needsTpl.viewQuery.first).rootNodes[0])
.toHaveText('shadow');
async.done();
});
async.done();
});
}));
it('should find named TemplateRefs',
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template =
'<needs-named-tpl><template #tpl><div>light</div></template></needs-named-tpl>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
var needsTpl: NeedsNamedTpl = view.debugElement.children[0].inject(NeedsNamedTpl);
@ -309,8 +308,8 @@ export function main() {
var template =
'<needs-content-children-read #q text="ca"><div #q text="cb"></div></needs-content-children-read>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
@ -328,8 +327,8 @@ export function main() {
var template =
'<needs-content-child-read><div #q text="ca"></div></needs-content-child-read>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
@ -345,8 +344,8 @@ export function main() {
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template = '<needs-view-child-read></needs-view-child-read>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
@ -362,8 +361,8 @@ export function main() {
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template = '<needs-view-children-read></needs-view-children-read>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
@ -381,8 +380,8 @@ export function main() {
var template =
'<needs-viewcontainer-read><template>hello</template></needs-viewcontainer-read>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
@ -404,8 +403,8 @@ export function main() {
'<div *ngIf="shouldShow" text="2"></div>' +
'</needs-query>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
var q = view.debugElement.children[0].references["q"];
view.detectChanges();
@ -429,8 +428,8 @@ export function main() {
'</needs-query-desc>' +
'</needs-query-desc>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
var q1 = view.debugElement.children[0].references["q1"];
var q2 = view.debugElement.children[0].children[0].references["q2"];
@ -451,8 +450,8 @@ export function main() {
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template = '<needs-query #q *ngIf="shouldShow"><div text="foo"></div></needs-query>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.debugElement.componentInstance.shouldShow = true;
view.detectChanges();
@ -484,8 +483,8 @@ export function main() {
'<div *ngFor="let item of list" [text]="item" #textLabel="textDir"></div>' +
'</needs-query-by-ref-binding>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
var q = view.debugElement.children[0].references["q"];
@ -507,8 +506,8 @@ export function main() {
'<div text="two" #textLabel2="textDir"></div>' +
'</needs-query-by-ref-bindings>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
var q = view.debugElement.children[0].references["q"];
view.detectChanges();
@ -527,8 +526,8 @@ export function main() {
'<div *ngFor="let item of list" [text]="item" #textLabel="textDir"></div>' +
'</needs-query-by-ref-binding>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
var q = view.debugElement.children[0].references["q"];
@ -554,8 +553,8 @@ export function main() {
'</div>' +
'</needs-query-by-ref-binding>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
var q = view.debugElement.children[0].references["q"];
@ -576,8 +575,8 @@ export function main() {
'<div text="hello"></div><div text="world"></div>' +
'</needs-query-and-project>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
@ -591,8 +590,8 @@ export function main() {
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template = '<needs-view-query-by-ref-binding #q></needs-view-query-by-ref-binding>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
var q: NeedsViewQueryByLabel = view.debugElement.children[0].references["q"];
view.detectChanges();
@ -607,8 +606,8 @@ export function main() {
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template = '<needs-view-children #q></needs-view-children>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
@ -630,8 +629,8 @@ export function main() {
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template = '<needs-view-query #q><div text="ignoreme"></div></needs-view-query>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
var q: NeedsViewQuery = view.debugElement.children[0].references["q"];
@ -647,8 +646,8 @@ export function main() {
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template = '<needs-view-query #q text="self"></needs-view-query>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
var q: NeedsViewQuery = view.debugElement.children[0].references["q"];
@ -664,8 +663,8 @@ export function main() {
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template = '<needs-view-query-if #q></needs-view-query-if>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
var q: NeedsViewQueryIf = view.debugElement.children[0].references["q"];
@ -687,8 +686,8 @@ export function main() {
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template = '<needs-view-query-nested-if #q></needs-view-query-nested-if>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
var q: NeedsViewQueryNestedIf = view.debugElement.children[0].references["q"];
@ -712,8 +711,8 @@ export function main() {
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template = '<needs-view-query-order #q></needs-view-query-order>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
var q: NeedsViewQueryOrder = view.debugElement.children[0].references["q"];
@ -735,8 +734,8 @@ export function main() {
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template = '<needs-view-query-order-with-p #q></needs-view-query-order-with-p>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
var q: NeedsViewQueryOrderWithParent =
view.debugElement.children[0].references["q"];
@ -759,8 +758,8 @@ export function main() {
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template = '<needs-view-query-order #q></needs-view-query-order>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
var q: NeedsViewQueryOrder = view.debugElement.children[0].references['q'];
@ -781,8 +780,8 @@ export function main() {
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
var template = '<needs-four-queries #q><div text="1"></div></needs-four-queries>';
tcb.overrideTemplate(MyComp, template)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp0, template)
.createAsync(MyComp0)
.then((view) => {
view.detectChanges();
@ -830,16 +829,16 @@ class NeedsContentChild implements AfterContentInit, AfterContentChecked {
@ContentChild(TextDirective)
set child(value) {
this._child = value;
this.log.push(['setter', isPresent(value) ? value.text : null]);
this.logs.push(['setter', isPresent(value) ? value.text : null]);
}
get child() { return this._child; }
log = [];
logs = [];
ngAfterContentInit() { this.log.push(["init", isPresent(this.child) ? this.child.text : null]); }
ngAfterContentInit() { this.logs.push(["init", isPresent(this.child) ? this.child.text : null]); }
ngAfterContentChecked() {
this.log.push(["check", isPresent(this.child) ? this.child.text : null]);
this.logs.push(["check", isPresent(this.child) ? this.child.text : null]);
}
}
@ -859,15 +858,15 @@ class NeedsViewChild implements AfterViewInit,
@ViewChild(TextDirective)
set child(value) {
this._child = value;
this.log.push(['setter', isPresent(value) ? value.text : null]);
this.logs.push(['setter', isPresent(value) ? value.text : null]);
}
get child() { return this._child; }
log = [];
logs = [];
ngAfterViewInit() { this.log.push(["init", isPresent(this.child) ? this.child.text : null]); }
ngAfterViewInit() { this.logs.push(["init", isPresent(this.child) ? this.child.text : null]); }
ngAfterViewChecked() { this.log.push(["check", isPresent(this.child) ? this.child.text : null]); }
ngAfterViewChecked() { this.logs.push(["check", isPresent(this.child) ? this.child.text : null]); }
}
@Directive({selector: '[dir]'})
@ -1119,7 +1118,7 @@ class NeedsViewContainerWithRead {
template: ''
})
@Injectable()
class MyComp {
class MyComp0 {
shouldShow: boolean;
list;
constructor() {

19
modules/@angular/core/test/linker/query_list_spec.ts
View File

@ -6,15 +6,16 @@ import {
ddescribe,
iit,
xit,
el,
} from '@angular/core/testing/testing_internal';
import {
fakeAsync,
tick
} from 'angular2/testing_internal';
import {MapWrapper, ListWrapper, iterateListLike} from 'angular2/src/facade/collection';
import {IS_DART, StringWrapper} from 'angular2/src/facade/lang';
import {ObservableWrapper} from 'angular2/src/facade/async';
import {QueryList} from 'angular2/src/core/linker/query_list';
import {DOM} from 'angular2/src/platform/dom/dom_adapter';
tick,
} from '@angular/core/testing';
import {MapWrapper, ListWrapper, iterateListLike} from '../../src/facade/collection';
import {IS_DART, StringWrapper} from '../../src/facade/lang';
import {ObservableWrapper} from '../../src/facade/async';
import {QueryList} from '@angular/core/src/linker/query_list';
import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
interface _JsQueryList {
filter(c: any): any;
@ -92,7 +93,7 @@ export function main() {
expect(queryList.last).toEqual('three');
});
if (DOM.supportsDOMEvents()) {
if (getDOM().supportsDOMEvents()) {
describe('simple observable interface', () => {
it('should fire callbacks on change', fakeAsync(() => {
var fires = 0;

12
modules/@angular/core/test/linker/reflector_component_resolver_spec.ts
View File

@ -8,18 +8,18 @@ import {
expect,
beforeEach,
afterEach,
AsyncTestCompleter,
inject,
beforeEachProviders
} from 'angular2/testing_internal';
} from '@angular/core/testing/testing_internal';
import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
import {provide} from 'angular2/core';
import {provide} from '@angular/core';
import {
ComponentResolver,
ReflectorComponentResolver
} from 'angular2/src/core/linker/component_resolver';
import {reflector, ReflectionInfo} from 'angular2/src/core/reflection/reflection';
import {ComponentFactory} from 'angular2/src/core/linker/component_factory';
} from '@angular/core/src/linker/component_resolver';
import {reflector, ReflectionInfo} from '@angular/core/src/reflection/reflection';
import {ComponentFactory} from '@angular/core/src/linker/component_factory';
export function main() {
describe('Compiler', () => {

48
modules/@angular/core/test/linker/regression_integration_spec.ts
View File

@ -1,27 +1,19 @@
import {
AsyncTestCompleter,
beforeEach,
ddescribe,
xdescribe,
describe,
el,
dispatchEvent,
expect,
iit,
inject,
beforeEachProviders,
it,
xit,
containsRegexp,
stringifyElement,
TestComponentBuilder,
fakeAsync,
tick,
clearPendingTimers,
ComponentFixture
} from 'angular2/testing_internal';
} from '@angular/core/testing/testing_internal';
import {TestComponentBuilder} from '@angular/compiler/testing';
import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
import {IS_DART} from 'angular2/src/facade/lang';
import {IS_DART} from '../../src/facade/lang';
import {
Component,
@ -32,9 +24,9 @@ import {
PLATFORM_PIPES,
OpaqueToken,
Injector
} from 'angular2/core';
import {NgIf, NgClass} from 'angular2/common';
import {CompilerConfig} from 'angular2/compiler';
} from '@angular/core';
import {NgIf, NgClass} from '@angular/common';
import {CompilerConfig} from '@angular/compiler';
export function main() {
if (IS_DART) {
@ -64,8 +56,8 @@ function declareTests(isJit: boolean) {
it('should overwrite them by custom pipes',
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
tcb.overrideView(
MyComp, new ViewMetadata({template: '{{true | somePipe}}', pipes: [CustomPipe]}))
.createAsync(MyComp)
MyComp1, new ViewMetadata({template: '{{true | somePipe}}', pipes: [CustomPipe]}))
.createAsync(MyComp1)
.then((fixture) => {
fixture.detectChanges();
expect(fixture.nativeElement).toHaveText('someCustomPipe');
@ -78,9 +70,9 @@ function declareTests(isJit: boolean) {
it('should evaluate conditional and boolean operators with right precedence - #8244',
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
tcb.overrideView(MyComp,
tcb.overrideView(MyComp1,
new ViewMetadata({template: `{{'red' + (true ? ' border' : '')}}`}))
.createAsync(MyComp)
.createAsync(MyComp1)
.then((fixture) => {
fixture.detectChanges();
expect(fixture.nativeElement).toHaveText('red border');
@ -92,8 +84,8 @@ function declareTests(isJit: boolean) {
it('should evaluate conditional and unary operators with right precedence - #8235',
inject([TestComponentBuilder, AsyncTestCompleter],
(tcb: TestComponentBuilder, async) => {
tcb.overrideView(MyComp, new ViewMetadata({template: `{{!null?.length}}`}))
.createAsync(MyComp)
tcb.overrideView(MyComp1, new ViewMetadata({template: `{{!null?.length}}`}))
.createAsync(MyComp1)
.then((fixture) => {
fixture.detectChanges();
expect(fixture.nativeElement).toHaveText('true');
@ -105,8 +97,8 @@ function declareTests(isJit: boolean) {
describe('providers', () => {
function createInjector(tcb: TestComponentBuilder, proviers: any[]): Promise<Injector> {
return tcb.overrideProviders(MyComp, [proviers])
.createAsync(MyComp)
return tcb.overrideProviders(MyComp1, [proviers])
.createAsync(MyComp1)
.then((fixture) => fixture.componentInstance.injector);
}
@ -162,8 +154,8 @@ function declareTests(isJit: boolean) {
it('should allow logging a previous elements class binding via interpolation',
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
tcb.overrideTemplate(MyComp, `<div [class.a]="true" #el>Class: {{el.className}}</div>`)
.createAsync(MyComp)
tcb.overrideTemplate(MyComp1, `<div [class.a]="true" #el>Class: {{el.className}}</div>`)
.createAsync(MyComp1)
.then((fixture) => {
fixture.detectChanges();
expect(fixture.nativeElement).toHaveText('Class: a');
@ -174,11 +166,11 @@ function declareTests(isJit: boolean) {
it('should support ngClass before a component and content projection inside of an ngIf',
inject([TestComponentBuilder, AsyncTestCompleter], (tcb: TestComponentBuilder, async) => {
tcb.overrideView(
MyComp, new ViewMetadata({
MyComp1, new ViewMetadata({
template: `A<cmp-content *ngIf="true" [ngClass]="'red'">B</cmp-content>C`,
directives: [NgClass, NgIf, CmpWithNgContent]
}))
.createAsync(MyComp)
.createAsync(MyComp1)
.then((fixture) => {
fixture.detectChanges();
expect(fixture.nativeElement).toHaveText('ABC');
@ -191,7 +183,7 @@ function declareTests(isJit: boolean) {
}
@Component({selector: 'my-comp', template: ''})
class MyComp {
class MyComp1 {
constructor(public injector: Injector) {}
}

33
modules/@angular/core/test/linker/view_injector_integration_spec.ts
View File

@ -9,16 +9,18 @@ import {
beforeEach,
beforeEachProviders,
inject,
AsyncTestCompleter,
el,
containsRegexp,
ComponentFixture,
TestComponentBuilder,
fakeAsync,
tick
} from 'angular2/testing_internal';
import {isBlank, isPresent, stringify, Type} from 'angular2/src/facade/lang';
} from '@angular/core/testing/testing_internal';
import {
fakeAsync,
flushMicrotasks,
Log,
tick,
containsRegexp
} from '@angular/core/testing';
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
import {isBlank} from '../../src/facade/lang';
import {
Type,
ViewContainerRef,
TemplateRef,
ElementRef,
@ -33,21 +35,16 @@ import {
Attribute,
ViewMetadata,
provide,
Injector,
Provider,
Optional,
Inject,
Injectable,
Self,
SkipSelf,
InjectMetadata,
Pipe,
Host,
HostMetadata,
SkipSelfMetadata
} from 'angular2/core';
import {NgIf} from 'angular2/common';
import {DOM} from 'angular2/src/platform/dom/dom_adapter';
} from '@angular/core';
import {NgIf} from '@angular/common';
import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
const ALL_DIRECTIVES = /*@ts2dart_const*/[
forwardRef(() => SimpleDirective),
@ -293,7 +290,7 @@ export function main() {
describe("View Injector", () => {
// On CJS fakeAsync is not supported...
if (!DOM.supportsDOMEvents()) return;
if (!getDOM().supportsDOMEvents()) return;
beforeEachProviders(() => [provide("appService", {useValue: 'appService'})]);