Update fixtures

Author: Tyschenko

android/app/src/androidTest/java/com/metamask/ui/BrowserDownloadFileTests.kt

@@ -7,9 +7,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.RootMatchers
 import androidx.test.espresso.matcher.ViewMatchers.isClickable
 import androidx.test.espresso.matcher.ViewMatchers.isEnabled
-import androidx.test.espresso.matcher.ViewMatchers.isJavascriptEnabled
 import androidx.test.espresso.matcher.ViewMatchers.withText
-import androidx.test.espresso.web.sugar.Web.onWebView
 import androidx.test.espresso.web.webdriver.DriverAtoms.findElement
 import androidx.test.espresso.web.webdriver.DriverAtoms.webClick
 import androidx.test.espresso.web.webdriver.Locator
@@ -18,8 +16,6 @@ import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
 import com.metamask.ui.base.BaseBrowserUiTest
-import com.metamask.ui.base.CustomMatchers
-import org.hamcrest.Matchers.allOf
 import org.hamcrest.Matchers.not
 import org.junit.After
 import org.junit.Assert
@@ -47,17 +43,9 @@ class BrowserDownloadFileTests : BaseBrowserUiTest() {
 
   @Test
   fun downloadFile() {
-    device.findObject(UiSelector().resourceId("url-input")).click()
-    device.findObject(UiSelector().resourceId("browser-modal-url-input"))
-      .setText("https://tyschenko.github.io/download_file.html")
-    device.pressEnter()
-
-    onWebView(
-      allOf(
-        isJavascriptEnabled(),
-        CustomMatchers.withMinimumWidth(1), // There are multiple webviews in the layout, we choose one that has width and height not equal to 0
-      )
-    )
+    openUrl("https://tyschenko.github.io/download_file.html")
+
+    onMetaMaskWebView()
       .withElement(findElement(Locator.ID, "download_button"))
       .perform(webClick())
 
@@ -83,17 +71,9 @@ class BrowserDownloadFileTests : BaseBrowserUiTest() {
 
   @Test
   fun downloadBlobFile() {
-    device.findObject(UiSelector().resourceId("url-input")).click()
-    device.findObject(UiSelector().resourceId("browser-modal-url-input"))
-      .setText("https://tyschenko.github.io/download_blob_file.html")
-    device.pressEnter()
-
-    onWebView(
-      allOf(
-        isJavascriptEnabled(),
-        CustomMatchers.withMinimumWidth(1), // There are multiple webviews in the layout, we choose one that has width and height not equal to 0
-      )
-    )
+    openUrl("https://tyschenko.github.io/download_blob_file.html")
+
+    onMetaMaskWebView()
       .withElement(findElement(Locator.ID, "download_button"))
       .perform(webClick())
 
@@ -117,17 +97,9 @@ class BrowserDownloadFileTests : BaseBrowserUiTest() {
 
   @Test
   fun downloadBase64File() {
-    device.findObject(UiSelector().resourceId("url-input")).click()
-    device.findObject(UiSelector().resourceId("browser-modal-url-input"))
-      .setText("https://tyschenko.github.io/download_base64_file.html")
-    device.pressEnter()
-
-    onWebView(
-      allOf(
-        isJavascriptEnabled(),
-        CustomMatchers.withMinimumWidth(1), // There are multiple webviews in the layout, we choose one that has width and height not equal to 0
-      )
-    )
+    openUrl("https://tyschenko.github.io/download_base64_file.html")
+
+    onMetaMaskWebView()
       .withElement(findElement(Locator.ID, "download_button"))
       .perform(webClick())
 

android/app/src/androidTest/java/com/metamask/ui/base/BaseBrowserUiTest.kt

@@ -1,8 +1,13 @@
 package com.metamask.ui.base
 
 import androidx.test.core.app.launchActivity
+import androidx.test.espresso.matcher.ViewMatchers.isJavascriptEnabled
+import androidx.test.espresso.web.sugar.Web.onWebView
+import androidx.test.espresso.web.sugar.Web.WebInteraction
 import androidx.test.uiautomator.UiSelector
 import io.metamask.TestActivity
+import org.hamcrest.Matchers.allOf
+import java.util.concurrent.TimeUnit
 import org.junit.Before
 
 abstract class BaseBrowserUiTest : BaseUiTest() {
@@ -14,4 +19,17 @@ abstract class BaseBrowserUiTest : BaseUiTest() {
     device.findObject(UiSelector().description("Unlock")).click()
     device.findObject(UiSelector().resourceId("tab-bar-item-Browser")).click()
   }
+
+  fun openUrl(url: String) {
+    device.findObject(UiSelector().resourceId("url-input")).click()
+    device.findObject(UiSelector().resourceId("browser-modal-url-input")).setText(url)
+    device.pressEnter()
+  }
+
+  fun onMetaMaskWebView() = onWebView(
+    allOf(
+      isJavascriptEnabled(),
+      CustomMatchers.withMinimumWidth(1) // There are multiple webviews in the layout, we choose one that has width and height not equal to 0
+    )
+  ).withTimeout(10, TimeUnit.SECONDS)
 }

android/app/src/androidTest/java/com/metamask/ui/base/Fixtures.kt

@@ -409,7 +409,8 @@ object Fixtures {
           "userLoggedIn": true,
           "isAuthChecked": false,
           "initialScreen": "",
-          "appTheme": "os"
+          "appTheme": "os",
+          "existingUser": true
         },
         "wizard": {
           "step": 0
@@ -585,10 +586,11 @@ object Fixtures {
       },
       "asyncState": {
         "@MetaMask:existingUser": "true",
+        "@MetaMask:OptinMetaMetricsUISeen": "true",
         "@MetaMask:onboardingWizard": "explored",
         "@MetaMask:UserTermsAcceptedv1.0": "true",
         "@MetaMask:WhatsNewAppVersionSeen": "7.24.3",
-        "@MetaMask:solanaFeatureModalShown": "true"
+        "@MetaMask:solanaFeatureModalShownV2": "true"
       }
     }
     """.trimIndent()