Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: use locators in Puppeteer extensions #569

Merged
merged 3 commits into from
Jul 4, 2023
Merged

feat: use locators in Puppeteer extensions #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e63865
feat: use locators in the Puppeteer extensions
OrKoN Jun 13, 2023
0662e6e
fix: use isIdentifier=true
OrKoN Jul 3, 2023
9619045
feat: update the stringify extension
OrKoN Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 53 additions & 56 deletions __snapshots__/LighthouseStringifyExtension.test.ts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
exports['LighthouseStringifyExtension handles ending timespan 1'] = `
const fs = require('fs');
const puppeteer = require('puppeteer'); // v19.11.1 or later
const puppeteer = require('puppeteer'); // v20.7.4 or later

(async () => {
const browser = await puppeteer.launch({headless: 'new'});
Expand All @@ -27,30 +27,27 @@ const puppeteer = require('puppeteer'); // v19.11.1 or later
{
const targetPage = page;
const promises = [];
promises.push(targetPage.waitForNavigation());
const startWaitingForEvents = () => {
promises.push(targetPage.waitForNavigation());
}
startWaitingForEvents();
await targetPage.goto('https://example.com');
await Promise.all(promises);
}
await lhFlow.endNavigation();
await lhFlow.startTimespan();
{
const targetPage = page;
await scrollIntoViewIfNeeded([
[
'#button'
]
], targetPage, timeout);
const element = await waitForSelectors([
[
'#button'
]
], targetPage, { timeout, visible: true });
await element.click({
offset: {
x: 61,
y: 13.5625,
},
});
await puppeteer.Locator.race([
targetPage.locator('#button')
])
.setTimeout(timeout)
.click({
offset: {
x: 61,
y: 13.5625,
},
});
}
await lhFlow.endTimespan();
const lhFlowReport = await lhFlow.generateReport();
Expand All @@ -61,7 +58,7 @@ const puppeteer = require('puppeteer'); // v19.11.1 or later

exports['LighthouseStringifyExtension handles ending navigation 1'] = `
const fs = require('fs');
const puppeteer = require('puppeteer'); // v19.11.1 or later
const puppeteer = require('puppeteer'); // v20.7.4 or later

(async () => {
const browser = await puppeteer.launch({headless: 'new'});
Expand All @@ -88,37 +85,37 @@ const puppeteer = require('puppeteer'); // v19.11.1 or later
{
const targetPage = page;
const promises = [];
promises.push(targetPage.waitForNavigation());
const startWaitingForEvents = () => {
promises.push(targetPage.waitForNavigation());
}
startWaitingForEvents();
await targetPage.goto('https://example.com');
await Promise.all(promises);
}
await lhFlow.endNavigation();
await lhFlow.startTimespan();
{
const targetPage = page;
await scrollIntoViewIfNeeded([
[
'#button'
]
], targetPage, timeout);
const element = await waitForSelectors([
[
'#button'
]
], targetPage, { timeout, visible: true });
await element.click({
offset: {
x: 61,
y: 13.5625,
},
});
await puppeteer.Locator.race([
targetPage.locator('#button')
])
.setTimeout(timeout)
.click({
offset: {
x: 61,
y: 13.5625,
},
});
}
await lhFlow.endTimespan();
await lhFlow.startNavigation();
{
const targetPage = page;
const promises = [];
promises.push(targetPage.waitForNavigation());
const startWaitingForEvents = () => {
promises.push(targetPage.waitForNavigation());
}
startWaitingForEvents();
await targetPage.goto('https://example.com/page/');
await Promise.all(promises);
}
Expand All @@ -133,7 +130,7 @@ exports[
'LighthouseStringifyExtension handles multiple sequential navigations 1'
] = `
const fs = require('fs');
const puppeteer = require('puppeteer'); // v19.11.1 or later
const puppeteer = require('puppeteer'); // v20.7.4 or later

(async () => {
const browser = await puppeteer.launch({headless: 'new'});
Expand All @@ -160,7 +157,10 @@ const puppeteer = require('puppeteer'); // v19.11.1 or later
{
const targetPage = page;
const promises = [];
promises.push(targetPage.waitForNavigation());
const startWaitingForEvents = () => {
promises.push(targetPage.waitForNavigation());
}
startWaitingForEvents();
await targetPage.goto('https://example.com');
await Promise.all(promises);
}
Expand All @@ -169,23 +169,20 @@ const puppeteer = require('puppeteer'); // v19.11.1 or later
{
const targetPage = page;
const promises = [];
promises.push(targetPage.waitForNavigation());
await scrollIntoViewIfNeeded([
[
'#link'
]
], targetPage, timeout);
const element = await waitForSelectors([
[
'#link'
]
], targetPage, { timeout, visible: true });
await element.click({
offset: {
x: 61,
y: 13.5625,
},
});
const startWaitingForEvents = () => {
promises.push(targetPage.waitForNavigation());
}
await puppeteer.Locator.race([
targetPage.locator('#link')
])
.setTimeout(timeout)
.on('action', () => startWaitingForEvents())
.click({
offset: {
x: 61,
y: 13.5625,
},
});
await Promise.all(promises);
}
await lhFlow.endNavigation();
Expand Down
133 changes: 44 additions & 89 deletions __snapshots__/PuppeteerStringifyExtension.test.ts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,16 @@ exports[
] = `
{
const targetPage = page;
await scrollIntoViewIfNeeded([
'aria/Test'
], targetPage, timeout);
const element = await waitForSelectors([
'aria/Test'
], targetPage, { timeout, visible: true });
await element.click({
offset: {
x: 1,
y: 1,
},
});
await puppeteer.Locator.race([
targetPage.locator('::-p-aria(Test)')
])
.setTimeout(timeout)
.click({
offset: {
x: 1,
y: 1,
},
});
}

`;
Expand All @@ -25,19 +23,20 @@ exports[
{
const targetPage = page;
const promises = [];
promises.push(targetPage.waitForNavigation());
await scrollIntoViewIfNeeded([
'aria/Test'
], targetPage, timeout);
const element = await waitForSelectors([
'aria/Test'
], targetPage, { timeout, visible: true });
await element.click({
offset: {
x: 1,
y: 1,
},
});
const startWaitingForEvents = () => {
promises.push(targetPage.waitForNavigation());
}
await puppeteer.Locator.race([
targetPage.locator('::-p-aria(Test)')
])
.setTimeout(timeout)
.on('action', () => startWaitingForEvents())
.click({
offset: {
x: 1,
y: 1,
},
});
await Promise.all(promises);
}

Expand All @@ -48,24 +47,16 @@ exports[
] = `
{
const targetPage = page;
await scrollIntoViewIfNeeded([
[
'aria/Test',
'aria/Test2'
]
], targetPage, timeout);
const element = await waitForSelectors([
[
'aria/Test',
'aria/Test2'
]
], targetPage, { timeout, visible: true });
await element.click({
offset: {
x: 1,
y: 1,
},
});
await puppeteer.Locator.race([
targetPage.locator('::-p-aria(Test) >>>> ::-p-aria(Test2)')
])
.setTimeout(timeout)
.click({
offset: {
x: 1,
y: 1,
},
});
}

`;
Expand All @@ -75,29 +66,11 @@ exports[
] = `
{
const targetPage = page;
await scrollIntoViewIfNeeded([
'aria/Test'
], targetPage, timeout);
const element = await waitForSelectors([
'aria/Test'
], targetPage, { timeout, visible: true });
const inputType = await element.evaluate(el => el.type);
if (inputType === 'select-one') {
await changeSelectElement(element, 'Hello World')
} else if ([
'textarea',
'text',
'url',
'tel',
'search',
'password',
'number',
'email'
].includes(inputType)) {
await typeIntoElement(element, 'Hello World');
} else {
await changeElementValue(element, 'Hello World');
}
await puppeteer.Locator.race([
targetPage.locator('::-p-aria(Test)')
])
.setTimeout(timeout)
.fill('Hello World');
}

`;
Expand All @@ -107,29 +80,11 @@ exports[
] = `
{
const targetPage = page;
await scrollIntoViewIfNeeded([
'aria/Test'
], targetPage, timeout);
const element = await waitForSelectors([
'aria/Test'
], targetPage, { timeout, visible: true });
const inputType = await element.evaluate(el => el.type);
if (inputType === 'select-one') {
await changeSelectElement(element, '#333333')
} else if ([
'textarea',
'text',
'url',
'tel',
'search',
'password',
'number',
'email'
].includes(inputType)) {
await typeIntoElement(element, '#333333');
} else {
await changeElementValue(element, '#333333');
}
await puppeteer.Locator.race([
targetPage.locator('::-p-aria(Test)')
])
.setTimeout(timeout)
.fill('#333333');
}

`;
53 changes: 53 additions & 0 deletions __snapshots__/SchemaUtils.test.ts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
exports[
'SchemaUtils Selectors selectorToPElementSelector should convert .cls > div #id 1'
] = `
.cls > div #id
`;

exports[
'SchemaUtils Selectors selectorToPElementSelector should convert .cls > div #id,.cls > div #id 1'
] = `
.cls > div #id >>>> .cls > div #id
`;

exports[
'SchemaUtils Selectors selectorToPElementSelector should convert text/my text ("my text") 1'
] = `
::-p-text(my\\ text\\ \\(\\"my\\ text\\"\\))
`;

exports[
'SchemaUtils Selectors selectorToPElementSelector should convert text/my text ("my text"),aria/Test my test[role="button"] 1'
] = `
::-p-text(my\\ text\\ \\(\\"my\\ text\\"\\)) >>>> ::-p-aria(Test\\ my\\ test\\[role\\=\\"button\\"\\])
`;

exports[
'SchemaUtils Selectors selectorToPElementSelector should convert text/my) 1'
] = `
::-p-text(my\\))
`;

exports[
'SchemaUtils Selectors selectorToPElementSelector should convert text/my() 1'
] = `
::-p-text(my\\(\\))
`;

exports[
'SchemaUtils Selectors selectorToPElementSelector should convert text/" 1'
] = `
::-p-text(\\")
`;

exports[
"SchemaUtils Selectors selectorToPElementSelector should convert text/' 1"
] = `
::-p-text(\\')
`;

exports[
'SchemaUtils Selectors selectorToPElementSelector should convert xpath///*[@id="id"] 1'
] = `
::-p-xpath(\\/\\/\\*\\[\\@id\\=\\"id\\"\\])
`;
Loading