@@ -16,9 +16,9 @@ describe('MatTable', () => {
1616 const data = fixture . componentInstance . dataSource ! . data ;
1717 expectTableToMatchContent ( tableElement , [
1818 [ 'Column A' , 'Column B' , 'Column C' ] ,
19- [ data [ 0 ] . a , data [ 0 ] . b , data [ 0 ] . c ] ,
20- [ data [ 1 ] . a , data [ 1 ] . b , data [ 1 ] . c ] ,
21- [ data [ 2 ] . a , data [ 2 ] . b , data [ 2 ] . c ] ,
19+ [ data [ 0 ] . a , data [ 0 ] . b , data [ 0 ] . c ] as string [ ] ,
20+ [ data [ 1 ] . a , data [ 1 ] . b , data [ 1 ] . c ] as string [ ] ,
21+ [ data [ 2 ] . a , data [ 2 ] . b , data [ 2 ] . c ] as string [ ] ,
2222 [ 'fourth_row' ] ,
2323 [ 'Footer A' , 'Footer B' , 'Footer C' ] ,
2424 ] ) ;
@@ -64,10 +64,10 @@ describe('MatTable', () => {
6464 const data = fixture . componentInstance . dataSource ! . data ;
6565 expectTableToMatchContent ( tableElement , [
6666 [ 'Column A' , 'Column B' , 'Column C' ] ,
67- [ data [ 0 ] . a , data [ 0 ] . b , data [ 0 ] . c ] ,
68- [ data [ 1 ] . a , data [ 1 ] . b , data [ 1 ] . c ] ,
69- [ data [ 2 ] . a , data [ 2 ] . b , data [ 2 ] . c ] ,
70- [ data [ 3 ] . a , data [ 3 ] . b , data [ 3 ] . c ] ,
67+ [ data [ 0 ] . a , data [ 0 ] . b , data [ 0 ] . c ] as string [ ] ,
68+ [ data [ 1 ] . a , data [ 1 ] . b , data [ 1 ] . c ] as string [ ] ,
69+ [ data [ 2 ] . a , data [ 2 ] . b , data [ 2 ] . c ] as string [ ] ,
70+ [ data [ 3 ] . a , data [ 3 ] . b , data [ 3 ] . c ] as string [ ] ,
7171 ] ) ;
7272 } ) ;
7373
@@ -159,9 +159,9 @@ describe('MatTable', () => {
159159 const data = fixture . componentInstance . dataSource ! . data ;
160160 expectTableToMatchContent ( tableElement , [
161161 [ 'Column A' , 'Column B' , 'Column C' ] ,
162- [ data [ 0 ] . a , data [ 0 ] . b , data [ 0 ] . c ] ,
163- [ data [ 1 ] . a , data [ 1 ] . b , data [ 1 ] . c ] ,
164- [ data [ 2 ] . a , data [ 2 ] . b , data [ 2 ] . c ] ,
162+ [ data [ 0 ] . a , data [ 0 ] . b , data [ 0 ] . c ] as string [ ] ,
163+ [ data [ 1 ] . a , data [ 1 ] . b , data [ 1 ] . c ] as string [ ] ,
164+ [ data [ 2 ] . a , data [ 2 ] . b , data [ 2 ] . c ] as string [ ] ,
165165 ] ) ;
166166 } ) ;
167167
@@ -173,9 +173,9 @@ describe('MatTable', () => {
173173 const data = fixture . componentInstance . dataSource ! . data ;
174174 expectTableToMatchContent ( tableElement , [
175175 [ 'Column A' , 'Column B' , 'Column C' ] ,
176- [ data [ 0 ] . a , data [ 0 ] . b , data [ 0 ] . c ] ,
177- [ data [ 1 ] . a , data [ 1 ] . b , data [ 1 ] . c ] ,
178- [ data [ 2 ] . a , data [ 2 ] . b , data [ 2 ] . c ] ,
176+ [ data [ 0 ] . a , data [ 0 ] . b , data [ 0 ] . c ] as string [ ] ,
177+ [ data [ 1 ] . a , data [ 1 ] . b , data [ 1 ] . c ] as string [ ] ,
178+ [ data [ 2 ] . a , data [ 2 ] . b , data [ 2 ] . c ] as string [ ] ,
179179 ] ) ;
180180 } ) ;
181181
@@ -357,7 +357,7 @@ describe('MatTable', () => {
357357 ] ) ;
358358
359359 // Change the filter to a falsy value that might come in from the view.
360- dataSource . filter = 0 as any ;
360+ dataSource . filter = 0 as unknown as string ;
361361 flushMicrotasks ( ) ;
362362 fixture . detectChanges ( ) ;
363363 expectTableToMatchContent ( tableElement , [
@@ -604,7 +604,7 @@ describe('MatTable', () => {
604604 [ 'Footer A' , 'Footer B' , 'Footer C' ] ,
605605 ] ) ;
606606
607- dataSource . data = { } as any ;
607+ dataSource . data = { } as TestData [ ] ;
608608 fixture . changeDetectorRef . markForCheck ( ) ;
609609 fixture . detectChanges ( ) ;
610610 expectTableToMatchContent ( tableElement , [
@@ -1108,7 +1108,7 @@ function getActualTableContent(tableElement: Element): string[][] {
11081108 return actualTableContent . map ( row => row . map ( cell => cell . textContent ! . trim ( ) ) ) ;
11091109}
11101110
1111- export function expectTableToMatchContent ( tableElement : Element , expected : any [ ] ) {
1111+ export function expectTableToMatchContent ( tableElement : Element , expected : string [ ] [ ] ) {
11121112 const missedExpectations : string [ ] = [ ] ;
11131113 function checkCellContent ( actualCell : string , expectedCell : string ) {
11141114 if ( actualCell !== expectedCell ) {
@@ -1134,7 +1134,7 @@ export function expectTableToMatchContent(tableElement: Element, expected: any[]
11341134 }
11351135
11361136 row . forEach ( ( actualCell , cellIndex ) => {
1137- const expectedCell = expectedRow ? expectedRow [ cellIndex ] : null ;
1137+ const expectedCell = expectedRow [ cellIndex ] ;
11381138 checkCellContent ( actualCell , expectedCell ) ;
11391139 } ) ;
11401140 } ) ;
0 commit comments