fix checks

osmosis-labs · Aug 12, 2024 · 4fc73b2 · 4fc73b2
1 parent a5fe8d5
commit 4fc73b2
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 39 deletions.
diff --git a/packages/web/e2e/pages/trade-page.ts b/packages/web/e2e/pages/trade-page.ts
@@ -181,9 +181,11 @@ export class TradePage extends BasePage {
     // we expect that after 1 second token filter is displayed.
     await this.page.waitForTimeout(1000);
     await this.page.getByPlaceholder("Search").fill(to);
-    const toLocator = this.page.locator(
-      `//div/button[@data-testid='token-select-asset']//span[.='${to}']`
-    );
+    const toLocator = this.page
+      .locator(
+        `//div/button[@data-testid='token-select-asset']//span[.='${to}']`
+      )
+      .first();
     await toLocator.click();
     // we expect that after 2 seconds exchange rate is populated.
     await this.page.waitForTimeout(2000);

diff --git a/packages/web/e2e/tests/swap.wallet.spec.ts b/packages/web/e2e/tests/swap.wallet.spec.ts
@@ -64,9 +64,8 @@ test.describe("Test Swap feature", () => {
     expect(msgContentAmount).toContain("token_out_denom: " + ATOM);
     expect(msgContentAmount).toContain("sender: " + walletId);
     expect(msgContentAmount).toContain("denom: uosmo");
-    expect(swapPage.isTransactionBroadcasted(10));
-    expect(swapPage.isTransactionSuccesful(10));
-    expect(swapPage.getTransactionUrl()).toBeTruthy();
+    await swapPage.isTransactionSuccesful();
+    await swapPage.getTransactionUrl();
   });
 
   test("User should be able to swap ATOM to OSMO", async () => {
@@ -79,9 +78,8 @@ test.describe("Test Swap feature", () => {
     expect(msgContentAmount).toContain("denom: " + ATOM);
     expect(msgContentAmount).toContain("sender: " + walletId);
     expect(msgContentAmount).toContain("token_out_denom: uosmo");
-    expect(swapPage.isTransactionBroadcasted(10));
-    expect(swapPage.isTransactionSuccesful(10));
-    expect(swapPage.getTransactionUrl()).toBeTruthy();
+    await swapPage.isTransactionSuccesful();
+    await swapPage.getTransactionUrl();
   });
 
   test("User should be able to swap OSMO to USDC", async () => {
@@ -94,9 +92,8 @@ test.describe("Test Swap feature", () => {
     expect(msgContentAmount).toContain("token_out_denom: " + USDC);
     expect(msgContentAmount).toContain("sender: " + walletId);
     expect(msgContentAmount).toContain("denom: uosmo");
-    expect(swapPage.isTransactionBroadcasted(10));
-    expect(swapPage.isTransactionSuccesful(10));
-    expect(swapPage.getTransactionUrl()).toBeTruthy();
+    await swapPage.isTransactionSuccesful();
+    await swapPage.getTransactionUrl();
   });
 
   test("User should be able to swap USDC to OSMO", async () => {
@@ -109,9 +106,8 @@ test.describe("Test Swap feature", () => {
     expect(msgContentAmount).toContain("token_out_denom: uosmo");
     expect(msgContentAmount).toContain("sender: " + walletId);
     expect(msgContentAmount).toContain("denom: " + USDC);
-    expect(swapPage.isTransactionBroadcasted(10));
-    expect(swapPage.isTransactionSuccesful(10));
-    expect(swapPage.getTransactionUrl()).toBeTruthy();
+    await swapPage.isTransactionSuccesful();
+    await swapPage.getTransactionUrl();
   });
 
   test("User should be able to swap ATOM to USDC", async () => {
@@ -124,9 +120,8 @@ test.describe("Test Swap feature", () => {
     expect(msgContentAmount).toContain("denom: " + ATOM);
     expect(msgContentAmount).toContain("sender: " + walletId);
     expect(msgContentAmount).toContain("token_out_denom: " + USDC);
-    expect(swapPage.isTransactionBroadcasted(10));
-    expect(swapPage.isTransactionSuccesful(10));
-    expect(swapPage.getTransactionUrl()).toBeTruthy();
+    await swapPage.isTransactionSuccesful();
+    await swapPage.getTransactionUrl();
   });
 
   test("User should be able to swap USDC to ATOM", async () => {
@@ -139,9 +134,8 @@ test.describe("Test Swap feature", () => {
     expect(msgContentAmount).toContain("denom: " + USDC);
     expect(msgContentAmount).toContain("sender: " + walletId);
     expect(msgContentAmount).toContain("token_out_denom: " + ATOM);
-    expect(swapPage.isTransactionBroadcasted(10));
-    expect(swapPage.isTransactionSuccesful(10));
-    expect(swapPage.getTransactionUrl()).toBeTruthy();
+    await swapPage.isTransactionSuccesful();
+    await swapPage.getTransactionUrl();
   });
 
   test("User should be able to swap USDC to TIA", async () => {
@@ -154,9 +148,8 @@ test.describe("Test Swap feature", () => {
     expect(msgContentAmount).toContain("denom: " + USDC);
     expect(msgContentAmount).toContain("sender: " + walletId);
     expect(msgContentAmount).toContain("token_out_denom: " + TIA);
-    expect(swapPage.isTransactionBroadcasted(10));
-    expect(swapPage.isTransactionSuccesful(10));
-    expect(swapPage.getTransactionUrl()).toBeTruthy();
+    await swapPage.isTransactionSuccesful();
+    await swapPage.getTransactionUrl();
   });
 
   test("User should be able to swap TIA to USDC", async () => {
@@ -169,9 +162,8 @@ test.describe("Test Swap feature", () => {
     expect(msgContentAmount).toContain("denom: " + TIA);
     expect(msgContentAmount).toContain("sender: " + walletId);
     expect(msgContentAmount).toContain("token_out_denom: " + USDC);
-    expect(swapPage.isTransactionBroadcasted(10));
-    expect(swapPage.isTransactionSuccesful(10));
-    expect(swapPage.getTransactionUrl()).toBeTruthy();
+    await swapPage.isTransactionSuccesful();
+    await swapPage.getTransactionUrl();
   });
 
   test("User should be able to swap USDC to INJ", async () => {
@@ -184,9 +176,8 @@ test.describe("Test Swap feature", () => {
     expect(msgContentAmount).toContain("denom: " + USDC);
     expect(msgContentAmount).toContain("sender: " + walletId);
     expect(msgContentAmount).toContain("token_out_denom: " + INJ);
-    expect(swapPage.isTransactionBroadcasted(10));
-    expect(swapPage.isTransactionSuccesful(10));
-    expect(swapPage.getTransactionUrl()).toBeTruthy();
+    await swapPage.isTransactionSuccesful();
+    await swapPage.getTransactionUrl();
   });
 
   test("User should be able to swap INJ to USDC", async () => {
@@ -199,9 +190,8 @@ test.describe("Test Swap feature", () => {
     expect(msgContentAmount).toContain("denom: " + INJ);
     expect(msgContentAmount).toContain("sender: " + walletId);
     expect(msgContentAmount).toContain("token_out_denom: " + USDC);
-    expect(swapPage.isTransactionBroadcasted(10));
-    expect(swapPage.isTransactionSuccesful(10));
-    expect(swapPage.getTransactionUrl()).toBeTruthy();
+    await swapPage.isTransactionSuccesful();
+    await swapPage.getTransactionUrl();
   });
 
   test("User should be able to swap USDC to AKT", async () => {
@@ -214,9 +204,8 @@ test.describe("Test Swap feature", () => {
     expect(msgContentAmount).toContain("denom: " + USDC);
     expect(msgContentAmount).toContain("sender: " + walletId);
     expect(msgContentAmount).toContain("token_out_denom: " + AKT);
-    expect(swapPage.isTransactionBroadcasted(10));
-    expect(swapPage.isTransactionSuccesful(10));
-    expect(swapPage.getTransactionUrl()).toBeTruthy();
+    await swapPage.isTransactionSuccesful();
+    await swapPage.getTransactionUrl();
   });
 
   test("User should be able to swap AKT to USDC", async () => {
@@ -229,8 +218,7 @@ test.describe("Test Swap feature", () => {
     expect(msgContentAmount).toContain("denom: " + AKT);
     expect(msgContentAmount).toContain("sender: " + walletId);
     expect(msgContentAmount).toContain("token_out_denom: " + USDC);
-    expect(swapPage.isTransactionBroadcasted(10));
-    expect(swapPage.isTransactionSuccesful(10));
-    expect(swapPage.getTransactionUrl()).toBeTruthy();
+    await swapPage.isTransactionSuccesful();
+    await swapPage.getTransactionUrl();
   });
 });