1
1
import { TestBed , ComponentFixture , fakeAsync , tick , inject } from '@angular/core/testing' ;
2
2
import { Component , ViewChild } from '@angular/core' ;
3
3
import { Platform } from '@angular/cdk/platform' ;
4
- import { ViewportRuler , VIEWPORT_RULER_PROVIDER } from '@angular/cdk/scrolling' ;
5
4
import { dispatchMouseEvent , dispatchTouchEvent } from '@angular/cdk/testing' ;
6
5
import { RIPPLE_FADE_OUT_DURATION , RIPPLE_FADE_IN_DURATION } from './ripple-renderer' ;
7
6
import {
@@ -13,7 +12,6 @@ describe('MatRipple', () => {
13
12
let fixture : ComponentFixture < any > ;
14
13
let rippleTarget : HTMLElement ;
15
14
let originalBodyMargin : string | null ;
16
- let viewportRuler : ViewportRuler ;
17
15
let platform : Platform ;
18
16
19
17
/** Extracts the numeric value of a pixel size string like '123px'. */
@@ -24,7 +22,6 @@ describe('MatRipple', () => {
24
22
beforeEach ( ( ) => {
25
23
TestBed . configureTestingModule ( {
26
24
imports : [ MatRippleModule ] ,
27
- providers : [ VIEWPORT_RULER_PROVIDER ] ,
28
25
declarations : [
29
26
BasicRippleContainer ,
30
27
RippleContainerWithInputBindings ,
@@ -34,8 +31,7 @@ describe('MatRipple', () => {
34
31
} ) ;
35
32
} ) ;
36
33
37
- beforeEach ( inject ( [ ViewportRuler , Platform ] , ( ruler : ViewportRuler , p : Platform ) => {
38
- viewportRuler = ruler ;
34
+ beforeEach ( inject ( [ Platform ] , ( p : Platform ) => {
39
35
platform = p ;
40
36
41
37
// Set body margin to 0 during tests so it doesn't mess up position calculations.
@@ -239,9 +235,6 @@ describe('MatRipple', () => {
239
235
240
236
// Mobile safari
241
237
window . scrollTo ( pageScrollLeft , pageScrollTop ) ;
242
- // Force an update of the cached viewport geometries because IE11 emits the
243
- // scroll event later.
244
- viewportRuler . _cacheViewportGeometry ( ) ;
245
238
} ) ;
246
239
247
240
afterEach ( ( ) => {
@@ -255,9 +248,6 @@ describe('MatRipple', () => {
255
248
256
249
// Mobile safari
257
250
window . scrollTo ( 0 , 0 ) ;
258
- // Force an update of the cached viewport geometries because IE11 emits the
259
- // scroll event later.
260
- viewportRuler . _cacheViewportGeometry ( ) ;
261
251
} ) ;
262
252
263
253
it ( 'create ripple with correct position' , ( ) => {
0 commit comments