Skip to content

Commit 0dcb528

Browse files
essjay05essjay05
committed
test(material/stepper): reset tests to use isSelected
Updates previous changes to tests which used isPressed and isExpanded to simplify to isSelected instead.
1 parent 6387324 commit 0dcb528

File tree

4 files changed

+72
-41
lines changed

4 files changed

+72
-41
lines changed

‎src/components-examples/material/stepper/stepper-harness/stepper-harness-example.spec.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,18 @@ describe('StepperHarnessExample', () => {
4343

4444
await secondStep.select();
4545

46-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([false, true, false]);
46+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
47+
false,
48+
true,
49+
false,
50+
]);
4751

4852
await nextButton.click();
4953

50-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([false, false, true]);
54+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
55+
false,
56+
false,
57+
true,
58+
]);
5159
});
5260
});

‎src/material/stepper/testing/step-harness-filters.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@ export enum StepperOrientation {
1717
export interface StepHarnessFilters extends BaseHarnessFilters {
1818
/** Only find instances whose label matches the given value. */
1919
label?: string | RegExp;
20-
/** Only find steps with the given expanded for Horizontal Stepper state. */
21-
pressed?: boolean;
22-
/** Only find steps with the given expanded for Vertical Stepper state. */
23-
expanded?: boolean;
20+
/** Only find steps with the given pressed/expanded for Stepper state. */
21+
selected?: boolean;
2422
/** Only find completed steps. */
2523
completed?: boolean;
2624
/** Only find steps that have errors. */

‎src/material/stepper/testing/step-harness.ts

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,9 @@ export class MatStepHarness extends ContentContainerComponentHarness<string> {
3030
HarnessPredicate.stringMatches(harness.getLabel(), label),
3131
)
3232
.addOption(
33-
'pressed',
34-
options.pressed,
35-
async (harness, pressed) => (await harness.isPressed()) === pressed,
36-
)
37-
.addOption(
38-
'expanded',
39-
options.expanded,
40-
async (harness, expanded) => (await harness.isExpanded()) === expanded,
33+
'selected',
34+
options.selected,
35+
async (harness, selected) => (await harness.isSelected()) === selected,
4136
)
4237
.addOption(
4338
'completed',
@@ -66,22 +61,16 @@ export class MatStepHarness extends ContentContainerComponentHarness<string> {
6661
return (await this.host()).getAttribute('aria-labelledby');
6762
}
6863

69-
/** Whether the step of Horizontal Stepper is pressed. */
70-
async isPressed(): Promise<boolean> {
64+
/** Whether the step of Stepper is pressed/expanded. */
65+
async isSelected(): Promise<boolean> {
7166
const host = await this.host();
7267
return (await host.getAttribute('aria-pressed')) === 'true';
7368
}
7469

75-
/** Whether the step of Vertical Stepper is expanded. */
76-
async isExpanded(): Promise<boolean> {
77-
const host = await this.host();
78-
return (await host.getAttribute('aria-expanded')) === 'true';
79-
}
80-
8170
/** Whether the step has been filled out. */
8271
async isCompleted(): Promise<boolean> {
8372
const state = await this._getIconState();
84-
return state === 'done' || (state === 'edit' && !(await this.isPressed()));
73+
return state === 'done' || (state === 'edit' && !(await this.isSelected()));
8574
}
8675

8776
/**

‎src/material/stepper/testing/stepper-harness.spec.ts

Lines changed: 54 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ describe('MatStepperHarness', () => {
6969
const stepper = await loader.getHarness(MatStepperHarness.with({selector: '#one-stepper'}));
7070
const steps = await stepper.getSteps();
7171

72-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
72+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
7373
true,
7474
false,
7575
false,
@@ -78,7 +78,7 @@ describe('MatStepperHarness', () => {
7878

7979
await stepper.selectStep({label: 'Three'});
8080

81-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
81+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
8282
false,
8383
false,
8484
true,
@@ -90,11 +90,19 @@ describe('MatStepperHarness', () => {
9090
const stepper = await loader.getHarness(MatStepperHarness.with({selector: '#two-stepper'}));
9191
const steps = await stepper.getSteps();
9292

93-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([true, false, false]);
93+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
94+
true,
95+
false,
96+
false,
97+
]);
9498

9599
await stepper.selectStep({label: 'Three'});
96100

97-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([false, false, true]);
101+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
102+
false,
103+
false,
104+
true,
105+
]);
98106
});
99107

100108
it('should be able to get the text-based label of a step', async () => {
@@ -145,7 +153,7 @@ describe('MatStepperHarness', () => {
145153
const stepper = await loader.getHarness(MatStepperHarness.with({selector: '#one-stepper'}));
146154
const steps = await stepper.getSteps();
147155

148-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
156+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
149157
true,
150158
false,
151159
false,
@@ -157,14 +165,18 @@ describe('MatStepperHarness', () => {
157165
const stepper = await loader.getHarness(MatStepperHarness.with({selector: '#two-stepper'}));
158166
const steps = await stepper.getSteps();
159167

160-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([true, false, false]);
168+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
169+
true,
170+
false,
171+
false,
172+
]);
161173
});
162174

163175
it('should be able to select a step in a vertical stepper', async () => {
164176
const stepper = await loader.getHarness(MatStepperHarness.with({selector: '#one-stepper'}));
165177
const steps = await stepper.getSteps();
166178

167-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
179+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
168180
true,
169181
false,
170182
false,
@@ -173,7 +185,7 @@ describe('MatStepperHarness', () => {
173185

174186
await steps[2].select();
175187

176-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
188+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
177189
false,
178190
false,
179191
true,
@@ -185,11 +197,19 @@ describe('MatStepperHarness', () => {
185197
const stepper = await loader.getHarness(MatStepperHarness.with({selector: '#two-stepper'}));
186198
const steps = await stepper.getSteps();
187199

188-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([true, false, false]);
200+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
201+
true,
202+
false,
203+
false,
204+
]);
189205

190206
await steps[2].select();
191207

192-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([false, false, true]);
208+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
209+
false,
210+
false,
211+
true,
212+
]);
193213
});
194214

195215
it('should get whether a step is optional', async () => {
@@ -218,7 +238,7 @@ describe('MatStepperHarness', () => {
218238

219239
await secondStep.select();
220240

221-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
241+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
222242
false,
223243
true,
224244
false,
@@ -227,7 +247,7 @@ describe('MatStepperHarness', () => {
227247

228248
await nextButton.click();
229249

230-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
250+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
231251
false,
232252
false,
233253
true,
@@ -243,11 +263,19 @@ describe('MatStepperHarness', () => {
243263

244264
await secondStep.select();
245265

246-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([false, true, false]);
266+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
267+
false,
268+
true,
269+
false,
270+
]);
247271

248272
await nextButton.click();
249273

250-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([false, false, true]);
274+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
275+
false,
276+
false,
277+
true,
278+
]);
251279
});
252280

253281
it('should go backward when pressing the previous button of a vertical stepper', async () => {
@@ -258,7 +286,7 @@ describe('MatStepperHarness', () => {
258286

259287
await secondStep.select();
260288

261-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
289+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
262290
false,
263291
true,
264292
false,
@@ -267,7 +295,7 @@ describe('MatStepperHarness', () => {
267295

268296
await previousButton.click();
269297

270-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
298+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
271299
true,
272300
false,
273301
false,
@@ -283,11 +311,19 @@ describe('MatStepperHarness', () => {
283311

284312
await secondStep.select();
285313

286-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([false, true, false]);
314+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
315+
false,
316+
true,
317+
false,
318+
]);
287319

288320
await previousButton.click();
289321

290-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([true, false, false]);
322+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
323+
true,
324+
false,
325+
false,
326+
]);
291327
});
292328

293329
it('should get whether a step has errors', async () => {

0 commit comments

Comments
 (0)