From 1d66af34b0a77396a39cdc9ef5f7e82ce4b845aa Mon Sep 17 00:00:00 2001
From: ekager <emilykager@gmail.com>
Date: Sun, 15 Sep 2019 19:30:04 -0700
Subject: [PATCH] No issue: Fixes UI tests by removing TP onboarding closure

---
 .../java/org/mozilla/fenix/ui/NavigationToolbarTest.kt       | 5 -----
 .../androidTest/java/org/mozilla/fenix/ui/ShareButtonTest.kt | 1 -
 .../java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt          | 4 ----
 .../java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt        | 5 ++---
 .../java/org/mozilla/fenix/ui/robots/BrowserRobot.kt         | 5 -----
 5 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt
index 35c249ecf..666884f54 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt
@@ -54,7 +54,6 @@ class NavigationToolbarTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            dismissTrackingOnboarding()
             verifyPageContent(defaultWebPage.content)
         }.openNavigationToolbar {
         }.enterURLAndEnterToBrowser(nextWebPage.url) {
@@ -78,7 +77,6 @@ class NavigationToolbarTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            dismissTrackingOnboarding()
             verifyPageContent(defaultWebPage.content)
         }.openNavigationToolbar {
         }.enterURLAndEnterToBrowser(nextWebPage.url) {
@@ -103,7 +101,6 @@ class NavigationToolbarTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(refreshWebPage.url) {
-            dismissTrackingOnboarding()
             verifyPageContent("DEFAULT")
         }
 
@@ -123,7 +120,6 @@ class NavigationToolbarTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            dismissTrackingOnboarding()
             verifyPageContent(defaultWebPage.content)
         }
     }
@@ -134,7 +130,6 @@ class NavigationToolbarTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(loremIpsumWebPage.url) {
-            dismissTrackingOnboarding()
             verifyPageContent(loremIpsumWebPage.content)
         }
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ShareButtonTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ShareButtonTest.kt
index 7db95060f..27bda4669 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ShareButtonTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ShareButtonTest.kt
@@ -50,7 +50,6 @@ class ShareButtonTest {
         //  - Visit a URL, wait until it's loaded
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            dismissTrackingOnboarding()
             verifyPageContent(defaultWebPage.content)
         }
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
index 9318b851c..8f5d1505a 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
@@ -67,7 +67,6 @@ class TabbedBrowsingTest {
 
         navigationToolbar {
         }.openNewTabAndEnterToBrowser(defaultWebPage.url) {
-            dismissTrackingOnboarding()
             verifyPageContent(defaultWebPage.content)
             verifyTabCounter("1")
         }.openHomeScreen { }
@@ -98,8 +97,6 @@ class TabbedBrowsingTest {
 
         navigationToolbar {
         }.openNewTabAndEnterToBrowser(defaultWebPage.url) {
-            dismissTrackingOnboarding()
-
             verifyPageContent(defaultWebPage.content)
             verifyTabCounter("1")
         }.openHomeScreen {
@@ -126,7 +123,6 @@ class TabbedBrowsingTest {
 
         navigationToolbar {
         }.enterURLAndEnterToBrowser(defaultWebPage.url) {
-            dismissTrackingOnboarding()
             verifyPageContent(defaultWebPage.content)
         }.openHomeScreen { }
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
index 0fcdf63d8..2c84b5c9f 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
@@ -7,9 +7,9 @@ package org.mozilla.fenix.ui
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import okhttp3.mockwebserver.MockWebServer
-import org.junit.Rule
-import org.junit.Before
 import org.junit.After
+import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityTestRule
@@ -59,7 +59,6 @@ class ThreeDotMenuMainTest {
         }.goBack {
         }.openThreeDotMenu {
         }.openHelp {
-            dismissTrackingOnboarding()
             verifyHelpUrl()
         }.openHomeScreen {
         }.openThreeDotMenu {
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
index ff57ab66b..4721da97d 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
@@ -52,11 +52,6 @@ class BrowserRobot {
                 .check((matches(withText(containsString(expectedText)))))
     }
 
-    fun dismissTrackingOnboarding() {
-        mDevice.wait(Until.findObject(By.res("close_onboarding")), TestAssetHelper.waitingTime)
-        dismissOnboardingButton().click()
-    }
-
     class Transition {
         private val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())