Skip to content

Commit a7dabce

Browse files
authored
test: replace Polymer based fixture elements in context-menu tests (#9110)
1 parent 7c790e8 commit a7dabce

3 files changed

Lines changed: 32 additions & 59 deletions

File tree

‎packages/context-menu/test/context.test.js‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ import sinon from 'sinon';
44
import '../src/vaadin-context-menu.js';
55
import '@vaadin/item/src/vaadin-item.js';
66
import '@vaadin/list-box/src/vaadin-list-box.js';
7-
import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
87

9-
class XFoo extends PolymerElement {
10-
static get template() {
11-
return html`
8+
class XFoo extends HTMLElement {
9+
constructor() {
10+
super();
11+
this.attachShadow({ mode: 'open' });
12+
this.shadowRoot.innerHTML = `
1213
<div id="wrapper">
1314
<div id="content"></div>
1415
</div>
@@ -19,7 +20,7 @@ class XFoo extends PolymerElement {
1920
customElements.define('x-foo', XFoo);
2021

2122
describe('context', () => {
22-
let menu, foo, target, another;
23+
let menu, foo, fooContent, target, another;
2324

2425
beforeEach(async () => {
2526
menu = fixtureSync(`
@@ -40,6 +41,7 @@ describe('context', () => {
4041
};
4142
await nextRender();
4243
foo = document.querySelector('x-foo');
44+
fooContent = foo.shadowRoot.querySelector('#content');
4345
target = document.querySelector('#target');
4446
another = document.querySelector('#another');
4547
});
@@ -68,14 +70,14 @@ describe('context', () => {
6870
});
6971

7072
it('should use local target when targeting inside shadow root', () => {
71-
fire(foo.$.content, 'contextmenu');
73+
fire(fooContent, 'contextmenu');
7274

7375
expect(menu._context.target).to.eql(foo);
7476
});
7577

7678
it('should not penetrate shadow root to change context', () => {
7779
menu.selector = '#content';
78-
fire(foo.$.content, 'contextmenu');
80+
fire(fooContent, 'contextmenu');
7981

8082
expect(menu._context.target).to.be.undefined;
8183
});
@@ -89,14 +91,14 @@ describe('context', () => {
8991

9092
it('should not open if no context available', () => {
9193
menu.selector = 'foobar';
92-
fire(foo.$.content, 'contextmenu');
94+
fire(fooContent, 'contextmenu');
9395

9496
expect(menu.opened).to.eql(false);
9597
});
9698

9799
it('should not prevent default if no context available', () => {
98100
menu.selector = 'foobar';
99-
const evt = fire(foo.$.content, 'contextmenu');
101+
const evt = fire(fooContent, 'contextmenu');
100102

101103
expect(evt.defaultPrevented).to.eql(false);
102104
});

‎packages/context-menu/test/integration.test.js‎

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,25 @@
11
import { expect } from '@vaadin/chai-plugins';
22
import { aTimeout, click, fixtureSync, isIOS, makeSoloTouchEvent, nextRender } from '@vaadin/testing-helpers';
33
import '../src/vaadin-context-menu.js';
4-
import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
5-
6-
class MenuWrapper extends PolymerElement {
7-
static get template() {
8-
return html`
9-
<vaadin-context-menu id="menu" renderer="[[_renderer]]"></vaadin-context-menu>
10-
<button on-click="_showMenu" id="button" style="margin: 20px">Show context menu</button>
11-
`;
12-
}
13-
14-
constructor() {
15-
super();
16-
17-
this._renderer = (root) => {
18-
root.textContent = 'foo';
19-
};
20-
}
21-
22-
_showMenu(e) {
23-
this.$.menu.open(e);
24-
}
25-
}
26-
27-
customElements.define('menu-wrapper', MenuWrapper);
284

295
describe('integration', () => {
306
let wrapper, menu, button, overlay;
317

328
beforeEach(async () => {
33-
wrapper = fixtureSync('<menu-wrapper></menu-wrapper>');
9+
wrapper = fixtureSync(`
10+
<div>
11+
<vaadin-context-menu></vaadin-context-menu>
12+
<button style="margin: 20px">Show context menu</button>
13+
</div>
14+
`);
3415
await nextRender();
35-
menu = wrapper.$.menu;
36-
button = wrapper.$.button;
16+
[menu, button] = wrapper.children;
17+
menu.renderer = (root) => {
18+
root.textContent = 'foo';
19+
};
20+
button.addEventListener('click', (e) => {
21+
menu.open(e);
22+
});
3723
overlay = menu._overlayElement;
3824
});
3925

‎packages/context-menu/test/touch.test.js‎

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,22 @@ import {
1313
import sinon from 'sinon';
1414
import './context-menu-test-styles.js';
1515
import '../src/vaadin-context-menu.js';
16-
import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
1716
import { gestures } from '@vaadin/component-base/src/gestures.js';
1817

19-
class MenuTouchWrapper extends PolymerElement {
20-
static get template() {
21-
return html`
22-
<vaadin-context-menu selector="#target" id="menu" renderer="[[_renderer]]">
23-
<div id="target">Target</div>
24-
</vaadin-context-menu>
25-
`;
26-
}
27-
28-
constructor() {
29-
super();
30-
31-
this._renderer = (root) => {
32-
root.innerHTML = '<div>Menu Content</div>';
33-
};
34-
}
35-
}
36-
37-
customElements.define('menu-touch-wrapper', MenuTouchWrapper);
38-
3918
describe('mobile support', () => {
4019
let menu, target;
4120

4221
beforeEach(async () => {
43-
const testWrapper = fixtureSync('<menu-touch-wrapper></menu-touch-wrapper>');
22+
menu = fixtureSync(`
23+
<vaadin-context-menu selector="#target">
24+
<div id="target">Target</div>
25+
</vaadin-context-menu>
26+
`);
4427
await nextRender();
45-
menu = testWrapper.$.menu;
4628
target = menu.querySelector('#target');
29+
menu.renderer = (root) => {
30+
root.innerHTML = '<div>Menu Content</div>';
31+
};
4732
menu._phone = true;
4833
});
4934

0 commit comments

Comments
 (0)