@@ -3,7 +3,7 @@ import { resetMouse, sendKeys, sendMouse } from '@vaadin/test-runner-commands';
33import { aTimeout , fire , fixtureSync , mousedown , nextRender , oneEvent , touchstart } from '@vaadin/testing-helpers' ;
44import sinon from 'sinon' ;
55import '../src/vaadin-date-picker.js' ;
6- import { getFocusableCell , monthsEqual , open , waitForOverlayRender } from './helpers.js' ;
6+ import { getFocusableCell , monthsEqual , open , untilOverlayRendered } from './helpers.js' ;
77
88describe ( 'dropdown' , ( ) => {
99 let datePicker , input , overlay ;
@@ -94,7 +94,7 @@ describe('dropdown', () => {
9494
9595 const spy = sinon . spy ( datePicker . _overlayContent , 'scrollToDate' ) ;
9696 await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
97- await waitForOverlayRender ( ) ;
97+ await untilOverlayRendered ( datePicker ) ;
9898
9999 const scrolledDate = spy . firstCall . args [ 0 ] ;
100100 expect ( monthsEqual ( scrolledDate , new Date ( ) ) ) . to . be . true ;
@@ -107,7 +107,7 @@ describe('dropdown', () => {
107107
108108 const spy = sinon . spy ( datePicker . _overlayContent , 'scrollToDate' ) ;
109109 await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
110- await waitForOverlayRender ( ) ;
110+ await untilOverlayRendered ( datePicker ) ;
111111
112112 const scrolledDate = spy . firstCall . args [ 0 ] ;
113113 expect ( scrolledDate ) . to . be . eql ( new Date ( 2016 , 0 , 1 ) ) ;
@@ -120,7 +120,7 @@ describe('dropdown', () => {
120120
121121 const spy = sinon . spy ( datePicker . _overlayContent , 'scrollToDate' ) ;
122122 await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
123- await waitForOverlayRender ( ) ;
123+ await untilOverlayRendered ( datePicker ) ;
124124
125125 const scrolledDate = spy . firstCall . args [ 0 ] ;
126126 expect ( monthsEqual ( scrolledDate , new Date ( 2000 , 1 , 1 ) ) ) . to . be . true ;
@@ -145,7 +145,7 @@ describe('dropdown', () => {
145145 // scrollTop can be reset while the dropdown is closed.
146146 const spy = sinon . spy ( datePicker . _overlayContent , 'scrollToDate' ) ;
147147 await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
148- await waitForOverlayRender ( ) ;
148+ await untilOverlayRendered ( datePicker ) ;
149149 expect ( spy . called ) . to . be . true ;
150150
151151 datePicker . close ( ) ;
@@ -163,7 +163,7 @@ describe('dropdown', () => {
163163
164164 const spy = sinon . spy ( datePicker . _overlayContent , 'scrollToDate' ) ;
165165 await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
166- await waitForOverlayRender ( ) ;
166+ await untilOverlayRendered ( datePicker ) ;
167167
168168 const scrolledDate = spy . firstCall . args [ 0 ] ;
169169 expect ( scrolledDate ) . to . be . eql ( new Date ( 2100 , 0 , 1 ) ) ;
@@ -176,7 +176,7 @@ describe('dropdown', () => {
176176
177177 const spy = sinon . spy ( datePicker . _overlayContent , 'scrollToDate' ) ;
178178 await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
179- await waitForOverlayRender ( ) ;
179+ await untilOverlayRendered ( datePicker ) ;
180180
181181 const scrolledDate = spy . firstCall . args [ 0 ] ;
182182 expect ( scrolledDate ) . to . be . eql ( new Date ( 2000 , 0 , 1 ) ) ;
@@ -192,7 +192,7 @@ describe('dropdown', () => {
192192
193193 const spy = sinon . spy ( datePicker . _overlayContent , 'scrollToDate' ) ;
194194 await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
195- await waitForOverlayRender ( ) ;
195+ await untilOverlayRendered ( datePicker ) ;
196196
197197 const scrolledDate = spy . firstCall . args [ 0 ] ;
198198 expect ( scrolledDate ) . to . be . eql ( new Date ( 2015 , 0 , 1 ) ) ;
0 commit comments