-
Notifications
You must be signed in to change notification settings - Fork 1.9k
fix: ensure that when selecting phone or email, it routes straight to that screen #2311
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
russellwheatley
wants to merge
7
commits into
version-10.0.0-beta03
Choose a base branch
from
fix-intermediate-view
base: version-10.0.0-beta03
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
0a9e5c3
fix: ensure that when selecting phone or email, it routes straight to…
russellwheatley 459d9b7
fix: still routing to method picker rather than email screen
russellwheatley 1656841
test: fix tests so they now check screens when - isProviderChoiceAlwa…
russellwheatley 43b2c39
fix: deduplicate logic and observe IdTokenListener in addition to Aut…
russellwheatley 71acb7a
test: GoogleAuthScreenTest to avoid account collisions
russellwheatley b7d8e1f
test: AnonymousAuthScreenTest switch to unique test data to avoid col…
russellwheatley c323734
test: add coverage for single non-email provider start route
russellwheatley File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
118 changes: 118 additions & 0 deletions
118
auth/src/test/java/com/firebase/ui/auth/ui/screens/FirebaseAuthScreenRouteTest.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| package com.firebase.ui.auth.ui.screens | ||
|
|
||
| import android.content.Context | ||
| import androidx.test.core.app.ApplicationProvider | ||
| import com.firebase.ui.auth.configuration.authUIConfiguration | ||
| import com.firebase.ui.auth.configuration.auth_provider.AuthProvider | ||
| import com.google.common.truth.Truth.assertThat | ||
| import org.junit.Before | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.robolectric.RobolectricTestRunner | ||
| import org.robolectric.annotation.Config | ||
|
|
||
| @RunWith(RobolectricTestRunner::class) | ||
| @Config(manifest = Config.NONE) | ||
| class FirebaseAuthScreenRouteTest { | ||
|
|
||
| private lateinit var applicationContext: Context | ||
|
|
||
| @Before | ||
| fun setUp() { | ||
| applicationContext = ApplicationProvider.getApplicationContext() | ||
| } | ||
|
|
||
| @Test | ||
| fun `single email provider starts at email route`() { | ||
| val configuration = authUIConfiguration { | ||
| context = applicationContext | ||
| providers { | ||
| provider( | ||
| AuthProvider.Email( | ||
| emailLinkActionCodeSettings = null, | ||
| passwordValidationRules = emptyList() | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| assertThat(getStartRoute(configuration)).isEqualTo(AuthRoute.Email) | ||
| } | ||
|
|
||
| @Test | ||
| fun `single phone provider starts at phone route`() { | ||
| val configuration = authUIConfiguration { | ||
| context = applicationContext | ||
| providers { | ||
| provider( | ||
| AuthProvider.Phone( | ||
| defaultNumber = null, | ||
| defaultCountryCode = null, | ||
| allowedCountries = null | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| assertThat(getStartRoute(configuration)).isEqualTo(AuthRoute.Phone) | ||
| } | ||
|
|
||
| @Test | ||
| fun `single google provider starts at method picker`() { | ||
| val configuration = authUIConfiguration { | ||
| context = applicationContext | ||
| providers { | ||
| provider( | ||
| AuthProvider.Google( | ||
| scopes = emptyList(), | ||
| serverClientId = "test-client-id" | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| assertThat(getStartRoute(configuration)).isEqualTo(AuthRoute.MethodPicker) | ||
| } | ||
|
|
||
| @Test | ||
| fun `single email provider shows picker when always shown is enabled`() { | ||
| val configuration = authUIConfiguration { | ||
| context = applicationContext | ||
| providers { | ||
| provider( | ||
| AuthProvider.Email( | ||
| emailLinkActionCodeSettings = null, | ||
| passwordValidationRules = emptyList() | ||
| ) | ||
| ) | ||
| } | ||
| isProviderChoiceAlwaysShown = true | ||
| } | ||
|
|
||
| assertThat(getStartRoute(configuration)).isEqualTo(AuthRoute.MethodPicker) | ||
| } | ||
|
|
||
| @Test | ||
| fun `multiple providers start at method picker`() { | ||
| val configuration = authUIConfiguration { | ||
| context = applicationContext | ||
| providers { | ||
| provider( | ||
| AuthProvider.Email( | ||
| emailLinkActionCodeSettings = null, | ||
| passwordValidationRules = emptyList() | ||
| ) | ||
| ) | ||
| provider( | ||
| AuthProvider.Phone( | ||
| defaultNumber = null, | ||
| defaultCountryCode = null, | ||
| allowedCountries = null | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| assertThat(getStartRoute(configuration)).isEqualTo(AuthRoute.MethodPicker) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.