Skip to content

Commit d9fa498

Browse files
committed
fix lint and tests
1 parent cb132c8 commit d9fa498

File tree

1 file changed

+13
-19
lines changed

1 file changed

+13
-19
lines changed

src/cdk/scrolling/virtual-scroll-viewport.spec.ts

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ describe('CdkVirtualScrollViewport', () => {
162162
fixture.detectChanges();
163163
flush();
164164

165-
expect(viewport.elementRef.nativeElement.scrollTop).toBe(testComponent.itemSize * 2);
165+
expect(viewport.measureScrollOffset()).toBe(testComponent.itemSize * 2);
166166
expect(viewport.getRenderedRange()).toEqual({start: 2, end: 6});
167167
}));
168168

@@ -174,7 +174,7 @@ describe('CdkVirtualScrollViewport', () => {
174174
fixture.detectChanges();
175175
flush();
176176

177-
expect(viewport.elementRef.nativeElement.scrollTop).toBe(testComponent.itemSize * 2);
177+
expect(viewport.measureScrollOffset()).toBe(testComponent.itemSize * 2);
178178
expect(viewport.getRenderedRange()).toEqual({start: 2, end: 6});
179179
}));
180180

@@ -187,7 +187,7 @@ describe('CdkVirtualScrollViewport', () => {
187187
fixture.detectChanges();
188188
flush();
189189

190-
expect(viewport.elementRef.nativeElement.scrollLeft).toBe(testComponent.itemSize * 2);
190+
expect(viewport.measureScrollOffset()).toBe(testComponent.itemSize * 2);
191191
expect(viewport.getRenderedRange()).toEqual({start: 2, end: 6});
192192
}));
193193

@@ -200,7 +200,7 @@ describe('CdkVirtualScrollViewport', () => {
200200
fixture.detectChanges();
201201
flush();
202202

203-
expect(viewport.elementRef.nativeElement.scrollLeft).toBe(testComponent.itemSize * 2);
203+
expect(viewport.measureScrollOffset()).toBe(testComponent.itemSize * 2);
204204
expect(viewport.getRenderedRange()).toEqual({start: 2, end: 6});
205205
}));
206206

@@ -620,23 +620,22 @@ describe('CdkVirtualScrollViewport', () => {
620620
testComponent.orientation = 'horizontal';
621621
finishInit(fixture);
622622

623-
expect(viewportEl.scrollLeft).toBe(
624-
testComponent.itemSize * testComponent.items.length - testComponent.viewportSize);
623+
expect(viewport.measureScrollOffset('right')).toBe(0);
625624
expect(contentWrapperEl.style.transform).toMatch(/translateX\(0(px)?\)/);
626-
expect((contentWrapperEl.children[0] as HTMLElement).innerText).toBe('0 - 0');
625+
expect((contentWrapperEl.children[0] as HTMLElement).innerText.trim()).toBe('0 - 0');
627626
}));
628627

629628
it('should scroll through items as user scrolls to the left in horizontal mode',
630629
fakeAsync(() => {
631630
testComponent.orientation = 'horizontal';
632631
finishInit(fixture);
633632

634-
triggerScroll(viewport, 0);
633+
triggerScroll(viewport, testComponent.itemSize * testComponent.items.length);
635634
fixture.detectChanges();
636635
flush();
637636

638637
expect(contentWrapperEl.style.transform).toBe('translateX(-300px)');
639-
expect((contentWrapperEl.children[0] as HTMLElement).innerText).toBe('6 - 6');
638+
expect((contentWrapperEl.children[0] as HTMLElement).innerText.trim()).toBe('6 - 6');
640639
}));
641640

642641
it('should interpret scrollToOffset amount as an offset from the right in horizontal mode',
@@ -649,8 +648,7 @@ describe('CdkVirtualScrollViewport', () => {
649648
fixture.detectChanges();
650649
flush();
651650

652-
expect(viewportEl.scrollLeft).toBe(testComponent.itemSize * testComponent.items.length -
653-
testComponent.viewportSize - 100);
651+
expect(viewport.measureScrollOffset('right')).toBe(100);
654652
}));
655653

656654
it('should scroll to the correct index in horizontal mode', fakeAsync(() => {
@@ -662,7 +660,7 @@ describe('CdkVirtualScrollViewport', () => {
662660
fixture.detectChanges();
663661
flush();
664662

665-
expect((contentWrapperEl.children[0] as HTMLElement).innerText).toBe('2 - 2');
663+
expect((contentWrapperEl.children[0] as HTMLElement).innerText.trim()).toBe('2 - 2');
666664
}));
667665

668666
it('should emit the scrolled to index in horizontal mode', fakeAsync(() => {
@@ -701,11 +699,7 @@ function finishInit(fixture: ComponentFixture<any>) {
701699
/** Trigger a scroll event on the viewport (optionally setting a new scroll offset). */
702700
function triggerScroll(viewport: CdkVirtualScrollViewport, offset?: number) {
703701
if (offset !== undefined) {
704-
if (viewport.orientation == 'horizontal') {
705-
viewport.elementRef.nativeElement.scrollLeft = offset;
706-
} else {
707-
viewport.elementRef.nativeElement.scrollTop = offset;
708-
}
702+
viewport.scrollToOffset(offset);
709703
}
710704
dispatchFakeEvent(viewport.elementRef.nativeElement, 'scroll');
711705
animationFrameScheduler.flush();
@@ -766,8 +760,8 @@ class FixedSizeVirtualScroll {
766760
@Component({
767761
template: `
768762
<cdk-virtual-scroll-viewport dir="rtl"
769-
[itemSize]="itemSize" [minBufferPx]="minBufferPx" [maxBufferPx]="maxBufferPx"
770-
[orientation]="orientation" [style.height.px]="viewportHeight"
763+
[itemSize]="itemSize" [minBufferPx]="minBufferPx" [maxBufferPx]="maxBufferPx"
764+
[orientation]="orientation" [style.height.px]="viewportHeight"
771765
[style.width.px]="viewportWidth" (scrolledIndexChange)="scrolledToIndex = $event">
772766
<div class="item"
773767
*cdkVirtualFor="let item of items; let i = index; trackBy: trackBy; \

0 commit comments

Comments
 (0)