Skip to content

Robolectic now supports api 25! #494

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
merged 3 commits into from
Jan 9, 2017
Merged

Robolectic now supports api 25! #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58773c2
Upgrade robolectric
SUPERCILEX Jan 5, 2017
099d9a9
Update robolectric
SUPERCILEX Jan 6, 2017
dd59c22
Merge remote-tracking branch 'firebase/version-1.1.0-dev' into robole…
SUPERCILEX Jan 6, 2017
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
3 changes: 1 addition & 2 deletions auth/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ dependencies {
testCompile 'junit:junit:4.12'
//noinspection NewerVersionAvailable, GradleDynamicVersion
testCompile 'org.mockito:mockito-core:2.5.+'
//noinspection NewerVersionAvailable
testCompile 'org.robolectric:robolectric:3.1.4'
testCompile 'org.robolectric:robolectric:3.2.1'
// See https://github.com/robolectric/robolectric/issues/1932#issuecomment-219796474
testCompile 'org.khronos:opengl-api:gl1.1-android-2.1_r1'
}
Expand Down
2 changes: 1 addition & 1 deletion auth/src/test/java/com/firebase/ui/auth/AuthUITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import static junit.framework.Assert.assertEquals;

@RunWith(CustomRobolectricGradleTestRunner.class)
@Config(constants = BuildConfig.class, sdk = 23)
@Config(constants = BuildConfig.class, sdk = 25)
public class AuthUITest {
private FirebaseApp mFirebaseApp;

Expand Down
2 changes: 1 addition & 1 deletion auth/src/test/java/com/firebase/ui/auth/ui/email/RecoverPasswordActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import static org.mockito.Mockito.when;

@RunWith(CustomRobolectricGradleTestRunner.class)
@Config(constants = BuildConfig.class, sdk = 23)
@Config(constants = BuildConfig.class, sdk = 25)
public class RecoverPasswordActivityTest {

@Before
Expand Down
2 changes: 1 addition & 1 deletion auth/src/test/java/com/firebase/ui/auth/ui/email/RegisterEmailActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@


@RunWith(CustomRobolectricGradleTestRunner.class)
@Config(constants = BuildConfig.class, sdk = 23)
@Config(constants = BuildConfig.class, sdk = 25)
public class RegisterEmailActivityTest {

private RegisterEmailActivity createActivity() {
Expand Down
2 changes: 1 addition & 1 deletion auth/src/test/java/com/firebase/ui/auth/ui/email/WelcomeBackPasswordPromptTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
import static org.mockito.Mockito.when;

@RunWith(CustomRobolectricGradleTestRunner.class)
@Config(constants = BuildConfig.class, sdk = 23)
@Config(constants = BuildConfig.class, sdk = 25)
public class WelcomeBackPasswordPromptTest {
@Before
public void setUp() {
Expand Down
2 changes: 1 addition & 1 deletion auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
GoogleProviderShadow.class,
FacebookProviderShadow.class,
LoginManagerShadow.class
}, sdk = 23)
}, sdk = 25)
public class AuthMethodPickerActivityTest {
@Test
public void testAllProvidersArePopulated() {
Expand Down
2 changes: 1 addition & 1 deletion auth/src/test/java/com/firebase/ui/auth/ui/idp/CredentialSignInHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
import static org.mockito.Mockito.when;

@RunWith(CustomRobolectricGradleTestRunner.class)
@Config(constants = BuildConfig.class, sdk = 23, shadows = {ActivityHelperShadow.class})
@Config(constants = BuildConfig.class, sdk = 25, shadows = {ActivityHelperShadow.class})
public class CredentialSignInHandlerTest {
private static final int RC_ACCOUNT_LINK = 3;
private static final String LINKING_ERROR = "ERROR_TEST_LINKING";
Expand Down