use try/catch for E2E on submit

bancorprotocol · May 14, 2024 · 948ee90 · 948ee90
1 parent 0a5cf56
commit 948ee90
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/e2e/utils/strategy/CreateStrategyDriver.ts b/e2e/utils/strategy/CreateStrategyDriver.ts
@@ -9,7 +9,7 @@ import {
 import { CreateStrategyTestCase, StrategySettings } from './types';
 import { RangeOrder, debugTokens, Direction, Setting } from '../types';
 import { waitModalClose, waitModalOpen, waitTooltipsClose } from '../modal';
-import { screenshot, shouldTakeScreenshot } from '../operators';
+import { screenshot, shouldTakeScreenshot, waitFor } from '../operators';
 import { MainMenuDriver } from '../MainMenuDriver';
 
 export class CreateStrategyDriver {
@@ -103,15 +103,6 @@ export class CreateStrategyDriver {
 
   async submit() {
     const btn = this.page.getByText('Create Strategy');
-
-    try {
-      if (await this.page.isVisible('[data-testid=approve-warnings]')) {
-        await this.page.getByTestId('approve-warnings').click();
-      }
-    } catch {
-      // do nothing, there is no approval needed
-    }
-
     if (shouldTakeScreenshot) {
       const mainMenu = new MainMenuDriver(this.page);
       await mainMenu.hide();
@@ -121,6 +112,14 @@ export class CreateStrategyDriver {
       await screenshot(form, path);
       await mainMenu.show();
     }
-    return btn.click();
+    try {
+      await btn.click({ timeout: 1_000 });
+    } catch {
+      await waitFor(this.page, 'approve-warnings');
+      if (await this.page.isVisible('[data-testid=approve-warnings]')) {
+        await this.page.getByTestId('approve-warnings').click();
+      }
+      await btn.click();
+    }
   }
 }
diff --git a/e2e/utils/strategy/EditStrategyDriver.ts b/e2e/utils/strategy/EditStrategyDriver.ts
@@ -1,7 +1,7 @@
 import { expect } from '@playwright/test';
 import { Page } from 'playwright-core';
 import { MainMenuDriver } from '../MainMenuDriver';
-import { screenshot, shouldTakeScreenshot } from '../operators';
+import { screenshot, shouldTakeScreenshot, waitFor } from '../operators';
 import { CreateStrategyTestCase } from './types';
 import { Setting, Direction, MinMax } from '../types';
 import {
@@ -69,13 +69,6 @@ export class EditStrategyDriver {
   async submit(type: 'deposit' | 'withdraw' | 'renew' | 'editPrices') {
     const btn = this.page.getByTestId('edit-submit');
 
-    try {
-      if (await this.page.isVisible('[data-testid=approve-warnings]')) {
-        await this.page.getByTestId('approve-warnings').click();
-      }
-    } catch {
-      // do nothing, there is no approval needed
-    }
     if (shouldTakeScreenshot) {
       const mainMenu = new MainMenuDriver(this.page);
       await mainMenu.hide();
@@ -85,7 +78,16 @@ export class EditStrategyDriver {
       await screenshot(form, path);
       await mainMenu.show();
     }
-    return btn.click();
+
+    try {
+      await btn.click({ timeout: 1_000 });
+    } catch {
+      await waitFor(this.page, 'approve-warnings');
+      if (await this.page.isVisible('[data-testid=approve-warnings]')) {
+        await this.page.getByTestId('approve-warnings').click();
+      }
+      await btn.click();
+    }
   }
 
   async fillBudget(direction: Direction, budget: string) {