Skip to content

Commit fa67dee

Browse files
jelbournjelbourn
authored
chore: remove TestComponentBuilder from button through input (#1005)
1 parent df20a28 commit fa67dee

File tree

7 files changed

+1340
-1531
lines changed

7 files changed

+1340
-1531
lines changed

‎src/components/button-toggle/button-toggle.spec.ts‎

Lines changed: 59 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import {
2-
inject,
32
async,
43
fakeAsync,
54
tick,
6-
TestComponentBuilder,
75
ComponentFixture,
86
TestBed,
97
} from '@angular/core/testing';
@@ -19,7 +17,6 @@ import {
1917

2018

2119
describe('MdButtonToggle', () => {
22-
let builder: TestComponentBuilder;
2320

2421
beforeEach(async(() => {
2522
TestBed.configureTestingModule({
@@ -36,10 +33,6 @@ describe('MdButtonToggle', () => {
3633
TestBed.compileComponents();
3734
}));
3835

39-
beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
40-
builder = tcb;
41-
}));
42-
4336
describe('inside of an exclusive selection group', () => {
4437

4538
let fixture: ComponentFixture<ButtonTogglesInsideButtonToggleGroup>;
@@ -53,26 +46,24 @@ describe('MdButtonToggle', () => {
5346
let testComponent: ButtonTogglesInsideButtonToggleGroup;
5447

5548
beforeEach(async(() => {
56-
builder.createAsync(ButtonTogglesInsideButtonToggleGroup).then(f => {
57-
fixture = f;
58-
fixture.detectChanges();
49+
fixture = TestBed.createComponent(ButtonTogglesInsideButtonToggleGroup);
50+
fixture.detectChanges();
5951

60-
testComponent = fixture.debugElement.componentInstance;
52+
testComponent = fixture.debugElement.componentInstance;
6153

62-
groupDebugElement = fixture.debugElement.query(By.directive(MdButtonToggleGroup));
63-
groupNativeElement = groupDebugElement.nativeElement;
64-
groupInstance = groupDebugElement.injector.get(MdButtonToggleGroup);
54+
groupDebugElement = fixture.debugElement.query(By.directive(MdButtonToggleGroup));
55+
groupNativeElement = groupDebugElement.nativeElement;
56+
groupInstance = groupDebugElement.injector.get(MdButtonToggleGroup);
6557

66-
buttonToggleDebugElements = fixture.debugElement.queryAll(By.directive(MdButtonToggle));
58+
buttonToggleDebugElements = fixture.debugElement.queryAll(By.directive(MdButtonToggle));
6759

68-
buttonToggleNativeElements = buttonToggleDebugElements
69-
.map(debugEl => debugEl.nativeElement);
60+
buttonToggleNativeElements = buttonToggleDebugElements
61+
.map(debugEl => debugEl.nativeElement);
7062

71-
buttonToggleLabelElements = fixture.debugElement.queryAll(By.css('label'))
72-
.map(debugEl => debugEl.nativeElement);
63+
buttonToggleLabelElements = fixture.debugElement.queryAll(By.css('label'))
64+
.map(debugEl => debugEl.nativeElement);
7365

74-
buttonToggleInstances = buttonToggleDebugElements.map(debugEl => debugEl.componentInstance);
75-
});
66+
buttonToggleInstances = buttonToggleDebugElements.map(debugEl => debugEl.componentInstance);
7667
}));
7768

7869
it('should set individual button toggle names based on the group name', () => {
@@ -215,22 +206,20 @@ describe('MdButtonToggle', () => {
215206
let groupNgControl: NgControl;
216207

217208
beforeEach(async(() => {
218-
builder.createAsync(ButtonToggleGroupWithNgModel).then(f => {
219-
fixture = f;
220-
fixture.detectChanges();
221-
222-
testComponent = fixture.debugElement.componentInstance;
223-
224-
groupDebugElement = fixture.debugElement.query(By.directive(MdButtonToggleGroup));
225-
groupNativeElement = groupDebugElement.nativeElement;
226-
groupInstance = groupDebugElement.injector.get(MdButtonToggleGroup);
227-
groupNgControl = groupDebugElement.injector.get(NgControl);
228-
229-
buttonToggleDebugElements = fixture.debugElement.queryAll(By.directive(MdButtonToggle));
230-
buttonToggleNativeElements =
231-
buttonToggleDebugElements.map(debugEl => debugEl.nativeElement);
232-
buttonToggleInstances = buttonToggleDebugElements.map(debugEl => debugEl.componentInstance);
233-
});
209+
fixture = TestBed.createComponent(ButtonToggleGroupWithNgModel);
210+
fixture.detectChanges();
211+
212+
testComponent = fixture.debugElement.componentInstance;
213+
214+
groupDebugElement = fixture.debugElement.query(By.directive(MdButtonToggleGroup));
215+
groupNativeElement = groupDebugElement.nativeElement;
216+
groupInstance = groupDebugElement.injector.get(MdButtonToggleGroup);
217+
groupNgControl = groupDebugElement.injector.get(NgControl);
218+
219+
buttonToggleDebugElements = fixture.debugElement.queryAll(By.directive(MdButtonToggle));
220+
buttonToggleNativeElements =
221+
buttonToggleDebugElements.map(debugEl => debugEl.nativeElement);
222+
buttonToggleInstances = buttonToggleDebugElements.map(debugEl => debugEl.componentInstance);
234223
}));
235224

236225
it('should set individual radio names based on the group name', () => {
@@ -303,23 +292,21 @@ describe('MdButtonToggle', () => {
303292
let groupNgControl: NgControl;
304293

305294
beforeEach(async(() => {
306-
builder.createAsync(ButtonToggleGroupWithNgModel).then(f => {
307-
fixture = f;
295+
fixture = TestBed.createComponent(ButtonToggleGroupWithNgModel);
308296

309-
testComponent = fixture.debugElement.componentInstance;
297+
testComponent = fixture.debugElement.componentInstance;
310298

311-
groupDebugElement = fixture.debugElement.query(By.directive(MdButtonToggleGroup));
312-
groupNativeElement = groupDebugElement.nativeElement;
313-
groupInstance = groupDebugElement.injector.get(MdButtonToggleGroup);
314-
groupNgControl = groupDebugElement.injector.get(NgControl);
299+
groupDebugElement = fixture.debugElement.query(By.directive(MdButtonToggleGroup));
300+
groupNativeElement = groupDebugElement.nativeElement;
301+
groupInstance = groupDebugElement.injector.get(MdButtonToggleGroup);
302+
groupNgControl = groupDebugElement.injector.get(NgControl);
315303

316-
buttonToggleDebugElements = fixture.debugElement.queryAll(By.directive(MdButtonToggle));
317-
buttonToggleNativeElements =
318-
buttonToggleDebugElements.map(debugEl => debugEl.nativeElement);
319-
buttonToggleInstances = buttonToggleDebugElements.map(debugEl => debugEl.componentInstance);
304+
buttonToggleDebugElements = fixture.debugElement.queryAll(By.directive(MdButtonToggle));
305+
buttonToggleNativeElements =
306+
buttonToggleDebugElements.map(debugEl => debugEl.nativeElement);
307+
buttonToggleInstances = buttonToggleDebugElements.map(debugEl => debugEl.componentInstance);
320308

321-
fixture.detectChanges();
322-
});
309+
fixture.detectChanges();
323310
}));
324311

325312
it('should update the model before firing change event', fakeAsync(() => {
@@ -347,23 +334,21 @@ describe('MdButtonToggle', () => {
347334
let testComponent: ButtonTogglesInsideButtonToggleGroupMultiple;
348335

349336
beforeEach(async(() => {
350-
builder.createAsync(ButtonTogglesInsideButtonToggleGroupMultiple).then(f => {
351-
fixture = f;
352-
fixture.detectChanges();
353-
354-
testComponent = fixture.debugElement.componentInstance;
355-
356-
groupDebugElement = fixture.debugElement.query(By.directive(MdButtonToggleGroupMultiple));
357-
groupNativeElement = groupDebugElement.nativeElement;
358-
groupInstance = groupDebugElement.injector.get(MdButtonToggleGroupMultiple);
359-
360-
buttonToggleDebugElements = fixture.debugElement.queryAll(By.directive(MdButtonToggle));
361-
buttonToggleNativeElements = buttonToggleDebugElements
362-
.map(debugEl => debugEl.nativeElement);
363-
buttonToggleLabelElements = fixture.debugElement.queryAll(By.css('label'))
364-
.map(debugEl => debugEl.nativeElement);
365-
buttonToggleInstances = buttonToggleDebugElements.map(debugEl => debugEl.componentInstance);
366-
});
337+
fixture = TestBed.createComponent(ButtonTogglesInsideButtonToggleGroupMultiple);
338+
fixture.detectChanges();
339+
340+
testComponent = fixture.debugElement.componentInstance;
341+
342+
groupDebugElement = fixture.debugElement.query(By.directive(MdButtonToggleGroupMultiple));
343+
groupNativeElement = groupDebugElement.nativeElement;
344+
groupInstance = groupDebugElement.injector.get(MdButtonToggleGroupMultiple);
345+
346+
buttonToggleDebugElements = fixture.debugElement.queryAll(By.directive(MdButtonToggle));
347+
buttonToggleNativeElements = buttonToggleDebugElements
348+
.map(debugEl => debugEl.nativeElement);
349+
buttonToggleLabelElements = fixture.debugElement.queryAll(By.css('label'))
350+
.map(debugEl => debugEl.nativeElement);
351+
buttonToggleInstances = buttonToggleDebugElements.map(debugEl => debugEl.componentInstance);
367352
}));
368353

369354
it('should disable click interactions when the group is disabled', () => {
@@ -446,17 +431,15 @@ describe('MdButtonToggle', () => {
446431
let testComponent: StandaloneButtonToggle;
447432

448433
beforeEach(async(() => {
449-
builder.createAsync(StandaloneButtonToggle).then(f => {
450-
fixture = f;
451-
fixture.detectChanges();
434+
fixture = TestBed.createComponent(StandaloneButtonToggle);
435+
fixture.detectChanges();
452436

453-
testComponent = fixture.debugElement.componentInstance;
437+
testComponent = fixture.debugElement.componentInstance;
454438

455-
buttonToggleDebugElement = fixture.debugElement.query(By.directive(MdButtonToggle));
456-
buttonToggleNativeElement = buttonToggleDebugElement.nativeElement;
457-
buttonToggleLabelElement = fixture.debugElement.query(By.css('label')).nativeElement;
458-
buttonToggleInstance = buttonToggleDebugElement.componentInstance;
459-
});
439+
buttonToggleDebugElement = fixture.debugElement.query(By.directive(MdButtonToggle));
440+
buttonToggleNativeElement = buttonToggleDebugElement.nativeElement;
441+
buttonToggleLabelElement = fixture.debugElement.query(By.css('label')).nativeElement;
442+
buttonToggleInstance = buttonToggleDebugElement.componentInstance;
460443
}));
461444

462445
it('should toggle when clicked', () => {

0 commit comments

Comments
 (0)