Skip to content

Commit 679d9db

Browse files
committed
fix lint and test
1 parent cbbadda commit 679d9db

File tree

2 files changed

+19
-29
lines changed

2 files changed

+19
-29
lines changed

src/material/list/testing/list-harness.spec.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import {MatDividerHarness} from '@angular/material/divider/testing';
22
import {MatListModule} from '@angular/material/list';
3-
import {
4-
MatActionListHarness,
5-
MatListHarness,
6-
MatNavListHarness,
7-
MatSelectionListHarness
8-
} from './list-harness-base';
3+
import {MatActionListHarness} from './action-list-harness';
4+
import {MatListHarness} from './list-harness';
5+
import {MatNavListHarness} from './nav-list-harness';
6+
import {MatSelectionListHarness} from './selection-list-harness';
97
import {MatListItemHarnessBase, MatSubheaderHarness} from './list-item-harness-base';
108
import {runHarnessTests} from './shared.spec';
119

src/material/list/testing/shared.spec.ts

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,13 @@ import {Component, Type} from '@angular/core';
99
import {ComponentFixture, TestBed} from '@angular/core/testing';
1010
import {MatDividerHarness} from '@angular/material/divider/testing';
1111
import {MatListModule} from '@angular/material/list';
12-
import {BaseListItemHarnessFilters} from '@angular/material/list/testing/list-harness-filters';
13-
import {
14-
MatActionListItemHarness,
15-
MatListItemHarness,
16-
MatListItemHarnessBase,
17-
MatListOptionHarness,
18-
MatNavListItemHarness,
19-
MatSubheaderHarness
20-
} from '@angular/material/list/testing/list-item-harness-base';
21-
import {
22-
MatActionListHarness,
23-
MatListHarness,
24-
MatListHarnessBase,
25-
MatNavListHarness,
26-
MatSelectionListHarness
27-
} from './list-harness-base';
12+
import {MatActionListHarness, MatActionListItemHarness} from './action-list-harness';
13+
import {MatListHarness, MatListItemHarness} from './list-harness';
14+
import {MatListHarnessBase} from './list-harness-base';
15+
import {BaseListItemHarnessFilters} from './list-harness-filters';
16+
import {MatListItemHarnessBase, MatSubheaderHarness} from './list-item-harness-base';
17+
import {MatNavListHarness, MatNavListItemHarness} from './nav-list-harness';
18+
import {MatListOptionHarness, MatSelectionListHarness} from './selection-list-harness';
2819

2920
/** Tests that apply to all types of mat-list. */
3021
function runBaseListFunctionalityTests<
@@ -111,7 +102,8 @@ function runBaseListFunctionalityTests<
111102
});
112103

113104
it('should get all items, subheaders, and dividers', async () => {
114-
const itemsSubheadersAndDividers = await simpleListHarness.getItemsWithSubheadersAndDividers();
105+
const itemsSubheadersAndDividers =
106+
await simpleListHarness.getItemsWithSubheadersAndDividers();
115107
expect(itemsSubheadersAndDividers.length).toBe(7);
116108
expect(itemsSubheadersAndDividers[0] instanceof listItemHarnessBase).toBe(true);
117109
expect(await (itemsSubheadersAndDividers[0] as MatListItemHarnessBase).getText())
@@ -133,12 +125,12 @@ function runBaseListFunctionalityTests<
133125
});
134126

135127
it('should get all items, subheaders, and dividers excluding some harness types', async () => {
136-
const items =
137-
await simpleListHarness.getItemsWithSubheadersAndDividers({subheader: false, divider: false});
138-
const subheaders =
139-
await simpleListHarness.getItemsWithSubheadersAndDividers({item: false, divider: false});
140-
const dividers =
141-
await simpleListHarness.getItemsWithSubheadersAndDividers({item: false, subheader: false});
128+
const items = await simpleListHarness.getItemsWithSubheadersAndDividers(
129+
{subheader: false, divider: false});
130+
const subheaders = await simpleListHarness.getItemsWithSubheadersAndDividers(
131+
{item: false, divider: false});
132+
const dividers = await simpleListHarness.getItemsWithSubheadersAndDividers(
133+
{item: false, subheader: false});
142134
expect(await Promise.all(items.map(i => i.getText())))
143135
.toEqual(['Item 1', 'Item 2', 'Item 3']);
144136
expect(await Promise.all(subheaders.map(s => s.getText())))

0 commit comments

Comments
 (0)