From d4f04815c27853f85895915a246475af389f5054 Mon Sep 17 00:00:00 2001 From: seaona <54408225+seaona@users.noreply.github.com> Date: Tue, 28 Mar 2023 14:59:41 +0200 Subject: [PATCH] Remove timeouts without effect (#18342) --- test/e2e/metamask-ui.spec.js | 22 +++++------- test/e2e/nft/erc721-interaction.spec.js | 4 --- test/e2e/tests/address-book.spec.js | 11 +++--- test/e2e/tests/clear-activity.spec.js | 16 ++++----- test/e2e/tests/contract-interactions.spec.js | 35 +++++++------------ test/e2e/tests/failing-contract.spec.js | 2 -- test/e2e/tests/from-import-ui.spec.js | 11 +++--- test/e2e/tests/metamask-responsive-ui.spec.js | 11 +++--- test/e2e/tests/navigate-transactions.spec.js | 33 +++++++---------- test/e2e/tests/personal-sign.spec.js | 11 +++--- test/e2e/tests/send-eth.spec.js | 13 +++---- test/e2e/tests/send-hex-address.spec.js | 2 -- 12 files changed, 60 insertions(+), 111 deletions(-) diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js index 6f3754bd8..6cc81b400 100644 --- a/test/e2e/metamask-ui.spec.js +++ b/test/e2e/metamask-ui.spec.js @@ -346,13 +346,10 @@ describe('MetaMask', function () { }); it('finds the transaction in the transactions list', async function () { - await driver.waitForSelector( - { - css: '.transaction-list__completed-transactions .transaction-list-item__primary-currency', - text: '-1 TST', - }, - { timeout: 10000 }, - ); + await driver.waitForSelector({ + css: '.transaction-list__completed-transactions .transaction-list-item__primary-currency', + text: '-1 TST', + }); await driver.waitForSelector({ css: '.list-item__heading', @@ -380,13 +377,10 @@ describe('MetaMask', function () { await driver.delay(largeDelayMs); await driver.findElements('.transaction-list__pending-transactions'); - await driver.waitForSelector( - { - css: '.transaction-list-item__primary-currency', - text: '-1.5 TST', - }, - { timeout: 10000 }, - ); + await driver.waitForSelector({ + css: '.transaction-list-item__primary-currency', + text: '-1.5 TST', + }); await driver.clickElement('.transaction-list-item__primary-currency'); await driver.delay(regularDelayMs); diff --git a/test/e2e/nft/erc721-interaction.spec.js b/test/e2e/nft/erc721-interaction.spec.js index 967c33f1e..6e9a9e959 100644 --- a/test/e2e/nft/erc721-interaction.spec.js +++ b/test/e2e/nft/erc721-interaction.spec.js @@ -59,7 +59,6 @@ describe('ERC721 NFTs testdapp interaction', function () { await driver.clickElement('[data-testid="home__activity-tab"]'); await driver.waitForSelector( '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)', - { timeout: 10000 }, ); // Verify transaction @@ -130,7 +129,6 @@ describe('ERC721 NFTs testdapp interaction', function () { await driver.clickElement('[data-testid="home__activity-tab"]'); await driver.waitForSelector( '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)', - { timeout: 10000 }, ); // Verify transaction @@ -202,7 +200,6 @@ describe('ERC721 NFTs testdapp interaction', function () { await driver.clickElement('[data-testid="home__activity-tab"]'); await driver.waitForSelector( '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)', - { timeout: 10000 }, ); // Verify transaction @@ -277,7 +274,6 @@ describe('ERC721 NFTs testdapp interaction', function () { await driver.clickElement('[data-testid="home__activity-tab"]'); await driver.waitForSelector( '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)', - { timeout: 10000 }, ); // Verify transaction diff --git a/test/e2e/tests/address-book.spec.js b/test/e2e/tests/address-book.spec.js index 9184afb04..af1214521 100644 --- a/test/e2e/tests/address-book.spec.js +++ b/test/e2e/tests/address-book.spec.js @@ -63,13 +63,10 @@ describe('Address Book', function () { return confirmedTxes.length === 1; }, 10000); - await driver.waitForSelector( - { - css: '.transaction-list-item__primary-currency', - text: '-2 ETH', - }, - { timeout: 10000 }, - ); + await driver.waitForSelector({ + css: '.transaction-list-item__primary-currency', + text: '-2 ETH', + }); }, ); }); diff --git a/test/e2e/tests/clear-activity.spec.js b/test/e2e/tests/clear-activity.spec.js index 12903510c..a16254c9c 100644 --- a/test/e2e/tests/clear-activity.spec.js +++ b/test/e2e/tests/clear-activity.spec.js @@ -34,14 +34,14 @@ describe('Clear account activity', function () { // Check send transaction and receive transaction history are all displayed await driver.clickElement('[data-testid="home__activity-tab"]'); - await driver.waitForSelector( - { css: '.list-item__title', text: 'Send' }, - { timeout: 10000 }, - ); - await driver.waitForSelector( - { css: '.list-item__title', text: 'Receive' }, - { timeout: 10000 }, - ); + await driver.waitForSelector({ + css: '.list-item__title', + text: 'Send', + }); + await driver.waitForSelector({ + css: '.list-item__title', + text: 'Receive', + }); // Clear activity and nonce data await driver.clickElement('.account-menu__icon'); diff --git a/test/e2e/tests/contract-interactions.spec.js b/test/e2e/tests/contract-interactions.spec.js index b13fe9826..dbfcd5259 100644 --- a/test/e2e/tests/contract-interactions.spec.js +++ b/test/e2e/tests/contract-interactions.spec.js @@ -63,15 +63,11 @@ describe('Deploy contract and call contract methods', function () { await driver.clickElement({ text: 'Activity', tag: 'button' }); await driver.waitForSelector( '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)', - { timeout: 10000 }, - ); - await driver.waitForSelector( - { - css: '.transaction-list-item__primary-currency', - text: '-4 ETH', - }, - { timeout: 10000 }, ); + await driver.waitForSelector({ + css: '.transaction-list-item__primary-currency', + text: '-4 ETH', + }); // calls and confirms a contract method where ETH is received await driver.switchToWindow(dapp); @@ -87,26 +83,19 @@ describe('Deploy contract and call contract methods', function () { await driver.switchToWindow(extension); await driver.waitForSelector( '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(2)', - { timeout: 10000 }, - ); - await driver.waitForSelector( - { - css: '.transaction-list-item__primary-currency', - text: '-0 ETH', - }, - { timeout: 10000 }, ); + await driver.waitForSelector({ + css: '.transaction-list-item__primary-currency', + text: '-0 ETH', + }); // renders the correct ETH balance await driver.switchToWindow(extension); const balance = await ganacheServer.getBalance(); - const balanceElement = await driver.waitForSelector( - { - css: '[data-testid="eth-overview__primary-currency"]', - text: balance, - }, - { timeout: 10000 }, - ); + const balanceElement = await driver.waitForSelector({ + css: '[data-testid="eth-overview__primary-currency"]', + text: balance, + }); assert.equal(`${balance}\nETH`, await balanceElement.getText()); }, ); diff --git a/test/e2e/tests/failing-contract.spec.js b/test/e2e/tests/failing-contract.spec.js index 3391d878e..7f0dd766e 100644 --- a/test/e2e/tests/failing-contract.spec.js +++ b/test/e2e/tests/failing-contract.spec.js @@ -71,7 +71,6 @@ describe('Failing contract interaction ', function () { await driver.clickElement({ text: 'Activity', tag: 'button' }); await driver.waitForSelector( '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)', - { timeout: 10000 }, ); // display the transaction status @@ -157,7 +156,6 @@ describe('Failing contract interaction on non-EIP1559 network', function () { await driver.clickElement({ text: 'Activity', tag: 'button' }); await driver.waitForSelector( '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)', - { timeout: 10000 }, ); // display the transaction status diff --git a/test/e2e/tests/from-import-ui.spec.js b/test/e2e/tests/from-import-ui.spec.js index e56882c05..892453c17 100644 --- a/test/e2e/tests/from-import-ui.spec.js +++ b/test/e2e/tests/from-import-ui.spec.js @@ -267,13 +267,10 @@ describe('MetaMask Import UI', function () { await driver.clickElement({ text: 'Remove', tag: 'button' }); // Wait until selected account switches away from removed account to first account - await driver.waitForSelector( - { - css: '.selected-account__name', - text: 'Account 1', - }, - { timeout: 10000 }, - ); + await driver.waitForSelector({ + css: '.selected-account__name', + text: 'Account 1', + }); await driver.delay(regularDelayMs); await driver.clickElement('.account-menu__icon'); diff --git a/test/e2e/tests/metamask-responsive-ui.spec.js b/test/e2e/tests/metamask-responsive-ui.spec.js index 36811bc38..4c83081c2 100644 --- a/test/e2e/tests/metamask-responsive-ui.spec.js +++ b/test/e2e/tests/metamask-responsive-ui.spec.js @@ -163,13 +163,10 @@ describe('MetaMask Responsive UI', function () { return confirmedTxes.length === 1; }, 10000); - await driver.waitForSelector( - { - css: '.transaction-list-item__primary-currency', - text: '-1 ETH', - }, - { timeout: 10000 }, - ); + await driver.waitForSelector({ + css: '.transaction-list-item__primary-currency', + text: '-1 ETH', + }); }, ); }); diff --git a/test/e2e/tests/navigate-transactions.spec.js b/test/e2e/tests/navigate-transactions.spec.js index 3e272838d..9a0011b34 100644 --- a/test/e2e/tests/navigate-transactions.spec.js +++ b/test/e2e/tests/navigate-transactions.spec.js @@ -136,13 +136,10 @@ describe('Navigate transactions', function () { const windowHandles = await driver.getAllWindowHandles(); const extension = windowHandles[0]; await driver.switchToWindow(extension); - navigationElement = await driver.waitForSelector( - { - css: '.confirm-page-container-navigation', - text: '2 of 5', - }, - { timeout: 10000 }, - ); + navigationElement = await driver.waitForSelector({ + css: '.confirm-page-container-navigation', + text: '2 of 5', + }); navigationText = await navigationElement.getText(); assert.equal( navigationText.includes('2 of 5'), @@ -169,13 +166,10 @@ describe('Navigate transactions', function () { // reject transaction await driver.clickElement({ text: 'Reject', tag: 'button' }); - const navigationElement = await driver.waitForSelector( - { - css: '.confirm-page-container-navigation', - text: '1 of 3', - }, - { timeout: 10000 }, - ); + const navigationElement = await driver.waitForSelector({ + css: '.confirm-page-container-navigation', + text: '1 of 3', + }); const navigationText = await navigationElement.getText(); assert.equal( navigationText.includes('1 of 3'), @@ -202,13 +196,10 @@ describe('Navigate transactions', function () { // confirm transaction await driver.clickElement({ text: 'Confirm', tag: 'button' }); - const navigationElement = await driver.waitForSelector( - { - css: '.confirm-page-container-navigation', - text: '1 of 3', - }, - { timeout: 10000 }, - ); + const navigationElement = await driver.waitForSelector({ + css: '.confirm-page-container-navigation', + text: '1 of 3', + }); const navigationText = await navigationElement.getText(); assert.equal( navigationText.includes('1 of 3'), diff --git a/test/e2e/tests/personal-sign.spec.js b/test/e2e/tests/personal-sign.spec.js index 1a6d904f2..86f798c67 100644 --- a/test/e2e/tests/personal-sign.spec.js +++ b/test/e2e/tests/personal-sign.spec.js @@ -57,13 +57,10 @@ describe('Personal sign', function () { const verifySigUtil = await driver.findElement( '#personalSignVerifySigUtilResult', ); - const verifyECRecover = await driver.waitForSelector( - { - css: '#personalSignVerifyECRecoverResult', - text: publicAddress, - }, - { timeout: 10000 }, - ); + const verifyECRecover = await driver.waitForSelector({ + css: '#personalSignVerifyECRecoverResult', + text: publicAddress, + }); assert.equal(await verifySigUtil.getText(), publicAddress); assert.equal(await verifyECRecover.getText(), publicAddress); }, diff --git a/test/e2e/tests/send-eth.spec.js b/test/e2e/tests/send-eth.spec.js index d5005dcf3..dbe952963 100644 --- a/test/e2e/tests/send-eth.spec.js +++ b/test/e2e/tests/send-eth.spec.js @@ -196,13 +196,10 @@ describe('Send ETH from inside MetaMask using advanced gas modal', function () { return confirmedTxes.length === 1; }, 10000); - await driver.waitForSelector( - { - css: '.transaction-list-item__primary-currency', - text: '-1 ETH', - }, - { timeout: 10000 }, - ); + await driver.waitForSelector({ + css: '.transaction-list-item__primary-currency', + text: '-1 ETH', + }); }, ); }); @@ -275,7 +272,6 @@ describe('Send ETH from dapp using advanced gas controls', function () { await driver.clickElement('[data-testid="home__activity-tab"]'); await driver.waitForSelector( '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)', - { timeout: 10000 }, ); await driver.waitForSelector({ css: '.transaction-list-item__primary-currency', @@ -345,7 +341,6 @@ describe('Send ETH from dapp using advanced gas controls', function () { await driver.clickElement('[data-testid="home__activity-tab"]'); await driver.waitForSelector( '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)', - { timeout: 10000 }, ); await driver.waitForSelector({ css: '.transaction-list-item__primary-currency', diff --git a/test/e2e/tests/send-hex-address.spec.js b/test/e2e/tests/send-hex-address.spec.js index 3e03dfd31..08d7b2c1d 100644 --- a/test/e2e/tests/send-hex-address.spec.js +++ b/test/e2e/tests/send-hex-address.spec.js @@ -168,7 +168,6 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () { await driver.clickElement('[data-testid="home__activity-tab"]'); await driver.waitForSelector( '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)', - { timeout: 10000 }, ); const sendTransactionListItem = await driver.waitForSelector( '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)', @@ -234,7 +233,6 @@ describe('Send ERC20 to a 40 character hexadecimal address', function () { await driver.clickElement('[data-testid="home__activity-tab"]'); await driver.waitForSelector( '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)', - { timeout: 10000 }, ); const sendTransactionListItem = await driver.waitForSelector( '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',