kyfx
/
playwright
mirror of https://github.com/microsoft/playwright.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "fix(codegen): fix unselect issue (#32127)" (#33065) 

This reverts commit 5121b19ac6.

The tree is red and fixing seems non-trivial.

Closes https://github.com/microsoft/playwright/issues/33064
Closes https://github.com/microsoft/playwright/pull/33060
This commit is contained in:
Max Schmitt 2024-10-11 16:33:17 +02:00 committed by GitHub
parent b9cce598dd
commit 87624c5434
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/playwright-core/src/server/codegen/java.ts
View File

@ -122,7 +122,7 @@ export class JavaLanguageGenerator implements LanguageGenerator {
case 'navigate':
return `${subject}.navigate(${quote(action.url)});`;
case 'select':
return `${subject}.${this._asLocator(action.selector, inFrameLocator)}.selectOption(${formatSelectOption(action.options.length === 1 ? action.options[0] : action.options)});`;
return `${subject}.${this._asLocator(action.selector, inFrameLocator)}.selectOption(${formatSelectOption(action.options.length > 1 ? action.options : action.options[0])});`;
case 'assertText':
return `assertThat(${subject}.${this._asLocator(action.selector, inFrameLocator)}).${action.substring ? 'containsText' : 'hasText'}(${quote(action.text)});`;
case 'assertChecked':

2
packages/playwright-core/src/server/codegen/javascript.ts
View File

@ -106,7 +106,7 @@ export class JavaScriptLanguageGenerator implements LanguageGenerator {
case 'navigate':
return `await ${subject}.goto(${quote(action.url)});`;
case 'select':
return `await ${subject}.${this._asLocator(action.selector)}.selectOption(${formatObject(action.options.length === 1 ? action.options[0] : action.options)});`;
return `await ${subject}.${this._asLocator(action.selector)}.selectOption(${formatObject(action.options.length > 1 ? action.options : action.options[0])});`;
case 'assertText':
return `${this._isTest ? '' : '// '}await expect(${subject}.${this._asLocator(action.selector)}).${action.substring ? 'toContainText' : 'toHaveText'}(${quote(action.text)});`;
case 'assertChecked':

89
tests/library/inspector/cli-codegen-1.spec.ts
View File

@ -15,7 +15,7 @@
*/
import { test, expect } from './inspectorTest';
import type { ConsoleMessage, Locator } from 'playwright';
import type { ConsoleMessage } from 'playwright';
test.describe('cli codegen', () => {
test.skip(({ mode }) => mode !== 'default');
@ -682,93 +682,6 @@ await page.Locator(\"#age\").SelectOptionAsync(new[] { \"2\" });`);
expect(message.text()).toBe('2');
});
const clickMultipleSelectOption = async (locator: Locator, withCtrlOrMeta = false) => {
const page = locator.page();
// Webkit can't click multiple select options
// https://github.com/microsoft/playwright/issues/32126
if (page.context().browser().browserType().name() === 'webkit') {
const elem = await locator.elementHandle();
const rect = await elem!.evaluate(e => {
return e.getBoundingClientRect()!;
});
if (withCtrlOrMeta)
await page.keyboard.down('ControlOrMeta');
await page.mouse.click(rect.x + rect.width / 2, rect.y + rect.height / 2);
if (withCtrlOrMeta)
await page.keyboard.up('ControlOrMeta');
} else {
await locator.click({ modifiers: withCtrlOrMeta ? ['ControlOrMeta'] : [] });
}
};
test('should select with multiple attribute', async ({ openRecorder }) => {
const { page, recorder } = await openRecorder();
await recorder.setContentAndWait(`<select id="age" multiple onchange="console.log('[' + [...age.selectedOptions].map(x => x.value).join(',') + ']')"><option value="1">1</option><option value="2">2</option></select>`);
const locator = await recorder.hoverOverElement('select');
expect(locator).toBe(`locator('#age')`);
await clickMultipleSelectOption(page.getByRole('option', { name: '1' }));
const [message, sources] = await Promise.all([
page.waitForEvent('console', msg => msg.type() !== 'error' && msg.text().includes('2')),
recorder.waitForOutput('JavaScript', 'selectOption(['),
clickMultipleSelectOption(page.getByRole('option', { name: '2' }), true)
]);
expect(sources.get('JavaScript')!.text).toContain(`
await page.locator('#age').selectOption(['1', '2']);`);
expect(sources.get('Java')!.text).toContain(`
page.locator("#age").selectOption(new String[] {"1", "2"});`);
expect(sources.get('Python')!.text).toContain(`
page.locator("#age").select_option(["1", "2"])`);
expect(sources.get('Python Async')!.text).toContain(`
await page.locator("#age").select_option(["1", "2"])`);
expect(sources.get('C#')!.text).toContain(`
await page.Locator("#age").SelectOptionAsync(new[] { "1", "2" });`);
expect(message.text()).toBe('[1,2]');
});
test('should unselect with multiple attribute', async ({ openRecorder }) => {
const { page, recorder } = await openRecorder();
await recorder.setContentAndWait(`<select id="age" multiple onchange="console.log('[' + [...age.selectedOptions].map(x => x.value).join(',') + ']')"><option value="1">1</option><option value="2">2</option></select>`);
const locator = await recorder.hoverOverElement('select');
expect(locator).toBe(`locator('#age')`);
await clickMultipleSelectOption(page.getByRole('option', { name: '1' }));
const [message, sources] = await Promise.all([
page.waitForEvent('console', msg => msg.type() !== 'error' && msg.text() === '[]'),
recorder.waitForOutput('JavaScript', 'selectOption(['),
clickMultipleSelectOption(page.getByRole('option', { name: '1' }), true)
]);
expect(sources.get('JavaScript')!.text).toContain(`
await page.locator('#age').selectOption([]);`);
expect(sources.get('Java')!.text).toContain(`
page.locator("#age").selectOption(new String[0]);`);
expect(sources.get('Python')!.text).toContain(`
page.locator("#age").select_option([])`);
expect(sources.get('Python Async')!.text).toContain(`
await page.locator("#age").select_option([])`);
expect(sources.get('C#')!.text).toContain(`
await page.Locator("#age").SelectOptionAsync(new[] { });`);
expect(message.text()).toBe('[]');
});
test('should await popup', async ({ openRecorder }) => {
const { page, recorder } = await openRecorder();
await recorder.setContentAndWait('<a target=_blank rel=noopener href="about:blank">link</a>');