Skip to content

Commit c9632a8

Browse files
mheverymhevery
committed
WIP: refactoref for @angular/*/testing
1 parent 70f1d28 commit c9632a8

File tree

194 files changed

+973
-507
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+973
-507
lines changed

‎build.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ for PACKAGE in \
1515
platform-server \
1616
http \
1717
router \
18-
upgrade \
19-
testing
18+
upgrade
2019
do
2120
SRCDIR=./modules/@angular/${PACKAGE}
2221
DESTDIR=./dist/packages-dist/${PACKAGE}

‎modules/@angular/common/test/directives/ng_class_spec.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {
2-
AsyncTestCompleter,
32
beforeEach,
43
beforeEachProviders,
54
ddescribe,
@@ -10,11 +9,9 @@ import {
109
inject,
1110
it,
1211
xit,
13-
} from '@angular/core/testing/testing_internal';
14-
import {
15-
ComponentFixture,
16-
TestComponentBuilder
17-
} from '@angular/compiler/testing';
12+
} from '@angular/core/testing';
13+
import { ComponentFixture, TestComponentBuilder } from '@angular/compiler/testing';
14+
import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
1815
import {ListWrapper, StringMapWrapper, SetWrapper} from '../../src/facade/collection';
1916
import {Component, provide} from '@angular/core';
2017
import {NgFor, NgClass} from '@angular/common';

‎modules/@angular/common/test/directives/ng_for_spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {
2-
AsyncTestCompleter,
32
beforeEach,
43
beforeEachProviders,
54
ddescribe,
@@ -9,7 +8,8 @@ import {
98
inject,
109
it,
1110
xit,
12-
} from '@angular/core/testing/testing_internal';
11+
} from '@angular/core/testing';
12+
import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
1313
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
1414

1515
import {ListWrapper} from '../../src/facade/collection';

‎modules/@angular/common/test/directives/ng_if_spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {
2-
AsyncTestCompleter,
32
beforeEach,
43
ddescribe,
54
describe,
@@ -8,8 +7,9 @@ import {
87
inject,
98
it,
109
xit,
11-
} from '@angular/core/testing/testing_internal';
10+
} from '@angular/core/testing';
1211
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
12+
import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
1313

1414
import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
1515

‎modules/@angular/common/test/directives/ng_plural_spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {
2-
AsyncTestCompleter,
32
beforeEachProviders,
43
beforeEach,
54
ddescribe,
@@ -9,7 +8,8 @@ import {
98
inject,
109
it,
1110
xit,
12-
} from '@angular/core/testing/testing_internal';
11+
} from '@angular/core/testing';
12+
import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
1313
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
1414

1515
import {Component, Injectable, provide} from '@angular/core';

‎modules/@angular/common/test/directives/ng_style_spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {
2-
AsyncTestCompleter,
32
beforeEach,
43
beforeEachProviders,
54
ddescribe,
@@ -10,8 +9,9 @@ import {
109
inject,
1110
it,
1211
xit,
13-
} from '@angular/core/testing/testing_internal';
12+
} from '@angular/core/testing';
1413
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
14+
import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
1515

1616
import {StringMapWrapper} from '../../src/facade/collection';
1717

‎modules/@angular/common/test/directives/ng_switch_spec.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {
2-
AsyncTestCompleter,
32
beforeEach,
43
ddescribe,
54
describe,
@@ -8,8 +7,8 @@ import {
87
inject,
98
it,
109
xit,
11-
} from '@angular/core/testing/testing_internal';
12-
10+
} from '@angular/core/testing';
11+
import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
1312
import {Component} from '@angular/core';
1413
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
1514

‎modules/@angular/common/test/directives/ng_template_outlet_spec.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {
2-
AsyncTestCompleter,
32
beforeEach,
43
ddescribe,
54
describe,
@@ -8,11 +7,10 @@ import {
87
inject,
98
it,
109
xit,
11-
} from '@angular/core/testing/testing_internal';
10+
} from '@angular/core/testing';
1211
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
13-
12+
import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
1413
import {Component, Directive, TemplateRef, ContentChildren, QueryList} from '@angular/core';
15-
1614
import {NgTemplateOutlet} from '@angular/common';
1715

1816
export function main() {

‎modules/@angular/common/test/directives/non_bindable_spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {
2-
AsyncTestCompleter,
32
beforeEach,
43
ddescribe,
54
describe,
@@ -8,11 +7,12 @@ import {
87
inject,
98
it,
109
xit,
11-
} from '@angular/core/testing/testing_internal';
10+
} from '@angular/core/testing';
1211
import {TestComponentBuilder, ComponentFixture} from '@angular/compiler/testing';
1312
import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
1413
import {Component, Directive} from '@angular/core';
1514
import {ElementRef} from '@angular/core/src/linker/element_ref';
15+
import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
1616

1717
export function main() {
1818
describe('non-bindable', () => {

‎modules/@angular/common/test/forms/directives_spec.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ import {
77
expect,
88
beforeEach,
99
afterEach,
10-
AsyncTestCompleter,
1110
inject,
12-
} from '@angular/core/testing/testing_internal';
13-
import {
1411
fakeAsync,
1512
flushMicrotasks,
1613
Log,
@@ -71,7 +68,7 @@ function asyncValidator(expected, timeout = 0) {
7168

7269
export function main() {
7370
describe("Form Directives", () => {
74-
var defaultAccessor;
71+
var defaultAccessor: DefaultValueAccessor;
7572

7673
beforeEach(() => { defaultAccessor = new DefaultValueAccessor(null, null); });
7774

@@ -108,7 +105,7 @@ export function main() {
108105
it("should return custom accessor when provided", () => {
109106
var customAccessor = new SpyValueAccessor();
110107
var checkboxAccessor = new CheckboxControlValueAccessor(null, null);
111-
expect(selectValueAccessor(dir, [defaultAccessor, customAccessor, checkboxAccessor]))
108+
expect(selectValueAccessor(dir, <any>[defaultAccessor, customAccessor, checkboxAccessor]))
112109
.toEqual(customAccessor);
113110
});
114111

0 commit comments

Comments
 (0)