yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(keyboard): correctly press enter on firefox (#1023)

Browse Source
This commit is contained in:
Joel Einbinder 2020-02-14 17:42:08 -08:00 committed by GitHub
parent df8de2074e
commit 21acb369db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/firefox/ffInput.ts
View File

@ -64,6 +64,9 @@ export class RawKeyboardImpl implements input.RawKeyboard {
code = 'OSLeft'; code = 'OSLeft';
if (code === 'MetaRight') if (code === 'MetaRight')
code = 'OSRight'; code = 'OSRight';
// Firefox will figure out Enter by itself
if (text === '\r')
text = '';
await this._client.send('Page.dispatchKeyEvent', { await this._client.send('Page.dispatchKeyEvent', {
type: 'keydown', type: 'keydown',
keyCode: keyCodeWithoutLocation, keyCode: keyCodeWithoutLocation,

26
test/keyboard.spec.js
View File

@ -207,15 +207,23 @@ module.exports.describe = function({testRunner, expect, FFOX, CHROMIUM, WEBKIT,
await textarea.press('NumpadSubtract'); await textarea.press('NumpadSubtract');
expect(await page.evaluate('keyLocation')).toBe(3); expect(await page.evaluate('keyLocation')).toBe(3);
}); });
it.skip(FFOX)('should press Enter', async({page, server}) => { it('should press Enter', async({page, server}) => {
await page.setContent('<input></input>'); await page.setContent('<textarea></textarea>');
await page.$eval('input', body => body.addEventListener('keydown', event => { await page.focus('textarea');
if (event.key === 'Enter') await page.evaluate(() => window.addEventListener('keydown', e => window.lastEvent = {key: e.key, code:e.code}));
window.ENTER_DOWN = true; await testEnterKey('Enter', 'Enter', 'Enter');
}, false)); await testEnterKey('NumpadEnter', 'Enter', 'NumpadEnter');
await page.focus('input'); await testEnterKey('\n', 'Enter', 'Enter');
await page.keyboard.press('Enter'); await testEnterKey('\r', 'Enter', 'Enter');
expect(await page.evaluate(() => window.ENTER_DOWN)).toBe(true);
async function testEnterKey(key, expectedKey, expectedCode) {
await page.keyboard.press(key);
const lastEvent = await page.evaluate('lastEvent');
expect(lastEvent.key).toBe(expectedKey, `${JSON.stringify(key)} had the wrong key: ${lastEvent.key}`);
expect(lastEvent.code).toBe(expectedCode, `${JSON.stringify(key)} had the wrong code: ${lastEvent.code}`);
expect(await page.$eval('textarea', t => t.value)).toBe('\n', `${JSON.stringify(key)} failed to create a newline`);
await page.$eval('textarea', t => t.value = '');
}
}); });
it('should throw on unknown keys', async({page, server}) => { it('should throw on unknown keys', async({page, server}) => {
let error = await page.keyboard.press('NotARealKey').catch(e => e); let error = await page.keyboard.press('NotARealKey').catch(e => e);