Skip to content

Commit 07f710c

Browse files
AndiAJmergify[bot]
authored andcommitted
Switch device model for running UI tests
1 parent e15e8d6 commit 07f710c

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

app/src/androidTest/java/org/mozilla/reference/browser/ui/SettingsViewTest.kt

-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import org.junit.Rule
1111
import org.junit.Test
1212
import org.mozilla.reference.browser.helpers.BrowserActivityTestRule
1313
import org.mozilla.reference.browser.helpers.RetryTestRule
14-
import org.mozilla.reference.browser.helpers.TestHelper.scrollToElementByText
1514
import org.mozilla.reference.browser.ui.robots.mDevice
1615
import org.mozilla.reference.browser.ui.robots.navigationToolbar
1716

@@ -137,7 +136,6 @@ class SettingsViewTest {
137136
navigationToolbar {
138137
}.openThreeDotMenu {
139138
}.openSettings {
140-
scrollToElementByText("About Reference Browser")
141139
}.openAboutReferenceBrowser {
142140
verifyAboutBrowser()
143141
}
@@ -153,7 +151,6 @@ class SettingsViewTest {
153151
navigationToolbar {
154152
}.openThreeDotMenu {
155153
}.openSettings {
156-
scrollToElementByText("About Reference Browser")
157154
verifyCustomAddonCollectionButton()
158155
clickCustomAddonCollectionButton()
159156
verifyCustomAddonCollectionPanelExist()

app/src/androidTest/java/org/mozilla/reference/browser/ui/robots/SettingsViewRobot.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import org.junit.Assert.assertTrue
2222
import org.mozilla.reference.browser.R
2323
import org.mozilla.reference.browser.helpers.TestAssetHelper
2424
import org.mozilla.reference.browser.helpers.TestAssetHelper.waitingTime
25-
import org.mozilla.reference.browser.helpers.TestHelper
2625
import org.mozilla.reference.browser.helpers.TestHelper.assertUIObjectExists
2726
import org.mozilla.reference.browser.helpers.TestHelper.getStringResource
2827
import org.mozilla.reference.browser.helpers.TestHelper.itemWithText
@@ -203,10 +202,8 @@ private fun assertRemoteDebugging() = remoteDebuggingToggle()
203202
.check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
204203
private fun assertCustomAddonCollectionButton() = customAddonCollectionButton()
205204
.check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
206-
private fun assertMozillaHeading() {
207-
TestHelper.scrollToElementByText("About Reference Browser")
205+
private fun assertMozillaHeading() =
208206
mozillaHeading().check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
209-
}
210207
private fun assertAboutReferenceBrowserButton() = aboutReferenceBrowserButton()
211208
.check(matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
212209
private fun assertCustomAddonCollectionPanel() {

automation/taskcluster/androidTest/flank-arm64-v8a.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ gcloud:
2323
- package org.mozilla.reference.browser.ui
2424

2525
device:
26-
- model: Pixel2.arm
26+
- model: MediumPhone.arm
2727
version: 30
2828
locale: en_US
2929

0 commit comments

Comments
 (0)