Skip to content

Commit

Permalink
test: fix flaky erc1155 set approval for all tests (#29467)
Browse files Browse the repository at this point in the history
<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Fixes the flkay set approval for all tests.
Also improved the click element retry logic to also include
ElementClickInterceptedError and ElementNotInteractableError.

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/29467?quickstart=1)

## **Related issues**

Fixes:
[#28816](#28816)

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
  • Loading branch information
pnarayanaswamy authored Jan 16, 2025
1 parent e825061 commit fd6b180
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"FONTCONFIG",
"hardfork",
"hexstring",
"Interactable",
"jazzicon",
"keccak",
"lavadome",
Expand All @@ -69,6 +70,7 @@
"pipefail",
"quickstart",
"recompiles",
"retryable",
"shellcheck",
"SIWE",
"sourcemaps",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ async function createTransactionAssertDetailsAndConfirm(
const testDapp = new TestDapp(driver);

await testDapp.openTestDappPage({ contractAddress, url: DAPP_URL });
await driver.switchToWindowWithTitle(WINDOW_TITLES.TestDApp);
await testDapp.clickERC1155SetApprovalForAllButton();

await driver.switchToWindowWithTitle(WINDOW_TITLES.Dialog);
Expand Down
16 changes: 12 additions & 4 deletions test/e2e/webdriver/driver.js
Original file line number Diff line number Diff line change
Expand Up @@ -609,10 +609,18 @@ class Driver {
await element.click();
return;
} catch (error) {
if (
error.name === 'StaleElementReferenceError' &&
attempt < retries - 1
) {
const retryableErrors = [
'StaleElementReferenceError',
'ElementClickInterceptedError',
'ElementNotInteractableError',
];

if (retryableErrors.includes(error.name) && attempt < retries - 1) {
console.warn(
`Retrying click (attempt ${attempt + 1}/${retries}) due to: ${
error.name
}`,
);
await this.delay(1000);
} else {
throw error;
Expand Down

0 comments on commit fd6b180

Please sign in to comment.