Merge branch 'handle-fast-withdrawals-orbit-form' of github.com:Offch…

…ainLabs/arbitrum-token-bridge into handle-fast-withdrawals-orbit-form
OffchainLabs · Nov 20, 2024 · 69a1349 · 69a1349
2 parents 33aca9f + 823ffb2
commit 69a1349
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/packages/arb-token-bridge-ui/tests/e2e/cypress.d.ts b/packages/arb-token-bridge-ui/tests/e2e/cypress.d.ts
@@ -16,6 +16,7 @@ import {
   findGasFeeSummary,
   findGasFeeForChain,
   findMoveFundsButton,
+  startTransfer,
   findSelectTokenButton,
   openTransactionDetails,
   closeTransactionDetails,
@@ -64,6 +65,7 @@ declare global {
       findGasFeeForChain: typeof findGasFeeForChain
       findGasFeeSummary: typeof findGasFeeSummary
       findMoveFundsButton: typeof findMoveFundsButton
+      startTransfer: typeof startTransfer
       findSelectTokenButton: typeof findSelectTokenButton
       openTransactionDetails: typeof openTransactionDetails
       closeTransactionDetails: typeof closeTransactionDetails

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
@@ -131,8 +131,7 @@ describe('Batch Deposit', () => {
     }
 
     context('should deposit successfully', () => {
-      cy.findMoveFundsButton().click()
-      cy.confirmMetamaskTransaction()
+      cy.startTransfer()
       cy.findTransactionInTransactionHistory({
         ...txData,
         duration: depositTime
@@ -237,8 +236,7 @@ describe('Batch Deposit', () => {
     }
 
     context('should deposit successfully', () => {
-      cy.findMoveFundsButton().click()
-      cy.confirmMetamaskTransaction()
+      cy.startTransfer()
       cy.findTransactionInTransactionHistory({
         ...txData,
         duration: depositTime

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
@@ -89,8 +89,7 @@ describe('Deposit Token', () => {
         })
 
         context('should deposit successfully', () => {
-          cy.findMoveFundsButton().click()
-          cy.confirmMetamaskTransaction()
+          cy.startTransfer()
           cy.findTransactionInTransactionHistory({
             duration: depositTime,
             amount: ERC20AmountToSend,
@@ -131,8 +130,7 @@ describe('Deposit Token', () => {
         })
 
         context('should deposit successfully', () => {
-          cy.findMoveFundsButton().click()
-          cy.confirmMetamaskTransaction()
+          cy.startTransfer()
           const txData = {
             amount: ERC20AmountToSend,
             symbol: testCase.symbol

diff --git a/packages/arb-token-bridge-ui/tests/e2e/specs/depositNativeToken.cy.ts b/packages/arb-token-bridge-ui/tests/e2e/specs/depositNativeToken.cy.ts
@@ -31,8 +31,7 @@ describe('Deposit native token', () => {
     cy.findGasFeeSummary(zeroToLessThanOneEth)
     cy.findGasFeeForChain(getL1NetworkName(), zeroToLessThanOneEth)
     cy.findGasFeeForChain(getL2NetworkName(), zeroToLessThanOneNativeToken)
-    cy.findMoveFundsButton().click()
-    cy.confirmMetamaskTransaction()
+    cy.startTransfer()
     cy.findTransactionInTransactionHistory({
       duration: depositTime,
       amount: ETHAmountToDeposit,
@@ -54,8 +53,7 @@ describe('Deposit native token', () => {
     cy.findGasFeeSummary(zeroToLessThanOneEth)
     cy.findGasFeeForChain(getL1NetworkName(), zeroToLessThanOneEth)
     cy.findGasFeeForChain(getL2NetworkName(), zeroToLessThanOneNativeToken)
-    cy.findMoveFundsButton().click()
-    cy.confirmMetamaskTransaction()
+    cy.startTransfer()
 
     const txData = {
       amount: ETHAmountToDeposit,

diff --git a/packages/arb-token-bridge-ui/tests/support/commands.ts b/packages/arb-token-bridge-ui/tests/support/commands.ts
@@ -127,7 +127,7 @@ export const openTransactionsPanel = (tab: 'pending' | 'settled') => {
         .should('be.visible'),
     {
       errorMsg: 'Failed to fetch transactions.',
-      timeout: 30_000,
+      timeout: 120_000,
       interval: 500
     }
   )
@@ -247,6 +247,13 @@ export function findMoveFundsButton(): Cypress.Chainable<JQuery<HTMLElement>> {
     .should('be.visible')
 }
 
+export function startTransfer() {
+  cy.wait(5_000)
+  cy.findMoveFundsButton().click()
+  cy.wait(15_000)
+  cy.confirmMetamaskTransaction()
+}
+
 export function findSelectTokenButton(
   text: string
 ): Cypress.Chainable<JQuery<HTMLElement>> {
@@ -397,6 +404,7 @@ Cypress.Commands.addAll({
   findGasFeeForChain,
   findGasFeeSummary,
   findMoveFundsButton,
+  startTransfer,
   findSelectTokenButton,
   closeTransactionHistoryPanel,
   openTransactionDetails,