Skip to content

Fix Github tests #1426

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.

Sign up for GitHub

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

Merged
samtstern merged 2 commits into from
Aug 29, 2018
Merged

Fix Github tests #1426

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84bcc00
Fix Github tests
samtstern Aug 29, 2018
35d8a2f
Fix in tests, not public
samtstern Aug 29, 2018
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
15 changes: 9 additions & 6 deletions auth/src/test/java/com/firebase/ui/auth/viewmodel/SocialProviderResponseHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
Expand All @@ -64,16 +63,19 @@ public class SocialProviderResponseHandlerTest {

private SocialProviderResponseHandler mHandler;

private static final ArrayList<String> NON_GITHUB_PROVIDERS = new ArrayList<>();
static {
NON_GITHUB_PROVIDERS.addAll(AuthUI.SUPPORTED_PROVIDERS);
NON_GITHUB_PROVIDERS.remove(GithubAuthProvider.PROVIDER_ID);
}

@Before
public void setUp() {
TestHelper.initialize();
MockitoAnnotations.initMocks(this);

mHandler = new SocialProviderResponseHandler(RuntimeEnvironment.application);

List<String> allExceptGitHub = new ArrayList<>(AuthUI.SUPPORTED_PROVIDERS);
allExceptGitHub.remove(GithubAuthProvider.PROVIDER_ID);
FlowParameters testParams = TestHelper.getFlowParameters(allExceptGitHub);
FlowParameters testParams = TestHelper.getFlowParameters(NON_GITHUB_PROVIDERS);

mHandler.initializeForTesting(testParams, mMockAuth, null, null);
}
Expand Down Expand Up @@ -316,7 +318,8 @@ public void testSignInIdp_anonymousUserUpgradeEnabledAndExistingPasswordUserWith

private void setupAnonymousUpgrade() {
// enableAnonymousUpgrade must be set to true
FlowParameters testParams = TestHelper.getFlowParameters(AuthUI.SUPPORTED_PROVIDERS, /* enableAnonymousUpgrade */ true);
FlowParameters testParams = TestHelper.getFlowParameters(NON_GITHUB_PROVIDERS,
/* enableAnonymousUpgrade */ true);
mHandler.initializeForTesting(testParams, mMockAuth, null, null);

when(mUser.isAnonymous()).thenReturn(true);
Expand Down