blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #12018 - Sync Int tests fixes (#12252)

master
isabelrios 2020-07-03 19:49:40 +02:00 committed by GitHub
parent 0a4f92a5d0
commit 84324f52ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/androidTest/java/org/mozilla/fenix/components/FxaServer.kt
View File

@ -13,11 +13,8 @@ import mozilla.components.service.fxa.ServerConfig
*/
object FxaServer {
const val CLIENT_ID = "a2270f727f45f648"
const val REDIRECT_URL = "https://accounts.stage.mozaws.net/oauth/success/$CLIENT_ID"
@Suppress("UNUSED_PARAMETER")
fun redirectUrl(context: Context) = REDIRECT_URL
private const val CLIENT_ID = "a2270f727f45f648"
const val REDIRECT_URL = "urn:ietf:wg:oauth:2.0:oob:oauth-redirect-webchannel"
@Suppress("UNUSED_PARAMETER")
fun config(context: Context): ServerConfig {

10
app/src/androidTest/java/org/mozilla/fenix/syncintegration/SyncIntegrationTest.kt
View File

@ -63,10 +63,12 @@ class SyncIntegrationTest {
signInFxSync()
tapReturnToPreviousApp()
// Let's wait until homescreen is shown to go to three dot menu
mDevice.waitNotNull(Until.findObjects(By.text("Open tabs")), TestAssetHelper.waitingTime)
TestAssetHelper.waitingTime
mDevice.waitNotNull(Until.findObjects(By.res("org.mozilla.fenix.debug:id/counter_root")))
homeScreen {
}.openThreeDotMenu {
}.openHistory { }
}.openHistory {
}
historyAfterSyncIsShown()
}
@ -221,8 +223,10 @@ class SyncIntegrationTest {
mDevice.waitNotNull(Until.findObjects(By.text("Save")), TestAssetHelper.waitingTime)
mDevice.waitNotNull(Until.findObjects(By.text("Settings")), TestAssetHelper.waitingTime)
// Wait until the Settings shows the account synced
/* Wait until the Settings shows the account synced */
mDevice.waitNotNull(Until.findObjects(By.text("Account")), TestAssetHelper.waitingTime)
mDevice.waitNotNull(Until.findObjects(By.res("org.mozilla.fenix.debug:id/email")), TestAssetHelper.waitingTime)
TestAssetHelper.waitingTime
// Go to Homescreen
mDevice.pressBack()
}