Skip to content

Commit 890ecb0

Browse files
authored
test: update popover tests to use vaadin-overlay-open event (#9044)
1 parent 3da6794 commit 890ecb0

3 files changed

Lines changed: 65 additions & 64 deletions

File tree

‎packages/popover/test/a11y.test.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,19 @@ describe('a11y', () => {
8787

8888
it(`should set aria-expanded attribute on the ${prop} when opened`, async () => {
8989
popover.opened = true;
90-
await nextRender();
90+
await oneEvent(overlay, 'vaadin-overlay-open');
9191
expect(element.getAttribute('aria-expanded')).to.equal('true');
9292
});
9393

9494
it(`should set aria-controls attribute on the ${prop} when opened`, async () => {
9595
popover.opened = true;
96-
await nextRender();
96+
await oneEvent(overlay, 'vaadin-overlay-open');
9797
expect(element.getAttribute('aria-controls')).to.equal(overlay.id);
9898
});
9999

100100
it(`should remove aria-controls attribute from the ${prop} when closed`, async () => {
101101
popover.opened = true;
102-
await nextRender();
102+
await oneEvent(overlay, 'vaadin-overlay-open');
103103

104104
popover.opened = false;
105105
await nextUpdate(popover);
@@ -114,7 +114,7 @@ describe('a11y', () => {
114114

115115
it(`should remove aria-controls attribute from ${prop} when target is cleared`, async () => {
116116
popover.opened = true;
117-
await nextRender();
117+
await oneEvent(overlay, 'vaadin-overlay-open');
118118

119119
popover.target = null;
120120
await nextUpdate(popover);
@@ -198,7 +198,7 @@ describe('a11y', () => {
198198
await nextUpdate(popover);
199199

200200
target.focus();
201-
await nextRender();
201+
await oneEvent(overlay, 'vaadin-overlay-open');
202202
});
203203

204204
it('should restore focus on Esc with trigger set to focus', async () => {
@@ -256,7 +256,7 @@ describe('a11y', () => {
256256
await nextUpdate(popover);
257257

258258
target.click();
259-
await nextRender();
259+
await oneEvent(overlay, 'vaadin-overlay-open');
260260
});
261261

262262
it('should restore focus on Esc with trigger set to click', async () => {
@@ -296,7 +296,7 @@ describe('a11y', () => {
296296

297297
it('should not restore focus on Esc with trigger set to hover', async () => {
298298
mouseenter(target);
299-
await nextRender();
299+
await oneEvent(overlay, 'vaadin-overlay-open');
300300

301301
const focusSpy = sinon.spy(target, 'focus');
302302
overlay.$.overlay.focus();
@@ -311,7 +311,7 @@ describe('a11y', () => {
311311
await nextUpdate(popover);
312312

313313
mouseenter(target);
314-
await nextRender();
314+
await oneEvent(overlay, 'vaadin-overlay-open');
315315

316316
expect(target.style.pointerEvents).to.equal('auto');
317317
});
@@ -321,7 +321,7 @@ describe('a11y', () => {
321321
await nextUpdate(popover);
322322

323323
mouseenter(target);
324-
await nextRender();
324+
await oneEvent(overlay, 'vaadin-overlay-open');
325325

326326
mouseleave(target);
327327
await nextRender();
@@ -336,7 +336,7 @@ describe('a11y', () => {
336336
await nextUpdate(popover);
337337

338338
target.focus();
339-
await nextRender();
339+
await oneEvent(overlay, 'vaadin-overlay-open');
340340
});
341341

342342
it('should not restore focus when re-opening on hover after being restored', async () => {
@@ -388,7 +388,7 @@ describe('a11y', () => {
388388

389389
popover.target = wrapper;
390390
}
391-
await nextRender();
391+
await oneEvent(overlay, 'vaadin-overlay-open');
392392
});
393393

394394
it('should focus the overlay content part on target Tab', async () => {
@@ -460,7 +460,7 @@ describe('a11y', () => {
460460
await nextUpdate(popover);
461461

462462
target.focus();
463-
await nextRender();
463+
await oneEvent(overlay, 'vaadin-overlay-open');
464464

465465
// Move focus back from the target
466466
await sendKeys({ press: 'Shift+Tab' });

‎packages/popover/test/basic.test.js‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { 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';
33
import sinon from 'sinon';
44
import '../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

Comments
 (0)