Update swap test to handle the details modal

MetaMask · Sep 4, 2024 · d423fa7 · d423fa7
1 parent eea663e
commit d423fa7
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 13 deletions.
diff --git a/e2e/specs/swaps/swap-action-regression.spec.js b/e2e/specs/swaps/swap-action-regression.spec.js
@@ -110,25 +110,29 @@ describe(Regression('Multiple Swaps from Actions'), () => {
       await Assertions.checkIfVisible(
         ActivitiesView.swapActivity(sourceTokenSymbol, destTokenSymbol),
       );
-      await TestHelpers.delay(5000);
       await ActivitiesView.tapOnSwapActivity(
         sourceTokenSymbol,
         destTokenSymbol,
       );
 
-      if (device.getPlatform() === 'android') {
+      try {
         await Assertions.checkIfVisible(DetailsModal.title);
-        await Assertions.checkIfElementToHaveText(
-          DetailsModal.title,
-          DetailsModal.generateExpectedTitle(
-            sourceTokenSymbol,
-            destTokenSymbol,
-          ),
+      } catch (e) {
+        await ActivitiesView.tapOnSwapActivity(
+          sourceTokenSymbol,
+          destTokenSymbol,
         );
-        await Assertions.checkIfVisible(DetailsModal.statusConfirmed);
-        await DetailsModal.tapOnCloseIcon();
-        await Assertions.checkIfNotVisible(DetailsModal.title);
+        await Assertions.checkIfVisible(DetailsModal.title);
       }
+
+      await Assertions.checkIfVisible(DetailsModal.title);
+      await Assertions.checkIfElementToHaveText(
+        DetailsModal.title,
+        DetailsModal.generateExpectedTitle(sourceTokenSymbol, destTokenSymbol),
+      );
+      await Assertions.checkIfVisible(DetailsModal.statusConfirmed);
+      await DetailsModal.tapOnCloseIcon();
+      await Assertions.checkIfNotVisible(DetailsModal.title);
     },
   );
 });
diff --git a/e2e/specs/swaps/swap-action-smoke.spec.js b/e2e/specs/swaps/swap-action-smoke.spec.js
@@ -109,12 +109,20 @@ describe(SmokeSwaps('Swap from Actions'), () => {
       await Assertions.checkIfVisible(
         ActivitiesView.swapActivity(sourceTokenSymbol, destTokenSymbol),
       );
-      await TestHelpers.delay(5000);
       await ActivitiesView.tapOnSwapActivity(
         sourceTokenSymbol,
         destTokenSymbol,
       );
-      await Assertions.checkIfVisible(DetailsModal.title);
+
+      try {
+        await Assertions.checkIfVisible(DetailsModal.title);
+      } catch (e) {
+        await ActivitiesView.tapOnSwapActivity(
+          sourceTokenSymbol,
+          destTokenSymbol,
+        );
+        await Assertions.checkIfVisible(DetailsModal.title);
+      }
       await Assertions.checkIfElementToHaveText(
         DetailsModal.title,
         DetailsModal.generateExpectedTitle(sourceTokenSymbol, destTokenSymbol),

diff --git a/e2e/specs/swaps/swap-token-chart.spec.js b/e2e/specs/swaps/swap-token-chart.spec.js
@@ -18,6 +18,8 @@ import FixtureServer from '../../fixtures/fixture-server';
 import { getFixturesServerPort } from '../../fixtures/utils';
 import { Regression } from '../../tags';
 import Assertions from '../../utils/Assertions';
+import ActivitiesView from "../../pages/ActivitiesView";
+import DetailsModal from "../../pages/modals/DetailsModal";
 
 const fixtureServer = new FixtureServer();
 
@@ -81,5 +83,26 @@ describe(Regression('Swap from Token view'), () => {
       console.log(`Toast message is slow to appear or did not appear: ${e}`);
     }
     await device.enableSynchronization();
+    await TestHelpers.delay(5000);
+    await TabBarComponent.tapActivity();
+    await Assertions.checkIfVisible(ActivitiesView.title);
+    await Assertions.checkIfVisible(ActivitiesView.swapActivity('LINK', 'DAI'));
+    await ActivitiesView.tapOnSwapActivity('LINK', 'DAI');
+
+    try {
+      await Assertions.checkIfVisible(DetailsModal.title);
+    } catch (e) {
+      await ActivitiesView.tapOnSwapActivity('LINK', 'DAI');
+      await Assertions.checkIfVisible(DetailsModal.title);
+    }
+
+    await Assertions.checkIfVisible(DetailsModal.title);
+    await Assertions.checkIfElementToHaveText(
+      DetailsModal.title,
+      DetailsModal.generateExpectedTitle('LINK', 'DAI'),
+    );
+    await Assertions.checkIfVisible(DetailsModal.statusConfirmed);
+    await DetailsModal.tapOnCloseIcon();
+    await Assertions.checkIfNotVisible(DetailsModal.title);
   });
 });