blallo
/
fenix
1
0
Fork 0
Code Releases Activity

No issue: Fixes UI tests by removing TP onboarding closure

master
ekager 2019-09-15 19:30:04 -07:00 committed by Emily Kager
parent 90ef5ec9bb
commit 1d66af34b0
5 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/androidTest/java/org/mozilla/fenix/ui/NavigationToolbarTest.kt
View File

@ -54,7 +54,6 @@ class NavigationToolbarTest {
navigationToolbar { navigationToolbar {
}.enterURLAndEnterToBrowser(defaultWebPage.url) { }.enterURLAndEnterToBrowser(defaultWebPage.url) {
dismissTrackingOnboarding()
verifyPageContent(defaultWebPage.content) verifyPageContent(defaultWebPage.content)
}.openNavigationToolbar { }.openNavigationToolbar {
}.enterURLAndEnterToBrowser(nextWebPage.url) { }.enterURLAndEnterToBrowser(nextWebPage.url) {
@ -78,7 +77,6 @@ class NavigationToolbarTest {
navigationToolbar { navigationToolbar {
}.enterURLAndEnterToBrowser(defaultWebPage.url) { }.enterURLAndEnterToBrowser(defaultWebPage.url) {
dismissTrackingOnboarding()
verifyPageContent(defaultWebPage.content) verifyPageContent(defaultWebPage.content)
}.openNavigationToolbar { }.openNavigationToolbar {
}.enterURLAndEnterToBrowser(nextWebPage.url) { }.enterURLAndEnterToBrowser(nextWebPage.url) {
@ -103,7 +101,6 @@ class NavigationToolbarTest {
navigationToolbar { navigationToolbar {
}.enterURLAndEnterToBrowser(refreshWebPage.url) { }.enterURLAndEnterToBrowser(refreshWebPage.url) {
dismissTrackingOnboarding()
verifyPageContent("DEFAULT") verifyPageContent("DEFAULT")
} }
@ -123,7 +120,6 @@ class NavigationToolbarTest {
navigationToolbar { navigationToolbar {
}.enterURLAndEnterToBrowser(defaultWebPage.url) { }.enterURLAndEnterToBrowser(defaultWebPage.url) {
dismissTrackingOnboarding()
verifyPageContent(defaultWebPage.content) verifyPageContent(defaultWebPage.content)
} }
} }
@ -134,7 +130,6 @@ class NavigationToolbarTest {
navigationToolbar { navigationToolbar {
}.enterURLAndEnterToBrowser(loremIpsumWebPage.url) { }.enterURLAndEnterToBrowser(loremIpsumWebPage.url) {
dismissTrackingOnboarding()
verifyPageContent(loremIpsumWebPage.content) verifyPageContent(loremIpsumWebPage.content)
} }

1
app/src/androidTest/java/org/mozilla/fenix/ui/ShareButtonTest.kt
View File

@ -50,7 +50,6 @@ class ShareButtonTest {
// - Visit a URL, wait until it's loaded // - Visit a URL, wait until it's loaded
navigationToolbar { navigationToolbar {
}.enterURLAndEnterToBrowser(defaultWebPage.url) { }.enterURLAndEnterToBrowser(defaultWebPage.url) {
dismissTrackingOnboarding()
verifyPageContent(defaultWebPage.content) verifyPageContent(defaultWebPage.content)
} }

4
app/src/androidTest/java/org/mozilla/fenix/ui/TabbedBrowsingTest.kt
View File

@ -67,7 +67,6 @@ class TabbedBrowsingTest {
navigationToolbar { navigationToolbar {
}.openNewTabAndEnterToBrowser(defaultWebPage.url) { }.openNewTabAndEnterToBrowser(defaultWebPage.url) {
dismissTrackingOnboarding()
verifyPageContent(defaultWebPage.content) verifyPageContent(defaultWebPage.content)
verifyTabCounter("1") verifyTabCounter("1")
}.openHomeScreen { } }.openHomeScreen { }
@ -98,8 +97,6 @@ class TabbedBrowsingTest {
navigationToolbar { navigationToolbar {
}.openNewTabAndEnterToBrowser(defaultWebPage.url) { }.openNewTabAndEnterToBrowser(defaultWebPage.url) {
dismissTrackingOnboarding()
verifyPageContent(defaultWebPage.content) verifyPageContent(defaultWebPage.content)
verifyTabCounter("1") verifyTabCounter("1")
}.openHomeScreen { }.openHomeScreen {
@ -126,7 +123,6 @@ class TabbedBrowsingTest {
navigationToolbar { navigationToolbar {
}.enterURLAndEnterToBrowser(defaultWebPage.url) { }.enterURLAndEnterToBrowser(defaultWebPage.url) {
dismissTrackingOnboarding()
verifyPageContent(defaultWebPage.content) verifyPageContent(defaultWebPage.content)
}.openHomeScreen { } }.openHomeScreen { }

5
app/src/androidTest/java/org/mozilla/fenix/ui/ThreeDotMenuMainTest.kt
View File

@ -7,9 +7,9 @@ package org.mozilla.fenix.ui
import androidx.test.platform.app.InstrumentationRegistry import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.uiautomator.UiDevice import androidx.test.uiautomator.UiDevice
import okhttp3.mockwebserver.MockWebServer import okhttp3.mockwebserver.MockWebServer
import org.junit.Rule
import org.junit.Before
import org.junit.After import org.junit.After
import org.junit.Before
import org.junit.Rule
import org.junit.Test import org.junit.Test
import org.mozilla.fenix.helpers.AndroidAssetDispatcher import org.mozilla.fenix.helpers.AndroidAssetDispatcher
import org.mozilla.fenix.helpers.HomeActivityTestRule import org.mozilla.fenix.helpers.HomeActivityTestRule
@ -59,7 +59,6 @@ class ThreeDotMenuMainTest {
}.goBack { }.goBack {
}.openThreeDotMenu { }.openThreeDotMenu {
}.openHelp { }.openHelp {
dismissTrackingOnboarding()
verifyHelpUrl() verifyHelpUrl()
}.openHomeScreen { }.openHomeScreen {
}.openThreeDotMenu { }.openThreeDotMenu {

5
app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
View File

@ -52,11 +52,6 @@ class BrowserRobot {
.check((matches(withText(containsString(expectedText))))) .check((matches(withText(containsString(expectedText)))))
} }
fun dismissTrackingOnboarding() {
mDevice.wait(Until.findObject(By.res("close_onboarding")), TestAssetHelper.waitingTime)
dismissOnboardingButton().click()
}
class Transition { class Transition {
private val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()) private val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())