scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-03-23 19:30:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions2

test: add scrolling support to clickXpath to fix comments test

Browse source
This commit is contained in:
Christopher Willis-Ford 2023-09-21 15:44:03 -07:00
parent 310fce63fe
commit 876e2deb97
2 changed files with 34 additions and 9 deletions

3
test/integration/comments.test.js
View file

@ -256,8 +256,7 @@ describe('comment tests', () => {
await composeBox.sendKeys(projectReply);
// click post
const postButton = await findByXpath(`${replyRow}//button[@class = "button compose-post"]`);
await postButton.click();
await clickXpath(`${replyRow}//button[@class = "button compose-post"]`);
const postedReply = await findByXpath(`//span[contains(text(), "${projectReply}")]`);
const commentVisible = await postedReply.isDisplayed();

40
test/integration/selenium-helpers.js
View file

@ -279,22 +279,48 @@ class SeleniumHelper {
/**
* @param {string} xpath Wait until an element at the provided xpath is clickable.
* @param {boolean} [allowScrolling] Whether or not to allow page scrolling to reach the element.
* @returns {Promise<webdriver.WebElement>} A promise that resolves to the clickable element.
*/
waitUntilClickable (xpath) {
waitUntilClickable (xpath, allowScrolling = true) {
// @ts-ignore - TS can't tell that `driver.wait()` called this way will never return `undefined`.
return this.driver.wait(async () => {
const elementAtPath = await this.findByXpath(xpath);
if (!elementAtPath) {
return;
}
const rect = await elementAtPath.getRect();
const x = rect.x + (rect.width / 2);
const y = rect.y + (rect.height / 2);
if (allowScrolling) {
await this.driver.executeScript(
`
const element = arguments[0];
const boundingRect = element.getBoundingClientRect();
boundingRect.windowWidth = window.innerWidth;
boundingRect.windowHeight = window.innerHeight;
if (boundingRect.top < 0 || boundingRect.bottom > window.innerHeight ||
boundingRect.left < 0 || boundingRect.right > window.innerWidth)
{
boundingRect.scrollIntoView = true;
element.scrollIntoView({
behavior: 'instant',
block:'nearest',
inline: 'nearest'
});
}
`,
elementAtPath
);
}
const elementAtPoint = await this.driver.executeScript(
'return document.elementFromPoint(arguments[0], arguments[1])',
x,
y
`
const rect = arguments[0].getBoundingClientRect();
return document.elementFromPoint(
rect.x + rect.width / 2,
rect.y + rect.height / 2
);
`,
elementAtPath
);
if (!elementAtPoint) {
return;