github/puppeteer
0
0
Fork 0
mirror of https://github.com/puppeteer/puppeteer synced 2024-06-14 14:02:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Page.select): assert all values are of type "string". (#1280)

Browse Source 
This patch starts asserting that all values are of type "string".

The alternative approach to cast values to strings
might yield a hard-to-debug errors.

Fixes #1276.
This commit is contained in:
Andrey Lushnikov 2017-11-03 19:20:12 -07:00 committed by GitHub
parent 03fefb53f8
commit 5e154dc835
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/FrameManager.js
View File

@ -418,6 +418,8 @@ class Frame {
* @return {!Promise<!Array<string>>} * @return {!Promise<!Array<string>>}
*/ */
async select(selector, ...values){ async select(selector, ...values){
for (const value of values)
console.assert(helper.isString(value), 'Values must be strings. Found value "' + value + '" of type "' + (typeof value) + '"');
return await this.$eval(selector, (element, values) => { return await 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.');

20
test/test.js
View File

@ -2763,7 +2763,6 @@ 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 multiple options', SX(async function() { it('should select multiple options', SX(async function() {
await page.goto(PREFIX + '/input/select.html'); await page.goto(PREFIX + '/input/select.html');
await page.evaluate(() => makeMultiple()); await page.evaluate(() => makeMultiple());
@ -2771,46 +2770,39 @@ describe('Page', function() {
expect(await page.evaluate(() => result.onInput)).toEqual(['blue', 'green', 'red']); expect(await page.evaluate(() => result.onInput)).toEqual(['blue', 'green', 'red']);
expect(await page.evaluate(() => result.onChange)).toEqual(['blue', 'green', 'red']); expect(await page.evaluate(() => result.onChange)).toEqual(['blue', 'green', 'red']);
})); }));
it('should respect event bubbling', SX(async function() { it('should respect event bubbling', SX(async function() {
await page.goto(PREFIX + '/input/select.html'); await page.goto(PREFIX + '/input/select.html');
await page.select('select', 'blue'); await page.select('select', 'blue');
expect(await page.evaluate(() => result.onBubblingInput)).toEqual(['blue']); expect(await page.evaluate(() => result.onBubblingInput)).toEqual(['blue']);
expect(await page.evaluate(() => result.onBubblingChange)).toEqual(['blue']); expect(await page.evaluate(() => result.onBubblingChange)).toEqual(['blue']);
})); }));
it('should throw when element is not a <select>', SX(async function() { it('should throw when element is not a <select>', SX(async function() {
let error = null; let error = null;
await page.goto(PREFIX + '/input/select.html'); await page.goto(PREFIX + '/input/select.html');
await page.select('body', '').catch(e => error = e); await page.select('body', '').catch(e => error = e);
expect(error.message).toContain('Element is not a <select> element.'); expect(error.message).toContain('Element is not a <select> element.');
})); }));
it('should return [] on no matched values', SX(async function() { it('should return [] on no matched values', SX(async function() {
await page.goto(PREFIX + '/input/select.html'); await page.goto(PREFIX + '/input/select.html');
const result = await page.select('select','42','abc'); const result = await page.select('select','42','abc');
expect(result).toEqual([]); expect(result).toEqual([]);
})); }));
it('should return an array of matched values', SX(async function() { it('should return an array of matched values', SX(async function() {
await page.goto(PREFIX + '/input/select.html'); await page.goto(PREFIX + '/input/select.html');
await page.evaluate(() => makeMultiple()); await page.evaluate(() => makeMultiple());
const result = await page.select('select','blue','black','magenta'); const result = await page.select('select','blue','black','magenta');
expect(result.reduce((accumulator,current) => ['blue', 'black', 'magenta'].includes(current) && accumulator, true)).toEqual(true); expect(result.reduce((accumulator,current) => ['blue', 'black', 'magenta'].includes(current) && accumulator, true)).toEqual(true);
})); }));
it('should return an array of one element when multiple is not set', SX(async function() { it('should return an array of one element when multiple is not set', SX(async function() {
await page.goto(PREFIX + '/input/select.html'); await page.goto(PREFIX + '/input/select.html');
const result = await page.select('select','42','blue','black','magenta'); const result = await page.select('select','42','blue','black','magenta');
expect(result.length).toEqual(1); expect(result.length).toEqual(1);
})); }));
it('should return [] on no values',SX(async function() { it('should return [] on no values',SX(async function() {
await page.goto(PREFIX + '/input/select.html'); await page.goto(PREFIX + '/input/select.html');
const result = await page.select('select'); const result = await page.select('select');
expect(result).toEqual([]); expect(result).toEqual([]);
})); }));
it('should deselect all options when passed no values for a multiple select',SX(async function() { it('should deselect all options when passed no values for a multiple select',SX(async function() {
await page.goto(PREFIX + '/input/select.html'); await page.goto(PREFIX + '/input/select.html');
await page.evaluate(() => makeMultiple()); await page.evaluate(() => makeMultiple());
@ -2818,14 +2810,22 @@ describe('Page', function() {
await page.select('select'); await page.select('select');
expect(await page.$eval('select', select => Array.from(select.options).every(option => !option.selected))).toEqual(true); expect(await page.$eval('select', select => Array.from(select.options).every(option => !option.selected))).toEqual(true);
})); }));
it('should deselect all options when passed no values for a select without multiple',SX(async function() { it('should deselect all options when passed no values for a select without multiple',SX(async function() {
await page.goto(PREFIX + '/input/select.html'); await page.goto(PREFIX + '/input/select.html');
await page.select('select','blue','black','magenta'); await page.select('select','blue','black','magenta');
await page.select('select'); await page.select('select');
expect(await page.$eval('select', select => Array.from(select.options).every(option => !option.selected))).toEqual(true); expect(await page.$eval('select', select => Array.from(select.options).every(option => !option.selected))).toEqual(true);
})); }));
it('should throw if passed in non-strings', SX(async function() {
await page.setContent('<select><option value="12"/></select>');
let error = null;
try {
await page.select('select', 12);
} catch (e) {
error = e;
}
expect(error.message).toContain('Values must be strings');
}));
}); });
describe('Tracing', function() { describe('Tracing', function() {