11import { expect } from '@esm-bundle/chai' ;
2- import { aTimeout , fixtureSync , mousedown , nextRender , oneEvent , touchstart } from '@vaadin/testing-helpers' ;
2+ import { aTimeout , fire , fixtureSync , mousedown , nextRender , oneEvent , touchstart } from '@vaadin/testing-helpers' ;
33import { sendKeys } from '@web/test-runner-commands' ;
44import sinon from 'sinon' ;
55import '../src/vaadin-date-picker.js' ;
6- import { getFocusedCell , getOverlayContent , monthsEqual , open , outsideClick , waitForOverlayRender } from './common.js' ;
6+ import { getFocusedCell , monthsEqual , open , outsideClick , waitForOverlayRender } from './common.js' ;
77
88describe ( 'dropdown' , ( ) => {
99 let datepicker , input , overlay ;
@@ -49,18 +49,15 @@ describe('dropdown', () => {
4949 } ) ;
5050
5151 it ( 'should prevent default for the toggle button mousedown' , ( ) => {
52- const e = new CustomEvent ( 'mousedown' , { bubbles : true } ) ;
53- const spy = sinon . spy ( e , 'preventDefault' ) ;
54- toggleButton . dispatchEvent ( e ) ;
55- expect ( spy . calledOnce ) . to . be . true ;
52+ const event = fire ( toggleButton , 'mousedown' ) ;
53+ expect ( event . defaultPrevented ) . to . be . true ;
5654 } ) ;
5755 } ) ;
5856
5957 describe ( 'scroll to date' , ( ) => {
6058 it ( 'should scroll to today by default' , async ( ) => {
6159 datepicker . open ( ) ;
62- const overlayContent = getOverlayContent ( datepicker ) ;
63- const spy = sinon . spy ( overlayContent , 'scrollToDate' ) ;
60+ const spy = sinon . spy ( datepicker . _overlayContent , 'scrollToDate' ) ;
6461 await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
6562 await waitForOverlayRender ( ) ;
6663
@@ -72,8 +69,7 @@ describe('dropdown', () => {
7269 datepicker . initialPosition = '2016-01-01' ;
7370
7471 datepicker . open ( ) ;
75- const overlayContent = getOverlayContent ( datepicker ) ;
76- const spy = sinon . spy ( overlayContent , 'scrollToDate' ) ;
72+ const spy = sinon . spy ( datepicker . _overlayContent , 'scrollToDate' ) ;
7773 await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
7874 await waitForOverlayRender ( ) ;
7975
@@ -85,8 +81,7 @@ describe('dropdown', () => {
8581 datepicker . value = '2000-02-01' ;
8682
8783 datepicker . open ( ) ;
88- const overlayContent = getOverlayContent ( datepicker ) ;
89- const spy = sinon . spy ( overlayContent , 'scrollToDate' ) ;
84+ const spy = sinon . spy ( datepicker . _overlayContent , 'scrollToDate' ) ;
9085 await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
9186 await waitForOverlayRender ( ) ;
9287
@@ -96,7 +91,7 @@ describe('dropdown', () => {
9691
9792 it ( 'should remember the initial position on reopen' , async ( ) => {
9893 await open ( datepicker ) ;
99- const overlayContent = getOverlayContent ( datepicker ) ;
94+ const overlayContent = datepicker . _overlayContent ;
10095 const initialPosition = overlayContent . initialPosition ;
10196
10297 datepicker . close ( ) ;
@@ -108,11 +103,10 @@ describe('dropdown', () => {
108103
109104 it ( 'should scroll to date on reopen' , async ( ) => {
110105 datepicker . open ( ) ;
111- const overlayContent = getOverlayContent ( datepicker ) ;
112106
113107 // We must scroll to initial position on reopen because
114108 // scrollTop can be reset while the dropdown is closed.
115- const spy = sinon . spy ( overlayContent , 'scrollToDate' ) ;
109+ const spy = sinon . spy ( datepicker . _overlayContent , 'scrollToDate' ) ;
116110 await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
117111 await waitForOverlayRender ( ) ;
118112 expect ( spy . called ) . to . be . true ;
@@ -129,8 +123,7 @@ describe('dropdown', () => {
129123 datepicker . min = '2100-01-01' ;
130124
131125 datepicker . open ( ) ;
132- const overlayContent = getOverlayContent ( datepicker ) ;
133- const spy = sinon . spy ( overlayContent , 'scrollToDate' ) ;
126+ const spy = sinon . spy ( datepicker . _overlayContent , 'scrollToDate' ) ;
134127 await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
135128 await waitForOverlayRender ( ) ;
136129
@@ -142,8 +135,7 @@ describe('dropdown', () => {
142135 datepicker . max = '2000-01-01' ;
143136
144137 datepicker . open ( ) ;
145- const overlayContent = getOverlayContent ( datepicker ) ;
146- const spy = sinon . spy ( overlayContent , 'scrollToDate' ) ;
138+ const spy = sinon . spy ( datepicker . _overlayContent , 'scrollToDate' ) ;
147139 await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
148140 await waitForOverlayRender ( ) ;
149141
@@ -158,8 +150,7 @@ describe('dropdown', () => {
158150 datepicker . initialPosition = '2015-01-01' ;
159151
160152 datepicker . open ( ) ;
161- const overlayContent = getOverlayContent ( datepicker ) ;
162- const spy = sinon . spy ( overlayContent , 'scrollToDate' ) ;
153+ const spy = sinon . spy ( datepicker . _overlayContent , 'scrollToDate' ) ;
163154 await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
164155 await waitForOverlayRender ( ) ;
165156
@@ -214,8 +205,7 @@ describe('dropdown', () => {
214205
215206 describe ( 'date tap' , ( ) => {
216207 function dateTap ( ) {
217- const content = getOverlayContent ( datepicker ) ;
218- const date = getFocusedCell ( content ) ;
208+ const date = getFocusedCell ( datepicker . _overlayContent ) ;
219209 mousedown ( date ) ;
220210 date . focus ( ) ;
221211 date . click ( ) ;
0 commit comments