From 9bfa84fc5a3b70b0e90d12eb1f908b39a8c7f4fa Mon Sep 17 00:00:00 2001 From: Bartek Date: Thu, 19 Dec 2024 18:10:27 +0100 Subject: [PATCH] fix --- .../tests/e2e/specs/batchDeposit.cy.ts | 4 ++-- .../tests/e2e/specs/depositERC20.cy.ts | 2 +- .../tests/e2e/specs/withdrawERC20.cy.ts | 4 ++-- .../tests/e2e/specs/withdrawNativeToken.cy.ts | 4 ++-- packages/arb-token-bridge-ui/tests/support/commands.ts | 10 ++++++++-- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/packages/arb-token-bridge-ui/tests/e2e/specs/batchDeposit.cy.ts b/packages/arb-token-bridge-ui/tests/e2e/specs/batchDeposit.cy.ts index 6319838063..2848a898e9 100644 --- a/packages/arb-token-bridge-ui/tests/e2e/specs/batchDeposit.cy.ts +++ b/packages/arb-token-bridge-ui/tests/e2e/specs/batchDeposit.cy.ts @@ -143,7 +143,7 @@ describe('Batch Deposit', () => { cy.waitUntil(() => cy.findTransactionInTransactionHistory(txData), { errorMsg: 'Could not find settled ERC20 Batch Deposit transaction', - timeout: 60_000, + timeout: 120_000, interval: 500 }) @@ -253,7 +253,7 @@ describe('Batch Deposit', () => { cy.waitUntil(() => cy.findTransactionInTransactionHistory(txData), { errorMsg: 'Could not find settled ERC20 Batch Deposit transaction', - timeout: 60_000, + timeout: 120_000, interval: 500 }) diff --git a/packages/arb-token-bridge-ui/tests/e2e/specs/depositERC20.cy.ts b/packages/arb-token-bridge-ui/tests/e2e/specs/depositERC20.cy.ts index 8e1a2c6e43..970c934803 100644 --- a/packages/arb-token-bridge-ui/tests/e2e/specs/depositERC20.cy.ts +++ b/packages/arb-token-bridge-ui/tests/e2e/specs/depositERC20.cy.ts @@ -160,7 +160,7 @@ describe('Deposit Token', () => { }), { errorMsg: 'Could not find settled ERC20 Deposit transaction', - timeout: 60_000, + timeout: 120_000, interval: 500 } ) diff --git a/packages/arb-token-bridge-ui/tests/e2e/specs/withdrawERC20.cy.ts b/packages/arb-token-bridge-ui/tests/e2e/specs/withdrawERC20.cy.ts index e75600cfe4..6eb9929e57 100644 --- a/packages/arb-token-bridge-ui/tests/e2e/specs/withdrawERC20.cy.ts +++ b/packages/arb-token-bridge-ui/tests/e2e/specs/withdrawERC20.cy.ts @@ -103,7 +103,7 @@ describe('Withdraw ERC20 Token', () => { }) context('should show clickable withdraw button', () => { - cy.startTransfer() + cy.startTransfer({ confirmMetamaskTransaction: false }) }) context('should withdraw successfully', () => { @@ -218,7 +218,7 @@ describe('Withdraw ERC20 Token', () => { }) context('should show clickable withdraw button', () => { - cy.startTransfer() + cy.startTransfer({ confirmMetamaskTransaction: false }) }) context('should initiate withdrawal successfully', () => { diff --git a/packages/arb-token-bridge-ui/tests/e2e/specs/withdrawNativeToken.cy.ts b/packages/arb-token-bridge-ui/tests/e2e/specs/withdrawNativeToken.cy.ts index 5f3693284e..c8524f2717 100644 --- a/packages/arb-token-bridge-ui/tests/e2e/specs/withdrawNativeToken.cy.ts +++ b/packages/arb-token-bridge-ui/tests/e2e/specs/withdrawNativeToken.cy.ts @@ -61,7 +61,7 @@ describe('Withdraw native token', () => { ETHToWithdraw = Number((Math.random() * 0.001).toFixed(5)) // generate a new withdrawal amount for each test-run attempt so that findAllByText doesn't stall coz of prev transactions cy.login({ networkType: 'childChain' }) cy.typeAmount(ETHToWithdraw) - cy.startTransfer() + cy.startTransfer({ confirmMetamaskTransaction: false }) cy.findByText(/Arbitrum’s bridge/i).should('be.visible') // the Continue withdrawal button should be disabled at first @@ -146,7 +146,7 @@ describe('Withdraw native token', () => { cy.typeAmount(ETHToWithdraw) cy.fillCustomDestinationAddress() - cy.startTransfer() + cy.startTransfer({ confirmMetamaskTransaction: false }) cy.findByText(/Arbitrum’s bridge/i).should('be.visible') // the Continue withdrawal button should be disabled at first diff --git a/packages/arb-token-bridge-ui/tests/support/commands.ts b/packages/arb-token-bridge-ui/tests/support/commands.ts index f6fe7efa28..b90e414219 100644 --- a/packages/arb-token-bridge-ui/tests/support/commands.ts +++ b/packages/arb-token-bridge-ui/tests/support/commands.ts @@ -222,11 +222,17 @@ export function findMoveFundsButton(): Cypress.Chainable> { .should('be.visible') } -export function startTransfer() { +export function startTransfer({ + confirmMetamaskTransaction = true +}: { + confirmMetamaskTransaction?: boolean +}) { cy.wait(5_000) cy.findMoveFundsButton().click() cy.wait(15_000) - cy.confirmMetamaskTransaction() + if (confirmMetamaskTransaction) { + cy.confirmMetamaskTransaction() + } } export function findSelectTokenButton(