Skip to content

Commit b1363e9

Browse files
authored
chore(progress-bar): remove TestComponentBuilder (#1008)
1 parent eaa9a01 commit b1363e9

File tree

1 file changed

+81
-104
lines changed

1 file changed

+81
-104
lines changed
Lines changed: 81 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,135 +1,112 @@
1-
import {
2-
inject,
3-
TestComponentBuilder,
4-
TestBed,
5-
async,
6-
} from '@angular/core/testing';
1+
import {TestBed, async, ComponentFixture} from '@angular/core/testing';
72
import {Component} from '@angular/core';
83
import {By} from '@angular/platform-browser';
94
import {MdProgressBarModule} from './progress-bar';
105

116

127
describe('MdProgressBar', () => {
13-
let builder: TestComponentBuilder;
148

159
beforeEach(async(() => {
1610
TestBed.configureTestingModule({
1711
imports: [MdProgressBarModule],
18-
declarations: [TestApp],
12+
declarations: [
13+
BasicProgressBar,
14+
BufferProgressBar,
15+
],
1916
});
2017

2118
TestBed.compileComponents();
2219
}));
2320

24-
beforeEach(inject([TestComponentBuilder], (tcb: TestComponentBuilder) => {
25-
builder = tcb;
26-
}));
2721

28-
it('should apply a mode of "determinate" if no mode is provided.', (done: () => void) => {
29-
builder
30-
.overrideTemplate(TestApp, '<md-progress-bar></md-progress-bar>')
31-
.createAsync(TestApp)
32-
.then((fixture) => {
33-
fixture.detectChanges();
34-
let progressElement = fixture.debugElement.query(By.css('md-progress-bar'));
35-
expect(progressElement.componentInstance.mode).toBe('determinate');
36-
done();
37-
});
38-
});
22+
describe('basic progress-bar', () => {
23+
let fixture: ComponentFixture<BasicProgressBar>;
3924

40-
it('should not modify the mode if a valid mode is provided.', (done: () => void) => {
41-
builder
42-
.overrideTemplate(TestApp, '<md-progress-bar mode="buffer"></md-progress-bar>')
43-
.createAsync(TestApp)
44-
.then((fixture) => {
45-
fixture.detectChanges();
46-
let progressElement = fixture.debugElement.query(By.css('md-progress-bar'));
47-
expect(progressElement.componentInstance.mode).toBe('buffer');
48-
done();
49-
});
50-
});
25+
beforeEach(() => {
26+
fixture = TestBed.createComponent(BasicProgressBar);
27+
fixture.detectChanges();
28+
});
5129

52-
it('should define default values for value and bufferValue attributes', (done: () => void) => {
53-
builder
54-
.overrideTemplate(TestApp, '<md-progress-bar></md-progress-bar>')
55-
.createAsync(TestApp)
56-
.then((fixture) => {
57-
fixture.detectChanges();
58-
let progressElement = fixture.debugElement.query(By.css('md-progress-bar'));
59-
expect(progressElement.componentInstance.value).toBe(0);
60-
expect(progressElement.componentInstance.bufferValue).toBe(0);
61-
done();
62-
});
63-
});
30+
it('should apply a mode of "determinate" if no mode is provided.', () => {
31+
let progressElement = fixture.debugElement.query(By.css('md-progress-bar'));
32+
expect(progressElement.componentInstance.mode).toBe('determinate');
33+
});
34+
35+
it('should define default values for value and bufferValue attributes', () => {
36+
let progressElement = fixture.debugElement.query(By.css('md-progress-bar'));
37+
expect(progressElement.componentInstance.value).toBe(0);
38+
expect(progressElement.componentInstance.bufferValue).toBe(0);
39+
});
40+
41+
it('should clamp value and bufferValue between 0 and 100', () => {
42+
let progressElement = fixture.debugElement.query(By.css('md-progress-bar'));
43+
let progressComponent = progressElement.componentInstance;
44+
45+
progressComponent.value = 50;
46+
expect(progressComponent.value).toBe(50);
47+
48+
progressComponent.value = 999;
49+
expect(progressComponent.value).toBe(100);
6450

65-
it('should clamp value and bufferValue between 0 and 100', (done: () => void) => {
66-
builder
67-
.overrideTemplate(TestApp, '<md-progress-bar></md-progress-bar>')
68-
.createAsync(TestApp)
69-
.then((fixture) => {
70-
fixture.detectChanges();
71-
let progressElement = fixture.debugElement.query(By.css('md-progress-bar'));
72-
let progressComponent = progressElement.componentInstance;
51+
progressComponent.value = -10;
52+
expect(progressComponent.value).toBe(0);
7353

74-
progressComponent.value = 50;
75-
expect(progressComponent.value).toBe(50);
54+
progressComponent.bufferValue = -29;
55+
expect(progressComponent.bufferValue).toBe(0);
7656

77-
progressComponent.value = 999;
78-
expect(progressComponent.value).toBe(100);
57+
progressComponent.bufferValue = 9;
58+
expect(progressComponent.bufferValue).toBe(9);
7959

80-
progressComponent.value = -10;
81-
expect(progressComponent.value).toBe(0);
60+
progressComponent.bufferValue = 1320;
61+
expect(progressComponent.bufferValue).toBe(100);
62+
});
63+
64+
it('should return the transform attribute for bufferValue and mode', () => {
65+
let progressElement = fixture.debugElement.query(By.css('md-progress-bar'));
66+
let progressComponent = progressElement.componentInstance;
67+
68+
expect(progressComponent._primaryTransform()).toEqual({transform: 'scaleX(0)'});
69+
expect(progressComponent._bufferTransform()).toBe(undefined);
8270

83-
progressComponent.bufferValue = -29;
84-
expect(progressComponent.bufferValue).toBe(0);
71+
progressComponent.value = 40;
72+
expect(progressComponent._primaryTransform()).toEqual({transform: 'scaleX(0.4)'});
73+
expect(progressComponent._bufferTransform()).toBe(undefined);
8574

86-
progressComponent.bufferValue = 9;
87-
expect(progressComponent.bufferValue).toBe(9);
75+
progressComponent.value = 35;
76+
progressComponent.bufferValue = 55;
77+
expect(progressComponent._primaryTransform()).toEqual({transform: 'scaleX(0.35)'});
78+
expect(progressComponent._bufferTransform()).toBe(undefined);
8879

89-
progressComponent.bufferValue = 1320;
90-
expect(progressComponent.bufferValue).toBe(100);
91-
done();
92-
});
80+
progressComponent.mode = 'buffer';
81+
expect(progressComponent._primaryTransform()).toEqual({transform: 'scaleX(0.35)'});
82+
expect(progressComponent._bufferTransform()).toEqual({transform: 'scaleX(0.55)'});
83+
84+
85+
progressComponent.value = 60;
86+
progressComponent.bufferValue = 60;
87+
expect(progressComponent._primaryTransform()).toEqual({transform: 'scaleX(0.6)'});
88+
expect(progressComponent._bufferTransform()).toEqual({transform: 'scaleX(0.6)'});
89+
});
9390
});
9491

95-
it('should return the transform attribute for bufferValue and mode', (done: () => void) => {
96-
builder
97-
.overrideTemplate(TestApp, '<md-progress-bar></md-progress-bar>')
98-
.createAsync(TestApp)
99-
.then((fixture) => {
100-
fixture.detectChanges();
101-
let progressElement = fixture.debugElement.query(By.css('md-progress-bar'));
102-
let progressComponent = progressElement.componentInstance;
103-
104-
expect(progressComponent._primaryTransform()).toEqual({ transform: 'scaleX(0)' });
105-
expect(progressComponent._bufferTransform()).toBe(undefined);
106-
107-
progressComponent.value = 40;
108-
expect(progressComponent._primaryTransform()).toEqual({ transform: 'scaleX(0.4)' });
109-
expect(progressComponent._bufferTransform()).toBe(undefined);
110-
111-
progressComponent.value = 35;
112-
progressComponent.bufferValue = 55;
113-
expect(progressComponent._primaryTransform()).toEqual({ transform: 'scaleX(0.35)' });
114-
expect(progressComponent._bufferTransform()).toBe(undefined);
115-
116-
progressComponent.mode = 'buffer';
117-
expect(progressComponent._primaryTransform()).toEqual({ transform: 'scaleX(0.35)' });
118-
expect(progressComponent._bufferTransform()).toEqual({ transform: 'scaleX(0.55)' });
119-
120-
121-
progressComponent.value = 60;
122-
progressComponent.bufferValue = 60;
123-
expect(progressComponent._primaryTransform()).toEqual({ transform: 'scaleX(0.6)' });
124-
expect(progressComponent._bufferTransform()).toEqual({ transform: 'scaleX(0.6)' });
125-
done();
126-
});
92+
describe('buffer progress-bar', () => {
93+
let fixture: ComponentFixture<BufferProgressBar>;
94+
95+
beforeEach(() => {
96+
fixture = TestBed.createComponent(BufferProgressBar);
97+
fixture.detectChanges();
98+
});
99+
100+
it('should not modify the mode if a valid mode is provided.', () => {
101+
let progressElement = fixture.debugElement.query(By.css('md-progress-bar'));
102+
expect(progressElement.componentInstance.mode).toBe('buffer');
103+
});
127104
});
128105
});
129106

130107

131-
/** Test component that contains an MdButton. */
132-
@Component({
133-
template: '',
134-
})
135-
class TestApp { }
108+
@Component({template: '<md-progress-bar></md-progress-bar>'})
109+
class BasicProgressBar { }
110+
111+
@Component({template: '<md-progress-bar mode="buffer"></md-progress-bar>'})
112+
class BufferProgressBar { }

0 commit comments

Comments
 (0)