thunderstrike/puppeteer
thunderstrike/puppeteer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Page): fix Page.select() behavior to be on par with docs (#1886)

Browse Source 
This PR fixes lost functionality that is no longer on-par with the documentation for `Page.select`, namely:

> `...values` <...string> Values of options to select. If the `<select>` has the `multiple` attribute, all values are considered, **otherwise only the first one is taken into account**.

I've also added an accompanying test for this use case.
This commit is contained in:
Alix Axel 2018-01-25 06:12:27 +01:00 committed by Andrey Lushnikov
parent a39d96eae9
commit 5175d8e692
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/FrameManager.js
View File

@ -542,17 +542,20 @@ class Frame {
* @param {!Array<string>} values * @param {!Array<string>} values
* @return {!Promise<!Array<string>>} * @return {!Promise<!Array<string>>}
*/ */
async select(selector, ...values){ select(selector, ...values){
for (const value of values) for (const value of values)
console.assert(helper.isString(value), 'Values must be strings. Found value "' + value + '" of type "' + (typeof value) + '"'); console.assert(helper.isString(value), 'Values must be strings. Found value "' + value + '" of type "' + (typeof value) + '"');
return await this.$eval(selector, (element, values) => { return this.$eval(selector, (element, values) => {
if (element.nodeName.toLowerCase() !== 'select') if (element.nodeName.toLowerCase() !== 'select')
throw new Error('Element is not a <select> element.'); throw new Error('Element is not a <select> element.');
const options = Array.from(element.options); const options = Array.from(element.options);
element.value = undefined; element.value = undefined;
for (const option of options) for (const option of options) {
option.selected = values.includes(option.value); option.selected = values.includes(option.value);
if (option.selected && !element.multiple)
break;
}
element.dispatchEvent(new Event('input', { 'bubbles': true })); element.dispatchEvent(new Event('input', { 'bubbles': true }));
element.dispatchEvent(new Event('change', { 'bubbles': true })); element.dispatchEvent(new Event('change', { 'bubbles': true }));
return options.filter(option => option.selected).map(option => option.value); return options.filter(option => option.selected).map(option => option.value);

6
test/test.js
View File

@ -3142,6 +3142,12 @@ describe('Page', function() {
expect(await page.evaluate(() => result.onInput)).toEqual(['blue']); expect(await page.evaluate(() => result.onInput)).toEqual(['blue']);
expect(await page.evaluate(() => result.onChange)).toEqual(['blue']); expect(await page.evaluate(() => result.onChange)).toEqual(['blue']);
}); });
it('should select only first option', async({page, server}) => {
await page.goto(server.PREFIX + '/input/select.html');
await page.select('select', 'blue', 'green', 'red');
expect(await page.evaluate(() => result.onInput)).toEqual(['blue']);
expect(await page.evaluate(() => result.onChange)).toEqual(['blue']);
});
it('should select multiple options', async({page, server}) => { it('should select multiple options', async({page, server}) => {
await page.goto(server.PREFIX + '/input/select.html'); await page.goto(server.PREFIX + '/input/select.html');
await page.evaluate(() => makeMultiple()); await page.evaluate(() => makeMultiple());