Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit 78c7d26

Browse files
FoxandxssFoxandxss
committed
chore: update testing example to RC4
1 parent d1dd2b8 commit 78c7d26

File tree

6 files changed

+100
-116
lines changed

6 files changed

+100
-116
lines changed

‎public/docs/_examples/testing/ts/app/app.component.spec.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@ import { By } from '@angular/platform-browser';
55
import { DebugElement } from '@angular/core';
66

77
import {
8-
beforeEach, beforeEachProviders,
9-
describe, ddescribe, xdescribe,
10-
expect, it, iit, xit,
11-
async, inject
8+
beforeEach, async, inject
129
} from '@angular/core/testing';
1310

14-
import { ComponentFixture, TestComponentBuilder } from '@angular/compiler/testing';
11+
import { ComponentFixture, TestComponentBuilder } from '@angular/core/testing';
1512

1613
import { Hero, HeroService, MockHeroService } from './mock-hero.service';
1714

@@ -45,7 +42,7 @@ describe('AppComponent', () => {
4542
it('can get title from template', () => {
4643
fixture.detectChanges();
4744
let titleEl = fixture.debugElement.query(By.css('h1')).nativeElement;
48-
expect(titleEl).toHaveText(comp.title);
45+
expect(titleEl.textContent).toContain(comp.title);
4946
});
5047

5148
it('can get RouterLinks from template', () => {

‎public/docs/_examples/testing/ts/app/bad-tests.spec.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@ import { DebugElement } from '@angular/core';
1919
import { By } from '@angular/platform-browser';
2020

2121
import {
22-
beforeEach, beforeEachProviders,
23-
describe, ddescribe, xdescribe,
24-
expect, it, iit, xit,
22+
beforeEach, addProviders,
2523
async, inject
2624
} from '@angular/core/testing';
2725

28-
import { ComponentFixture, TestComponentBuilder } from '@angular/compiler/testing';
26+
import { ComponentFixture, TestComponentBuilder } from '@angular/core/testing';
2927

3028
import { ViewMetadata } from '@angular/core';
3129
import { Observable } from 'rxjs/Rx';
@@ -143,20 +141,20 @@ xdescribe('async & inject testing errors', () => {
143141
restoreJasmineIt();
144142
}, 10000);
145143

146-
describe('using beforeEachProviders', () => {
147-
beforeEachProviders(() => [{ provide: FancyService, useValue: new FancyService() }]);
144+
describe('using addProviders', () => {
145+
addProviders([{ provide: FancyService, useValue: new FancyService() }]);
148146

149147
beforeEach(
150148
inject([FancyService], (service: FancyService) => { expect(service.value).toEqual('real value'); }));
151149

152-
describe('nested beforeEachProviders', () => {
150+
describe('nested addProviders', () => {
153151

154152
it('should fail when the injector has already been used', () => {
155153
patchJasmineBeforeEach();
156154
expect(() => {
157-
beforeEachProviders(() => [{ provide: FancyService, useValue: new FancyService() }]);
155+
addProviders([{ provide: FancyService, useValue: new FancyService() }]);
158156
})
159-
.toThrowError('beforeEachProviders was called after the injector had been used ' +
157+
.toThrowError('addProviders was called after the injector had been used ' +
160158
'in a beforeEach or it block. This invalidates the test injector');
161159
restoreJasmineBeforeEach();
162160
});

‎public/docs/_examples/testing/ts/app/bag.spec.ts

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Based on https://github.com/angular/angular/blob/master/modules/angular2/test/testing/testing_public_spec.ts
22
/* tslint:disable */
33
import {
4-
BadTemplateUrl, ButtonComp,
4+
ButtonComp,
55
ChildChildComp, ChildComp, ChildWithChildComp,
66
ExternalTemplateComp,
77
FancyService, MockFancyService,
@@ -16,14 +16,12 @@ import { DebugElement } from '@angular/core';
1616
import { By } from '@angular/platform-browser';
1717

1818
import {
19-
beforeEach, beforeEachProviders,
20-
describe, ddescribe, xdescribe,
21-
expect, it, iit, xit,
22-
async, inject,
19+
beforeEach, addProviders,
20+
inject, async,
2321
fakeAsync, tick, withProviders
2422
} from '@angular/core/testing';
2523

26-
import { ComponentFixture, TestComponentBuilder } from '@angular/compiler/testing';
24+
import { ComponentFixture, TestComponentBuilder } from '@angular/core/testing';
2725

2826
import { ViewMetadata } from '@angular/core';
2927

@@ -33,44 +31,44 @@ import { Observable } from 'rxjs/Rx';
3331

3432
/// Verify can use Angular testing's DOM abstraction to access DOM
3533

36-
describe('angular2 jasmine matchers', () => {
37-
describe('toHaveCssClass', () => {
38-
it('should assert that the CSS class is present', () => {
39-
let el = document.createElement('div');
40-
el.classList.add('bombasto');
41-
expect(el).toHaveCssClass('bombasto');
42-
});
43-
44-
it('should assert that the CSS class is not present', () => {
45-
let el = document.createElement('div');
46-
el.classList.add('bombasto');
47-
expect(el).not.toHaveCssClass('fatias');
48-
});
49-
});
50-
51-
describe('toHaveCssStyle', () => {
52-
it('should assert that the CSS style is present', () => {
53-
let el = document.createElement('div');
54-
expect(el).not.toHaveCssStyle('width');
55-
56-
el.style.setProperty('width', '100px');
57-
expect(el).toHaveCssStyle('width');
58-
});
59-
60-
it('should assert that the styles are matched against the element', () => {
61-
let el = document.createElement('div');
62-
expect(el).not.toHaveCssStyle({width: '100px', height: '555px'});
63-
64-
el.style.setProperty('width', '100px');
65-
expect(el).toHaveCssStyle({width: '100px'});
66-
expect(el).not.toHaveCssStyle({width: '100px', height: '555px'});
67-
68-
el.style.setProperty('height', '555px');
69-
expect(el).toHaveCssStyle({height: '555px'});
70-
expect(el).toHaveCssStyle({width: '100px', height: '555px'});
71-
});
72-
});
73-
});
34+
// describe('angular2 jasmine matchers', () => {
35+
// describe('toHaveCssClass', () => {
36+
// it('should assert that the CSS class is present', () => {
37+
// let el = document.createElement('div');
38+
// el.classList.add('bombasto');
39+
// expect(el).toHaveCssClass('bombasto');
40+
// });
41+
42+
// it('should assert that the CSS class is not present', () => {
43+
// let el = document.createElement('div');
44+
// el.classList.add('bombasto');
45+
// expect(el).not.toHaveCssClass('fatias');
46+
// });
47+
// });
48+
49+
// fdescribe('toHaveCssStyle', () => {
50+
// fit('should assert that the CSS style is present', () => {
51+
// let el = document.createElement('div');
52+
// expect(el).not.toHaveCssStyle('width');
53+
54+
// el.style.setProperty('width', '100px');
55+
// expect(el).toHaveCssStyle('width');
56+
// });
57+
58+
// it('should assert that the styles are matched against the element', () => {
59+
// let el = document.createElement('div');
60+
// expect(el).not.toHaveCssStyle({width: '100px', height: '555px'});
61+
62+
// el.style.setProperty('width', '100px');
63+
// expect(el).toHaveCssStyle({width: '100px'});
64+
// expect(el).not.toHaveCssStyle({width: '100px', height: '555px'});
65+
66+
// el.style.setProperty('height', '555px');
67+
// expect(el).toHaveCssStyle({height: '555px'});
68+
// expect(el).toHaveCssStyle({width: '100px', height: '555px'});
69+
// });
70+
// });
71+
// });
7472

7573
describe('using the async helper', () => {
7674
let actuallyDone = false;
@@ -101,22 +99,24 @@ describe('using the async helper', () => {
10199
p.catch(() => { actuallyDone = true; });
102100
}));
103101

104-
it('should run async test with successful Observable', async(() => {
105-
let source = Observable.of(true).delay(10);
106-
source.subscribe(
107-
val => {},
108-
err => fail(err),
109-
() => { actuallyDone = true; } // completed
110-
);
111-
}));
102+
// it('should run async test with successful Observable', async(() => {
103+
// let source = Observable.of(true).delay(10);
104+
// source.subscribe(
105+
// val => {},
106+
// err => fail(err),
107+
// () => { actuallyDone = true; } // completed
108+
// );
109+
// }));
112110
});
113111

114112
describe('using the test injector with the inject helper', () => {
115113

116114
describe('setting up Providers with FancyService', () => {
117-
beforeEachProviders(() => [
118-
{ provide: FancyService, useValue: new FancyService() }
119-
]);
115+
beforeEach(() => {
116+
addProviders([
117+
{ provide: FancyService, useValue: new FancyService() }
118+
]);
119+
});
120120

121121
it('should use FancyService',
122122
inject([FancyService], (service: FancyService) => {
@@ -142,12 +142,12 @@ describe('using the test injector with the inject helper', () => {
142142
);
143143
})));
144144

145-
it('test should wait for FancyService.getObservableDelayValue',
146-
async(inject([FancyService], (service: FancyService) => {
147-
service.getObservableDelayValue().subscribe(
148-
value => { expect(value).toEqual('observable delay value'); }
149-
);
150-
})));
145+
// it('test should wait for FancyService.getObservableDelayValue',
146+
// async(inject([FancyService], (service: FancyService) => {
147+
// service.getObservableDelayValue().subscribe(
148+
// value => { expect(value).toEqual('observable delay value'); }
149+
// );
150+
// })));
151151

152152
it('should allow the use of fakeAsync (Experimental)',
153153
fakeAsync(inject([FancyService], (service: FancyService) => {
@@ -197,7 +197,7 @@ describe('test component builder', function() {
197197

198198
tcb.createAsync(ChildComp).then(fixture => {
199199
fixture.detectChanges();
200-
expect(fixture.nativeElement).toHaveText('Original Child');
200+
expect(fixture.nativeElement.textContent).toContain('Original Child');
201201
});
202202
})));
203203

@@ -206,11 +206,11 @@ describe('test component builder', function() {
206206

207207
tcb.createAsync(MyIfComp).then(fixture => {
208208
fixture.detectChanges();
209-
expect(fixture.nativeElement).toHaveText('MyIf()');
209+
expect(fixture.nativeElement.textContent).toContain('MyIf()');
210210

211211
fixture.debugElement.componentInstance.showMore = true;
212212
fixture.detectChanges();
213-
expect(fixture.nativeElement).toHaveText('MyIf(More)');
213+
expect(fixture.nativeElement.textContent).toContain('MyIf(More)');
214214
});
215215
})));
216216

@@ -262,7 +262,7 @@ describe('test component builder', function() {
262262
.createAsync(MockChildComp)
263263
.then(fixture => {
264264
fixture.detectChanges();
265-
expect(fixture.nativeElement).toHaveText('Mock');
265+
expect(fixture.nativeElement.textContent).toContain('Mock');
266266
});
267267
})));
268268

@@ -276,7 +276,7 @@ describe('test component builder', function() {
276276
.createAsync(ChildComp)
277277
.then(fixture => {
278278
fixture.detectChanges();
279-
expect(fixture.nativeElement).toHaveText('Modified Child');
279+
expect(fixture.nativeElement.textContent).toContain('Modified Child');
280280

281281
});
282282
})));
@@ -288,7 +288,7 @@ describe('test component builder', function() {
288288
.createAsync(ParentComp)
289289
.then(fixture => {
290290
fixture.detectChanges();
291-
expect(fixture.nativeElement).toHaveText('Parent(Mock)');
291+
expect(fixture.nativeElement.textContent).toContain('Parent(Mock)');
292292

293293
});
294294
})));
@@ -302,8 +302,8 @@ describe('test component builder', function() {
302302
.createAsync(ParentComp)
303303
.then(fixture => {
304304
fixture.detectChanges();
305-
expect(fixture.nativeElement)
306-
.toHaveText('Parent(Original Child(ChildChild Mock))');
305+
expect(fixture.nativeElement.textContent)
306+
.toContain('Parent(Original Child(ChildChild Mock))');
307307

308308
});
309309
})));
@@ -318,8 +318,8 @@ describe('test component builder', function() {
318318
.createAsync(TestProvidersComp)
319319
.then(fixture => {
320320
fixture.detectChanges();
321-
expect(fixture.nativeElement)
322-
.toHaveText('injected value: mocked out value');
321+
expect(fixture.nativeElement.textContent)
322+
.toContain('injected value: mocked out value');
323323
});
324324
})));
325325

@@ -333,8 +333,8 @@ describe('test component builder', function() {
333333
.createAsync(TestViewProvidersComp)
334334
.then(fixture => {
335335
fixture.detectChanges();
336-
expect(fixture.nativeElement)
337-
.toHaveText('injected value: mocked out value');
336+
expect(fixture.nativeElement.textContent)
337+
.toContain('injected value: mocked out value');
338338
});
339339
})));
340340

@@ -344,8 +344,8 @@ describe('test component builder', function() {
344344
tcb.createAsync(ExternalTemplateComp)
345345
.then(fixture => {
346346
fixture.detectChanges();
347-
expect(fixture.nativeElement)
348-
.toHaveText('from external template\n');
347+
expect(fixture.nativeElement.textContent)
348+
.toContain('from external template\n');
349349
});
350350
})), 10000); // Long timeout because this test makes an actual XHR.
351351

‎public/docs/_examples/testing/ts/app/dashboard.component.spec.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@ import { DashboardComponent } from './dashboard.component';
44
import { By } from '@angular/platform-browser';
55

66
import {
7-
beforeEach, beforeEachProviders,
8-
describe, ddescribe, xdescribe,
9-
expect, it, iit, xit,
7+
beforeEach, addProviders,
108
async, inject
119
} from '@angular/core/testing';
1210

13-
import { ComponentFixture, TestComponentBuilder } from '@angular/compiler/testing';
11+
import { ComponentFixture, TestComponentBuilder } from '@angular/core/testing';
1412

1513
import { Hero, HeroService, MockHeroService } from './mock-hero.service';
1614
import { Router, MockRouter } from './mock-router';
@@ -70,13 +68,13 @@ describe('DashboardComponent', () => {
7068
let comp: DashboardComponent;
7169
let mockHeroService: MockHeroService;
7270

73-
beforeEachProviders(() => {
71+
beforeEach(() => {
7472
mockHeroService = new MockHeroService();
75-
return [
73+
addProviders([
7674
{ provide: Router, useClass: MockRouter},
7775
{ provide: MockRouter, useExisting: Router},
7876
{ provide: HeroService, useValue: mockHeroService }
79-
];
77+
]);
8078
});
8179

8280
it('can instantiate it',
@@ -138,8 +136,8 @@ describe('DashboardComponent', () => {
138136
expect(heroNames.length).toEqual(4, 'should display 4 heroes');
139137

140138
// the 4th displayed hero should be the 5th mock hero
141-
expect(heroNames[3].nativeElement)
142-
.toHaveText(mockHeroService.mockHeroes[4].name);
139+
expect(heroNames[3].nativeElement.textContent)
140+
.toContain(mockHeroService.mockHeroes[4].name);
143141
});
144142

145143
});

‎public/docs/_examples/testing/ts/app/expect-proper.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)