From c30995d360500fedd2315102b51a27b52d89d074 Mon Sep 17 00:00:00 2001
From: dddddanica <zhaodanica@gmail.com>
Date: Mon, 3 Feb 2025 22:19:43 +0000
Subject: [PATCH] attempt to fix e2e tests

---
 .../settings/security-and-privacy-settings.ts  |  1 -
 .../pages/settings/settings-page.ts            | 18 ++++++------------
 .../tests/metrics/segment-user-traits.spec.ts  |  6 +++++-
 .../snap-ui-address.test.tsx.snap              |  4 ++--
 ui/components/app/tab-bar/tab-bar.js           |  7 ++++++-
 .../connect-accounts-modal.test.tsx.snap       |  4 ++--
 6 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/test/e2e/page-objects/pages/settings/security-and-privacy-settings.ts b/test/e2e/page-objects/pages/settings/security-and-privacy-settings.ts
index b24b02316dec..699cf855e63c 100644
--- a/test/e2e/page-objects/pages/settings/security-and-privacy-settings.ts
+++ b/test/e2e/page-objects/pages/settings/security-and-privacy-settings.ts
@@ -41,7 +41,6 @@ class SecurityAndPrivacySettings {
     const settingsPage = new SettingsPage(this.driver);
     await settingsPage.check_pageIsLoaded();
     await settingsPage.goToPrivacySettings();
-    await this.check_pageIsLoaded();
   }
 
   async toggleParticipateInMetaMetrics(): Promise<void> {
diff --git a/test/e2e/page-objects/pages/settings/settings-page.ts b/test/e2e/page-objects/pages/settings/settings-page.ts
index 4444556a1b74..f73fc258707e 100644
--- a/test/e2e/page-objects/pages/settings/settings-page.ts
+++ b/test/e2e/page-objects/pages/settings/settings-page.ts
@@ -6,20 +6,14 @@ class SettingsPage {
   private readonly closeSettingsPageButton =
     '.settings-page__header__title-container__close-button';
 
-  private readonly developerOptionsButton = {
-    text: 'Developer Options',
-    css: '.tab-bar__tab__content__title',
-  };
+  private readonly developerOptionsButton =
+    '[data-testid="tab-content-Developer Options"]';
 
-  private readonly experimentalSettingsButton = {
-    text: 'Experimental',
-    css: '.tab-bar__tab__content__title',
-  };
+  private readonly experimentalSettingsButton =
+    '[data-testid="tab-content-Experimental"]';
 
-  private readonly privacySettingsButton = {
-    text: 'Security & privacy',
-    css: '.tab-bar__tab__content__title',
-  };
+  private readonly privacySettingsButton =
+    '[data-testid="tab-content-Security & privacy"]';
 
   private readonly settingsPageTitle = {
     text: 'Settings',
diff --git a/test/e2e/tests/metrics/segment-user-traits.spec.ts b/test/e2e/tests/metrics/segment-user-traits.spec.ts
index b92468529e19..392c0e86a1dd 100644
--- a/test/e2e/tests/metrics/segment-user-traits.spec.ts
+++ b/test/e2e/tests/metrics/segment-user-traits.spec.ts
@@ -123,6 +123,7 @@ describe('Segment User Traits', function () {
           driver,
         );
         await securityAndPrivacySettings.navigateToPage();
+        await securityAndPrivacySettings.check_pageIsLoaded();
         await securityAndPrivacySettings.toggleParticipateInMetaMetrics();
         events = await getEventPayloads(driver, mockedEndpoints);
         assert.equal(events.length, 1);
@@ -156,6 +157,7 @@ describe('Segment User Traits', function () {
           driver,
         );
         await securityAndPrivacySettings.navigateToPage();
+        await securityAndPrivacySettings.check_pageIsLoaded();
         await securityAndPrivacySettings.toggleParticipateInMetaMetrics();
         await securityAndPrivacySettings.toggleDataCollectionForMarketing();
         events = await getEventPayloads(driver, mockedEndpoints);
@@ -166,7 +168,7 @@ describe('Segment User Traits', function () {
     );
   });
 
-  it('should stop sending identify events when user disables metrics in privacy settings after opting in during onboarding', async function () {
+  it.only('should stop sending identify events when user disables metrics in privacy settings after opting in during onboarding', async function () {
     await withFixtures(
       {
         fixtures: new FixtureBuilder({ onboarding: true })
@@ -184,12 +186,14 @@ describe('Segment User Traits', function () {
           participateInMetaMetrics: true,
           dataCollectionForMarketing: true,
         });
+        await driver.wait(30000)
         events = await getEventPayloads(driver, mockedEndpoints);
         assert.equal(events.length, 1);
         const securityAndPrivacySettings = new SecurityAndPrivacySettings(
           driver,
         );
         await securityAndPrivacySettings.navigateToPage();
+        await securityAndPrivacySettings.check_pageIsLoaded();
         await securityAndPrivacySettings.toggleParticipateInMetaMetrics();
         events = await getEventPayloads(driver, mockedEndpoints);
         assert.equal(events.length, 1);
diff --git a/ui/components/app/snaps/snap-ui-address/__snapshots__/snap-ui-address.test.tsx.snap b/ui/components/app/snaps/snap-ui-address/__snapshots__/snap-ui-address.test.tsx.snap
index deb95bd48555..13caa0c5dc82 100644
--- a/ui/components/app/snaps/snap-ui-address/__snapshots__/snap-ui-address.test.tsx.snap
+++ b/ui/components/app/snaps/snap-ui-address/__snapshots__/snap-ui-address.test.tsx.snap
@@ -172,7 +172,7 @@ exports[`SnapUIAddress renders Ethereum address 1`] = `
           <rect
             fill="#F29602"
             height="32"
-            transform="translate(-2.81750896228304 4.951916544006229) rotate(230.4 16 16)"
+            transform="translate(-2.8175089622830405 4.951916544006229) rotate(230.4 16 16)"
             width="32"
             x="0"
             y="0"
@@ -476,7 +476,7 @@ exports[`SnapUIAddress renders legacy Ethereum address 1`] = `
           <rect
             fill="#F29602"
             height="32"
-            transform="translate(-2.81750896228304 4.951916544006229) rotate(230.4 16 16)"
+            transform="translate(-2.8175089622830405 4.951916544006229) rotate(230.4 16 16)"
             width="32"
             x="0"
             y="0"
diff --git a/ui/components/app/tab-bar/tab-bar.js b/ui/components/app/tab-bar/tab-bar.js
index 6d9e41eb4bf6..50787dc8ea1e 100644
--- a/ui/components/app/tab-bar/tab-bar.js
+++ b/ui/components/app/tab-bar/tab-bar.js
@@ -37,7 +37,12 @@ const TabBar = (props) => {
           )}
           <div className="tab-bar__tab__content">
             <div className="tab-bar__tab__content__icon">{icon}</div>
-            <div className="tab-bar__tab__content__title">{content}</div>
+            <div
+              className="tab-bar__tab__content__title"
+              data-testid={`tab-content-${content}`}
+            >
+              {content}
+            </div>
           </div>
           <Icon
             name={IconName.ArrowRight}
diff --git a/ui/components/multichain/connect-accounts-modal/__snapshots__/connect-accounts-modal.test.tsx.snap b/ui/components/multichain/connect-accounts-modal/__snapshots__/connect-accounts-modal.test.tsx.snap
index c69b6412ae92..cfc87f8c8ad8 100644
--- a/ui/components/multichain/connect-accounts-modal/__snapshots__/connect-accounts-modal.test.tsx.snap
+++ b/ui/components/multichain/connect-accounts-modal/__snapshots__/connect-accounts-modal.test.tsx.snap
@@ -159,7 +159,7 @@ exports[`Connect More Accounts Modal should render correctly 1`] = `
                                 <rect
                                   fill="#FA4300"
                                   height="32"
-                                  transform="translate(-1.712066926084717 -0.6920409130150889) rotate(264.3 16 16)"
+                                  transform="translate(-1.712066926084717 -0.6920409130150887) rotate(264.3 16 16)"
                                   width="32"
                                   x="0"
                                   y="0"
@@ -218,7 +218,7 @@ exports[`Connect More Accounts Modal should render correctly 1`] = `
                         <rect
                           fill="#FA4300"
                           height="32"
-                          transform="translate(-1.712066926084717 -0.6920409130150889) rotate(264.3 16 16)"
+                          transform="translate(-1.712066926084717 -0.6920409130150887) rotate(264.3 16 16)"
                           width="32"
                           x="0"
                           y="0"