the flow for the tests(transfer and withdraw) has changed

zkBob · Jan 22, 2024 · 89fb9bf · 89fb9bf
1 parent 7c05cd8
commit 89fb9bf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/e2e-ci-cd/__tests__/goerli_eth.test.ts b/e2e-ci-cd/__tests__/goerli_eth.test.ts
@@ -26,7 +26,7 @@ test.beforeEach(async ({metamask, zkAccount}) => {
         await OperationsWithToken.SelectGoerliNetwork()
         await OperationsWithToken.SelectETHGoerli()
         await OperationsWithToken.SelectWETHToken()
-        await OperationsWithToken.InputAmount()
+        await OperationsWithToken.InputETHAmount()
         await OperationsWithToken.button_Deposit()
         await OperationsWithToken.TheCheckingTheDepositSent()
         });
@@ -42,10 +42,10 @@ test.beforeEach(async ({metamask, zkAccount}) => {
         await OperationsWithToken.CheckTransfer()
         });
 
-      test('Withdraw ETH', async ({ OperationsWithToken }) => {
+      test.only('Withdraw ETH', async ({ OperationsWithToken }) => {
         await OperationsWithToken.GoToWithdrawTab()
-        await OperationsWithToken.SelectSepoliaNetwork()
-        await OperationsWithToken.SelectBOBSepolia()
+        await OperationsWithToken.SelectGoerliNetwork()
+        await OperationsWithToken.SelectETHGoerli()
         await OperationsWithToken.InputAmountWithdrawTab()
         await OperationsWithToken.EnterWeb3WalletAddress(WEB3_WALLET_ADDRESS)
         await OperationsWithToken.button_Withdraw()
@@ -78,8 +78,8 @@ test.beforeEach(async ({metamask, zkAccount}) => {
 
         test('Withdraw USDC', async ({ OperationsWithToken }) => {
             await OperationsWithToken.GoToWithdrawTab()
-            await OperationsWithToken.SelectSepoliaNetwork()
-            await OperationsWithToken.SelectBOBSepolia()
+            await OperationsWithToken.SelectGoerliNetwork()
+            await OperationsWithToken.SelectUSDCGoerli()
             await OperationsWithToken.InputAmountWithdrawTab()
             await OperationsWithToken.EnterWeb3WalletAddress(WEB3_WALLET_ADDRESS)
             await OperationsWithToken.button_Withdraw()
@@ -89,7 +89,7 @@ test.beforeEach(async ({metamask, zkAccount}) => {
     });
 
         test.describe('USDM pool', () => {
-            test('Deposit USDM', async ({ OperationsWithToken }) => {
+            test.only('Deposit USDM', async ({ OperationsWithToken }) => {
                 await OperationsWithToken.GoToDepositTab()
                 await OperationsWithToken.SelectGoerliNetwork()
                 await OperationsWithToken.SelectUSDMGoerli()
@@ -109,10 +109,10 @@ test.beforeEach(async ({metamask, zkAccount}) => {
                 await OperationsWithToken.CheckTransfer()
             });
 
-            test('Withdraw USDM', async ({ OperationsWithToken }) => {
+            test.only('Withdraw USDM', async ({ OperationsWithToken }) => {
                 await OperationsWithToken.GoToWithdrawTab()
-                await OperationsWithToken.SelectSepoliaNetwork()
-                await OperationsWithToken.SelectBOBSepolia()
+                await OperationsWithToken.SelectGoerliNetwork()
+                await OperationsWithToken.SelectUSDMGoerli()
                 await OperationsWithToken.InputAmountWithdrawTab()
                 await OperationsWithToken.EnterWeb3WalletAddress(WEB3_WALLET_ADDRESS)
                 await OperationsWithToken.button_Withdraw()

diff --git a/e2e-ci-cd/pages/PageObjects/OperationsWithToken/OperationsWithTokenElements.ts b/e2e-ci-cd/pages/PageObjects/OperationsWithToken/OperationsWithTokenElements.ts
@@ -91,16 +91,19 @@ export default class OperationsWithTokenPages extends BasePage{
     }  
 
     async SelectUSDMGoerli():Promise<void> {
+      await this.locator('//div[@id="root"]/div[3]/div[1]/div[2]/div[1]').click();
       await this.locator('//button[@data-ga-id="pool-bob2usdc-goerli"]').click();
       await this.sleep(TIMEOUTS.medium);
     }
 
     async SelectUSDCGoerli():Promise<void> {
+      await this.locator('//div[@id="root"]/div[3]/div[1]/div[2]/div[1]').click();
       await this.locator('//button[@data-ga-id="pool-usdc-goerli"]').click();
       await this.sleep(TIMEOUTS.medium);
     }
 
     async SelectETHGoerli():Promise<void> {
+      await this.locator('//div[@id="root"]/div[3]/div[1]/div[2]/div[1]').click();
       await this.locator('//button[@data-ga-id="pool-weth-goerli"]').click();
       await this.sleep(TIMEOUTS.medium);
     }
@@ -131,6 +134,11 @@ export default class OperationsWithTokenPages extends BasePage{
       await this.locator(OperationsWithTokenElementsLocators.input_amount_in_deposit_tab).type('1', {delay: 100});
     }
 
+    async InputETHAmount():Promise<void> {
+      await expect(this.locator('//button[text()="Enter amount"]')).toBeVisible({timeout: TIMEOUTS.fiveMinutes});
+      await this.locator(OperationsWithTokenElementsLocators.input_amount_in_deposit_tab).type('0.001', {delay: 100});
+    }
+
     async InputAmountTransferTab():Promise<void> {
       await expect(this.locator('//button[text()="Enter amount"]')).toBeVisible({timeout: TIMEOUTS.oneMinute});
       await this.locator(OperationsWithTokenElementsLocators.input_amount_in_transfer_tab ).type('1', {delay: 100});