fix

gasp-xyz · Jan 20, 2025 · db33a1c · db33a1c
1 parent d0b9213
commit db33a1c
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 22 deletions.
diff --git a/test/rollup-test/rollup-prod.deposit.test.ts b/test/rollup-test/rollup-prod.deposit.test.ts
@@ -12,9 +12,11 @@ import {
 } from "../../utils/frontend/utils/Helper";
 import "dotenv/config";
 import {
+  approveContractIfEligible,
   connectWallet,
   setupPage,
   setupPageWithState,
+  switchNetworkIfEligible,
   waitForActionNotification,
 } from "../../utils/frontend/rollup-utils/Handlers";
 import { WalletWrapper } from "../../utils/frontend/rollup-pages/WalletWrapper";
@@ -23,7 +25,6 @@ import {
   DepositModal,
 } from "../../utils/frontend/rollup-utils/DepositModal";
 import { TransactionType } from "../../utils/frontend/rollup-pages/NotificationToast";
-import { switchNetworkIfEligible } from "../../utils/frontend/utils/Handlers";
 
 jest.spyOn(console, "log").mockImplementation(jest.fn());
 
@@ -74,9 +75,8 @@ describe("Gasp Prod UI deposit tests", () => {
     const isOriginFeeDisplayed = await depositModal.isOriginFeeDisplayed();
     expect(isOriginFeeDisplayed).toBeTruthy();
     await switchNetworkIfEligible(driver, DepositActionType.NetworkArbitrum);
-
-    await depositModal.clickDepositButtonByText(DepositActionType.Approve);
-    await waitForActionNotification(driver, TransactionType.ApproveContract);
+    await approveContractIfEligible(driver);
+
     await depositModal.clickDepositButtonByText(DepositActionType.Deposit);
     await waitForActionNotification(driver, TransactionType.Deposit, true);
 

diff --git a/utils/frontend/rollup-utils/Handlers.ts b/utils/frontend/rollup-utils/Handlers.ts
@@ -1,7 +1,7 @@
 import { WebDriver } from "selenium-webdriver";
 import { ApiContext } from "../../Framework/XcmHelper";
 import { Polkadot } from "../pages/Polkadot";
-import { acceptPermissionsWalletExtensionInNewWindow } from "../utils/Helper";
+import { acceptNetworkSwitchInNewWindow, acceptPermissionsWalletExtensionInNewWindow } from "../utils/Helper";
 import { BN_TEN } from "@mangata-finance/sdk";
 import { BN } from "@polkadot/util";
 import { Main } from "../rollup-pages/Main";
@@ -12,7 +12,7 @@ import {
   NotificationToast,
   ToastType,
 } from "../rollup-pages/NotificationToast";
-import { DepositModal } from "./DepositModal";
+import { DepositActionType, DepositModal } from "./DepositModal";
 import { WithdrawModal } from "../rollup-pages/WithdrawModal";
 import { WalletConnectModal } from "../rollup-pages/WalletConnectModal";
 
@@ -224,3 +224,31 @@ export async function addLiqTokenMicroapps(
     },
   });
 }
+
+export async function approveContractIfEligible(
+  driver: WebDriver,
+) {
+  const depositModal = new DepositModal(driver);
+  try {
+    await depositModal.clickDepositButtonByText(DepositActionType.Approve);
+    await waitForActionNotification(driver, TransactionType.ApproveContract);
+  } catch {
+    //Button not found - no action performed.
+  }
+}
+
+export async function switchNetworkIfEligible(
+  driver: WebDriver,
+  depositAction: DepositActionType,
+) {
+  const depositModal = new DepositModal(driver);
+  try {
+    const isNetworkButtonEnabled =
+      await depositModal.isNetworkButtonEnabled(depositAction);
+    expect(isNetworkButtonEnabled).toBeTruthy();
+    await depositModal.clickDepositButtonByText(depositAction);
+    await acceptNetworkSwitchInNewWindow(driver);
+  } catch {
+    //Button not found - no action performed.
+  }
+}
diff --git a/utils/frontend/utils/Handlers.ts b/utils/frontend/utils/Handlers.ts
@@ -97,19 +97,3 @@ export async function initDeposit(driver: WebDriver, assetName: string) {
   // await depositModal.waitForProgressBar();
   await depositModal.clickContinue();
 }
-
-export async function switchNetworkIfEligible(
-  driver: WebDriver,
-  depositAction: DepositActionType,
-) {
-  const depositModal = new DepositModal(driver);
-  try {
-    const isNetworkButtonEnabled =
-      await depositModal.isNetworkButtonEnabled(depositAction);
-    expect(isNetworkButtonEnabled).toBeTruthy();
-    await depositModal.clickDepositButtonByText(depositAction);
-    await acceptNetworkSwitchInNewWindow(driver);
-  } catch {
-    //Button not found - no action performed.
-  }
-}