Skip to content

fix(material/list): exclude icons from harness getText result #20845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 28, 2020
Merged

fix(material/list): exclude icons from harness getText result #20845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/material/list/testing/list-item-harness-base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ import {
} from '@angular/cdk/testing';
import {BaseListItemHarnessFilters, SubheaderHarnessFilters} from './list-harness-filters';

const iconSelector = '.mat-list-icon';
const avatarSelector = '.mat-list-avatar';

/**
* Gets a `HarnessPredicate` that applies the given `BaseListItemHarnessFilters` to the given
* list item harness.
Expand Down Expand Up @@ -58,12 +61,12 @@ export const enum MatListItemSection {
*/
export class MatListItemHarnessBase extends ContentContainerComponentHarness<MatListItemSection> {
private _lines = this.locatorForAll('.mat-line');
private _avatar = this.locatorForOptional('.mat-list-avatar');
private _icon = this.locatorForOptional('.mat-list-icon');
private _avatar = this.locatorForOptional(avatarSelector);
private _icon = this.locatorForOptional(iconSelector);

/** Gets the full text content of the list item (including text from any font icons). */
async getText(): Promise<string> {
return (await this.host()).text();
return (await this.host()).text({exclude: `${iconSelector}, ${avatarSelector}`});
}

/** Gets the lines of text (`mat-line` elements) in this nav list item. */
Expand Down
16 changes: 8 additions & 8 deletions src/material/list/testing/shared.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,8 +395,8 @@ export function runHarnessTests(
<mat-list-item>
<div matLine>Item </div>
<div matLine>1</div>
<svg matListIcon></svg>
<svg matListAvatar></svg>
<div matListIcon>icon</div>
<div matListAvatar>Avatar</div>
</mat-list-item>
<div matSubheader>Section 1</div>
<mat-divider></mat-divider>
Expand All @@ -419,8 +419,8 @@ class ListHarnessTest {}
<mat-list-item (click)="lastClicked = 'Item 1'">
<div matLine>Item </div>
<div matLine>1</div>
<svg matListIcon></svg>
<svg matListAvatar></svg>
<div matListIcon>icon</div>
<div matListAvatar>Avatar</div>
</mat-list-item>
<div matSubheader>Section 1</div>
<mat-divider></mat-divider>
Expand All @@ -445,8 +445,8 @@ class ActionListHarnessTest {
<a mat-list-item (click)="onClick($event, 'Item 1')">
<div matLine>Item </div>
<div matLine>1</div>
<svg matListIcon></svg>
<svg matListAvatar></svg>
<div matListIcon>icon</div>
<div matListAvatar>Avatar</div>
</a>
<div matSubheader>Section 1</div>
<mat-divider></mat-divider>
Expand Down Expand Up @@ -476,8 +476,8 @@ class NavListHarnessTest {
<mat-list-option checkboxPosition="before">
<div matLine>Item </div>
<div matLine>1</div>
<svg matListIcon></svg>
<svg matListAvatar></svg>
<div matListIcon>icon</div>
<div matListAvatar>Avatar</div>
</mat-list-option>
<div matSubheader>Section 1</div>
<mat-divider></mat-divider>
Expand Down