Skip to content

Commit a4debd2

Browse files
authored
test: update combo-box test to use helpers (#3733)
1 parent 9690936 commit a4debd2

4 files changed

Lines changed: 52 additions & 80 deletions

File tree

‎packages/combo-box/test/keyboard.test.js‎

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,11 @@ import {
1515
import { sendKeys } from '@web/test-runner-commands';
1616
import sinon from 'sinon';
1717
import '../src/vaadin-combo-box.js';
18-
import { getViewportItems, getVisibleItemsCount, onceScrolled, scrollToIndex } from './helpers.js';
18+
import { getViewportItems, getVisibleItemsCount, onceScrolled, scrollToIndex, setInputValue } from './helpers.js';
1919

2020
describe('keyboard', () => {
2121
let comboBox, input;
2222

23-
function filter(value) {
24-
input.value = value;
25-
fire(input, 'input');
26-
}
27-
2823
function getFocusedIndex() {
2924
return comboBox._focusedIndex;
3025
}
@@ -138,7 +133,7 @@ describe('keyboard', () => {
138133
});
139134

140135
it('should focus only on filtered items', () => {
141-
filter('foo');
136+
setInputValue(comboBox, 'foo');
142137
arrowDownKeyDown(input);
143138

144139
expect(getFocusedIndex()).to.equal(0);
@@ -202,15 +197,15 @@ describe('keyboard', () => {
202197
});
203198

204199
it('should clear the selection with enter when input is cleared', () => {
205-
filter('');
200+
setInputValue(comboBox, '');
206201
enterKeyDown(input);
207202

208203
expect(comboBox.value).to.eql('');
209204
});
210205

211206
it('should close the overlay with enter when custom values are allowed', () => {
212207
comboBox.allowCustomValue = true;
213-
filter('foobar');
208+
setInputValue(comboBox, 'foobar');
214209

215210
enterKeyDown(input);
216211

@@ -226,15 +221,15 @@ describe('keyboard', () => {
226221
});
227222

228223
it('should stop propagation of the keyboard enter event when input value is invalid', () => {
229-
filter('foobar');
224+
setInputValue(comboBox, 'foobar');
230225
const keydownSpy = sinon.spy();
231226
document.addEventListener('keydown', keydownSpy);
232227
enterKeyDown(input);
233228
expect(keydownSpy.called).to.be.false;
234229
});
235230

236231
it('should not close the overlay with enter when custom values are not allowed', () => {
237-
filter('foobar');
232+
setInputValue(comboBox, 'foobar');
238233

239234
enterKeyDown(input);
240235

@@ -245,7 +240,7 @@ describe('keyboard', () => {
245240
it('should revert to the custom value after filtering', () => {
246241
comboBox.allowCustomValue = true;
247242
comboBox.value = 'foobar';
248-
filter('bar');
243+
setInputValue(comboBox, 'bar');
249244
escKeyDown(input);
250245
expect(input.value).to.eql('bar');
251246
escKeyDown(input);
@@ -255,7 +250,7 @@ describe('keyboard', () => {
255250
it('should revert a non-listed value to the custom value after filtering', () => {
256251
comboBox.allowCustomValue = true;
257252
comboBox.value = 'foobar';
258-
filter('barbaz');
253+
setInputValue(comboBox, 'barbaz');
259254
escKeyDown(input);
260255
expect(input.value).to.equal('foobar');
261256
});
@@ -304,15 +299,15 @@ describe('keyboard', () => {
304299
});
305300

306301
it('should cancel typing with escape', () => {
307-
filter('baz');
302+
setInputValue(comboBox, 'baz');
308303

309304
escKeyDown(input);
310305

311306
expect(comboBox.value).to.equal('bar');
312307
});
313308

314309
it('should select typed item', () => {
315-
filter('baz');
310+
setInputValue(comboBox, 'baz');
316311

317312
enterKeyDown(input);
318313

@@ -336,7 +331,7 @@ describe('keyboard', () => {
336331
});
337332

338333
it('should not prefill the input when there are no items to navigate', () => {
339-
filter('invalid filter');
334+
setInputValue(comboBox, 'invalid filter');
340335

341336
arrowDownKeyDown(input);
342337
expect(input.value).to.eql('invalid filter');
@@ -349,7 +344,7 @@ describe('keyboard', () => {
349344
});
350345

351346
it('should revert back to filter with escape', async () => {
352-
filter('b');
347+
setInputValue(comboBox, 'b');
353348

354349
arrowDownKeyDown(input);
355350
await aTimeout(1);
@@ -359,7 +354,7 @@ describe('keyboard', () => {
359354
});
360355

361356
it('should remove selection from the input value when reverting', () => {
362-
filter('b');
357+
setInputValue(comboBox, 'b');
363358
arrowDownKeyDown(input);
364359
escKeyDown(input);
365360

@@ -418,15 +413,15 @@ describe('keyboard', () => {
418413
});
419414

420415
it('should stop propagation of the keyboard enter event when input value is invalid', () => {
421-
filter('foobar');
416+
setInputValue(comboBox, 'foobar');
422417
const keydownSpy = sinon.spy();
423418
document.addEventListener('keydown', keydownSpy);
424419
enterKeyDown(input);
425420
expect(keydownSpy.called).to.be.false;
426421
});
427422

428423
it('should not stop propagation of the keyboard enter event when input has a predefined option', async () => {
429-
filter('foo');
424+
setInputValue(comboBox, 'foo');
430425
expect(comboBox.opened).to.be.false;
431426
const keydownSpy = sinon.spy();
432427
document.addEventListener('keydown', keydownSpy);
@@ -436,7 +431,7 @@ describe('keyboard', () => {
436431

437432
it('should not stop propagation of the keyboard enter event when input has a custom value', () => {
438433
comboBox.allowCustomValue = true;
439-
filter('foobar');
434+
setInputValue(comboBox, 'foobar');
440435
const keydownSpy = sinon.spy();
441436
document.addEventListener('keydown', keydownSpy);
442437
enterKeyDown(input);
@@ -445,7 +440,7 @@ describe('keyboard', () => {
445440

446441
it('should not stop propagation of the keyboard enter event when input is empty', () => {
447442
comboBox.allowCustomValue = true;
448-
filter('');
443+
setInputValue(comboBox, '');
449444
const keydownSpy = sinon.spy();
450445
document.addEventListener('keydown', keydownSpy);
451446
enterKeyDown(input);

‎packages/combo-box/test/lazy-loading.test.js‎

Lines changed: 26 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expect } from '@esm-bundle/chai';
2-
import { aTimeout, enterKeyDown, fire, fixtureSync, nextFrame } from '@vaadin/testing-helpers';
2+
import { aTimeout, enterKeyDown, fixtureSync, nextFrame } from '@vaadin/testing-helpers';
33
import sinon from 'sinon';
44
import '@vaadin/text-field/vaadin-text-field.js';
55
import './not-animated-styles.js';
@@ -14,7 +14,8 @@ import {
1414
getSelectedItem,
1515
getViewportItems,
1616
getVisibleItemsCount,
17-
makeItems
17+
makeItems,
18+
setInputValue
1819
} from './helpers.js';
1920

2021
registerStyles(
@@ -57,15 +58,6 @@ describe('lazy loading', () => {
5758
callback(dataProviderItems, SIZE);
5859
};
5960

60-
const setInputValue = (value) => {
61-
if (comboBox.inputElement.tagName === 'IRON-INPUT') {
62-
comboBox.inputElement._initSlottedInput();
63-
comboBox.inputElement.inputElement.value = value;
64-
} else {
65-
comboBox.inputElement.value = value;
66-
}
67-
};
68-
6961
before(() => {
7062
sinon.stub(console, 'warn');
7163
});
@@ -141,8 +133,7 @@ describe('lazy loading', () => {
141133
expect(comboBox.autoOpenDisabled).to.be.true;
142134
expect(comboBox.opened).to.be.false;
143135
comboBox.dataProvider = spyDataProvider;
144-
setInputValue('item 1');
145-
fire(comboBox.inputElement, 'input');
136+
setInputValue(comboBox, 'item 1');
146137
comboBox.opened = true;
147138
expect(comboBox.filter).to.equal('item 1');
148139
const { filter } = spyDataProvider.lastCall.args[0];
@@ -351,8 +342,7 @@ describe('lazy loading', () => {
351342

352343
// FIXME: fails for combo-box-light (items are not updated)
353344
(isComboBoxLight ? it.skip : it)('should not be invoked if items are filtered', () => {
354-
setInputValue('1');
355-
fire(comboBox.inputElement, 'input');
345+
setInputValue(comboBox, '1');
356346

357347
spyDataProvider.resetHistory();
358348

@@ -414,8 +404,7 @@ describe('lazy loading', () => {
414404
comboBox.dataProvider = spyAsyncDataProvider;
415405
comboBox.opened = true;
416406

417-
setInputValue('custom value');
418-
fire(comboBox.inputElement, 'input');
407+
setInputValue(comboBox, 'custom value');
419408

420409
enterKeyDown(comboBox.inputElement);
421410
expect(comboBox.value).to.eql('custom value');
@@ -888,6 +877,7 @@ describe('lazy loading', () => {
888877

889878
describe('using data provider, lost focus before data is returned', () => {
890879
let returnedItems;
880+
891881
const bluringDataProvider = (params, callback) => {
892882
comboBox.blur();
893883
callback(returnedItems, returnedItems.length);
@@ -899,16 +889,15 @@ describe('lazy loading', () => {
899889
comboBox.opened = true;
900890
comboBox.dataProvider = bluringDataProvider;
901891
comboBox.opened = false;
902-
comboBox.focus();
892+
comboBox.inputElement.focus();
903893
});
904894

905895
it('should set value without auto-open-disabled', () => {
906896
comboBox.autoOpenDisabled = false;
907897
expect(comboBox.autoOpenDisabled).to.be.false;
908898

909-
const filterValue = 'item 12';
910-
comboBox._inputElementValue = filterValue;
911-
comboBox.filter = filterValue;
899+
setInputValue(comboBox, 'item 12');
900+
912901
expect(comboBox.opened).to.be.false;
913902
expect(comboBox.hasAttribute('focused')).to.be.false;
914903
expect(comboBox.value).to.equal('item 12');
@@ -918,9 +907,8 @@ describe('lazy loading', () => {
918907
comboBox.autoOpenDisabled = true;
919908
expect(comboBox.autoOpenDisabled).to.be.true;
920909

921-
const filterValue = 'item 12';
922-
comboBox._inputElementValue = filterValue;
923-
comboBox.filter = filterValue;
910+
setInputValue(comboBox, 'item 12');
911+
924912
expect(comboBox.opened).to.be.false;
925913
expect(comboBox.hasAttribute('focused')).to.be.false;
926914
expect(comboBox.value).to.equal('item 12');
@@ -930,9 +918,8 @@ describe('lazy loading', () => {
930918
comboBox.autoOpenDisabled = false;
931919
expect(comboBox.autoOpenDisabled).to.be.false;
932920

933-
const filterValue = 'ItEm 12';
934-
comboBox._inputElementValue = filterValue;
935-
comboBox.filter = filterValue;
921+
setInputValue(comboBox, 'ItEm 12');
922+
936923
expect(comboBox.opened).to.be.false;
937924
expect(comboBox.hasAttribute('focused')).to.be.false;
938925
expect(comboBox.value).to.equal('item 12');
@@ -942,9 +929,8 @@ describe('lazy loading', () => {
942929
comboBox.autoOpenDisabled = true;
943930
expect(comboBox.autoOpenDisabled).to.be.true;
944931

945-
const filterValue = 'iTem 12';
946-
comboBox._inputElementValue = filterValue;
947-
comboBox.filter = filterValue;
932+
setInputValue(comboBox, 'iTem 12');
933+
948934
expect(comboBox.opened).to.be.false;
949935
expect(comboBox.hasAttribute('focused')).to.be.false;
950936
expect(comboBox.value).to.equal('item 12');
@@ -953,17 +939,15 @@ describe('lazy loading', () => {
953939
it('should set first value of multiple matches that differ only in case', () => {
954940
returnedItems = ['item 12', 'IteM 12'];
955941

956-
const filterValue = 'IteM 12';
957-
comboBox._inputElementValue = filterValue;
958-
comboBox.filter = filterValue;
942+
setInputValue(comboBox, 'IteM 12');
943+
959944
expect(comboBox.opened).to.be.false;
960945
expect(comboBox.hasAttribute('focused')).to.be.false;
961946
expect(comboBox.value).to.equal('item 12');
962947
});
963948

964949
it('should keep empty value if it is not an exact match', () => {
965-
comboBox._inputElementValue = 'item';
966-
comboBox.filter = 'item';
950+
setInputValue(comboBox, 'item');
967951
expect(comboBox.opened).to.be.false;
968952
expect(comboBox.hasAttribute('focused')).to.be.false;
969953
expect(comboBox.value).to.equal('');
@@ -975,9 +959,8 @@ describe('lazy loading', () => {
975959
expect(comboBox.value).to.equal('other value');
976960

977961
returnedItems = ['item 12'];
978-
const filterValue = 'item 1';
979-
comboBox._inputElementValue = filterValue;
980-
comboBox.filter = filterValue;
962+
setInputValue(comboBox, 'item 1');
963+
981964
expect(comboBox.opened).to.be.false;
982965
expect(comboBox.hasAttribute('focused')).to.be.false;
983966
expect(comboBox.value).to.equal('other value');
@@ -986,14 +969,15 @@ describe('lazy loading', () => {
986969
it('should keep previous value if allow-custom-value is set', () => {
987970
comboBox.allowCustomValue = true;
988971
comboBox.open();
989-
setInputValue('other value');
990-
fire(comboBox.inputElement, 'input');
972+
setInputValue(comboBox, 'other value');
991973
comboBox.close();
992974
expect(comboBox.value).to.eql('other value');
993975

994976
comboBox.focus();
995-
setInputValue('item 12');
996-
comboBox.filter = 'item 12';
977+
// FIXME: fails when using `setInputValue()`
978+
const filterValue = 'item 12';
979+
comboBox.inputElement.value = filterValue;
980+
comboBox.filter = filterValue;
997981

998982
expect(comboBox.value).to.eql('other value');
999983
expect(comboBox.inputElement.value).to.eql('other value');

‎packages/combo-box/test/overlay-position.test.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { expect } from '@esm-bundle/chai';
2-
import { aTimeout, fire, fixtureSync, isIOS } from '@vaadin/testing-helpers';
2+
import { aTimeout, fixtureSync, isIOS } from '@vaadin/testing-helpers';
33
import '../src/vaadin-combo-box.js';
44
import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
5-
import { makeItems } from './helpers.js';
5+
import { makeItems, setInputValue } from './helpers.js';
66

77
class XFixed extends PolymerElement {
88
static get template() {
@@ -17,7 +17,7 @@ class XFixed extends PolymerElement {
1717
customElements.define('x-fixed', XFixed);
1818

1919
describe('overlay position', () => {
20-
let comboBox, dropdown, overlayPart, inputField, input;
20+
let comboBox, dropdown, overlayPart, inputField;
2121

2222
let wh, ww, xCenter, xStart, xEnd, yCenter, yTop, yBottom;
2323

@@ -39,7 +39,6 @@ describe('overlay position', () => {
3939
inputField = comboBox.shadowRoot.querySelector('[part="input-field"]');
4040
dropdown = comboBox.$.dropdown;
4141
overlayPart = dropdown.$.overlay.$.overlay;
42-
input = comboBox.inputElement;
4342

4443
// Subtract the combo-box size from the coordinates range in order not to
4544
// move it outside the viewport boundaries when changing top and left.
@@ -164,8 +163,7 @@ describe('overlay position', () => {
164163
it('should reposition after filtering', async () => {
165164
moveComboBox(xCenter, yBottom, 300);
166165

167-
input.value = 'item 1';
168-
fire(input, 'input');
166+
setInputValue(comboBox, 'item 1');
169167

170168
comboBox.open();
171169
await aTimeout(0);

0 commit comments

Comments
 (0)