Skip to content

Commit 5d9f3b5

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 27226d0 commit 5d9f3b5

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
@@ -47,10 +47,18 @@ describe('StepperHarnessExample', () => {
4747

4848
await secondStep.select();
4949

50-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([false, true, false]);
50+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
51+
false,
52+
true,
53+
false,
54+
]);
5155

5256
await nextButton.click();
5357

54-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([false, false, true]);
58+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
59+
false,
60+
false,
61+
true,
62+
]);
5563
});
5664
});

‎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
@@ -71,7 +71,7 @@ describe('MatStepperHarness', () => {
7171
const stepper = await loader.getHarness(MatStepperHarness.with({selector: '#one-stepper'}));
7272
const steps = await stepper.getSteps();
7373

74-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
74+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
7575
true,
7676
false,
7777
false,
@@ -80,7 +80,7 @@ describe('MatStepperHarness', () => {
8080

8181
await stepper.selectStep({label: 'Three'});
8282

83-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
83+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
8484
false,
8585
false,
8686
true,
@@ -92,11 +92,19 @@ describe('MatStepperHarness', () => {
9292
const stepper = await loader.getHarness(MatStepperHarness.with({selector: '#two-stepper'}));
9393
const steps = await stepper.getSteps();
9494

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

97101
await stepper.selectStep({label: 'Three'});
98102

99-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([false, false, true]);
103+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
104+
false,
105+
false,
106+
true,
107+
]);
100108
});
101109

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

150-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
158+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
151159
true,
152160
false,
153161
false,
@@ -159,14 +167,18 @@ describe('MatStepperHarness', () => {
159167
const stepper = await loader.getHarness(MatStepperHarness.with({selector: '#two-stepper'}));
160168
const steps = await stepper.getSteps();
161169

162-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([true, false, false]);
170+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
171+
true,
172+
false,
173+
false,
174+
]);
163175
});
164176

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

169-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
181+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
170182
true,
171183
false,
172184
false,
@@ -175,7 +187,7 @@ describe('MatStepperHarness', () => {
175187

176188
await steps[2].select();
177189

178-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
190+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
179191
false,
180192
false,
181193
true,
@@ -187,11 +199,19 @@ describe('MatStepperHarness', () => {
187199
const stepper = await loader.getHarness(MatStepperHarness.with({selector: '#two-stepper'}));
188200
const steps = await stepper.getSteps();
189201

190-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([true, false, false]);
202+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
203+
true,
204+
false,
205+
false,
206+
]);
191207

192208
await steps[2].select();
193209

194-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([false, false, true]);
210+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
211+
false,
212+
false,
213+
true,
214+
]);
195215
});
196216

197217
it('should get whether a step is optional', async () => {
@@ -220,7 +240,7 @@ describe('MatStepperHarness', () => {
220240

221241
await secondStep.select();
222242

223-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
243+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
224244
false,
225245
true,
226246
false,
@@ -229,7 +249,7 @@ describe('MatStepperHarness', () => {
229249

230250
await nextButton.click();
231251

232-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
252+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
233253
false,
234254
false,
235255
true,
@@ -245,11 +265,19 @@ describe('MatStepperHarness', () => {
245265

246266
await secondStep.select();
247267

248-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([false, true, false]);
268+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
269+
false,
270+
true,
271+
false,
272+
]);
249273

250274
await nextButton.click();
251275

252-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([false, false, true]);
276+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
277+
false,
278+
false,
279+
true,
280+
]);
253281
});
254282

255283
it('should go backward when pressing the previous button of a vertical stepper', async () => {
@@ -260,7 +288,7 @@ describe('MatStepperHarness', () => {
260288

261289
await secondStep.select();
262290

263-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
291+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
264292
false,
265293
true,
266294
false,
@@ -269,7 +297,7 @@ describe('MatStepperHarness', () => {
269297

270298
await previousButton.click();
271299

272-
expect(await parallel(() => steps.map(step => step.isExpanded()))).toEqual([
300+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
273301
true,
274302
false,
275303
false,
@@ -285,11 +313,19 @@ describe('MatStepperHarness', () => {
285313

286314
await secondStep.select();
287315

288-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([false, true, false]);
316+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
317+
false,
318+
true,
319+
false,
320+
]);
289321

290322
await previousButton.click();
291323

292-
expect(await parallel(() => steps.map(step => step.isPressed()))).toEqual([true, false, false]);
324+
expect(await parallel(() => steps.map(step => step.isSelected()))).toEqual([
325+
true,
326+
false,
327+
false,
328+
]);
293329
});
294330

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

0 commit comments

Comments
 (0)