Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

For #12018 - Sync Int tests fixes #12252

Merged
merged 1 commit into from
Jul 3, 2020
Merged

For #12018 - Sync Int tests fixes #12252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions app/src/androidTest/java/org/mozilla/fenix/components/FxaServer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 7 additions & 3 deletions app/src/androidTest/java/org/mozilla/fenix/syncintegration/SyncIntegrationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}

Expand Down Expand Up @@ -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()
}
Expand Down