11import { expect } from '@vaadin/chai-plugins' ;
2- import { esc , fixtureSync , nextRender , nextUpdate , outsideClick } from '@vaadin/testing-helpers' ;
2+ import { esc , fixtureSync , nextRender , nextUpdate , oneEvent , outsideClick } from '@vaadin/testing-helpers' ;
33import sinon from 'sinon' ;
44import '../src/vaadin-popover.js' ;
55
@@ -175,13 +175,13 @@ describe('popover', () => {
175175
176176 it ( 'should open overlay on target click by default' , async ( ) => {
177177 target . click ( ) ;
178- await nextRender ( ) ;
178+ await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
179179 expect ( overlay . opened ) . to . be . true ;
180180 } ) ;
181181
182182 it ( 'should close overlay on subsequent target click' , async ( ) => {
183183 target . click ( ) ;
184- await nextRender ( ) ;
184+ await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
185185
186186 target . click ( ) ;
187187 await nextRender ( ) ;
@@ -190,7 +190,7 @@ describe('popover', () => {
190190
191191 it ( 'should close overlay on outside click by default' , async ( ) => {
192192 target . click ( ) ;
193- await nextRender ( ) ;
193+ await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
194194
195195 outsideClick ( ) ;
196196 await nextRender ( ) ;
@@ -202,7 +202,7 @@ describe('popover', () => {
202202 await nextUpdate ( popover ) ;
203203
204204 target . click ( ) ;
205- await nextRender ( ) ;
205+ await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
206206
207207 outsideClick ( ) ;
208208 await nextRender ( ) ;
@@ -215,7 +215,7 @@ describe('popover', () => {
215215 await nextUpdate ( popover ) ;
216216
217217 target . click ( ) ;
218- await nextRender ( ) ;
218+ await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
219219
220220 outsideClick ( ) ;
221221 await nextRender ( ) ;
@@ -224,7 +224,7 @@ describe('popover', () => {
224224
225225 it ( 'should close overlay when popover is detached' , async ( ) => {
226226 target . click ( ) ;
227- await nextRender ( ) ;
227+ await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
228228
229229 popover . remove ( ) ;
230230 await nextRender ( ) ;
@@ -233,7 +233,7 @@ describe('popover', () => {
233233
234234 it ( 'should not close overlay when popover is moved in DOM' , async ( ) => {
235235 target . click ( ) ;
236- await nextRender ( ) ;
236+ await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
237237
238238 const parent = popover . parentElement ;
239239 popover . remove ( ) ;
@@ -253,7 +253,7 @@ describe('popover', () => {
253253 describe ( 'Escape press' , ( ) => {
254254 beforeEach ( async ( ) => {
255255 target . click ( ) ;
256- await nextRender ( ) ;
256+ await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
257257 } ) ;
258258
259259 it ( 'should close overlay on global Escape press by default' , async ( ) => {
@@ -308,11 +308,11 @@ describe('popover', () => {
308308
309309 // Open the first popover
310310 target . click ( ) ;
311- await nextRender ( ) ;
311+ await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
312312
313313 // Open the second popover
314314 secondTarget . click ( ) ;
315- await nextRender ( ) ;
315+ await oneEvent ( secondPopover . _overlayElement , 'vaadin-overlay-open' ) ;
316316
317317 // Expect both popovers to be opened
318318 expect ( popover . opened ) . to . be . true ;
@@ -452,7 +452,7 @@ describe('popover', () => {
452452
453453 beforeEach ( async ( ) => {
454454 popover . opened = true ;
455- await nextRender ( ) ;
455+ await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
456456 } ) ;
457457
458458 it ( 'should update width after opening the popover' , async ( ) => {
@@ -498,7 +498,7 @@ describe('popover', () => {
498498 root . textContent = new Array ( 2000 ) . fill ( 'foo' ) . join ( ' ' ) ;
499499 } ;
500500 popover . opened = true ;
501- await nextRender ( ) ;
501+ await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
502502 } ) ;
503503
504504 it ( 'should limit overlay height if content overflows the viewport' , ( ) => {
@@ -513,7 +513,7 @@ describe('popover', () => {
513513 describe ( 'closed event' , ( ) => {
514514 beforeEach ( async ( ) => {
515515 popover . opened = true ;
516- await nextRender ( ) ;
516+ await oneEvent ( overlay , 'vaadin-overlay-open' ) ;
517517 } ) ;
518518
519519 it ( 'should dispatch closed event when closed' , async ( ) => {
0 commit comments