status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

another fix to OSS tests 

Summary: Closes https://github.com/facebook/react-native/pull/8151

Differential Revision: D3444091

fbshipit-source-id: a8a43a56332c66b0af84695aa54fb1e4c5d659f6
This commit is contained in:
Konstantin Raev 2016-06-16 04:04:34 -07:00 committed by Facebook Github Bot 8
parent e514ff5ad4
commit 192f6ddf82
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ReactAndroid/build.gradle
View File

@ -254,6 +254,10 @@ android {
lintOptions { lintOptions {
abortOnError false abortOnError false
} }
packagingOptions {
exclude 'META-INF/NOTICE'
exclude 'META-INF/LICENSE'
}
} }
dependencies { dependencies {
@ -280,6 +284,7 @@ dependencies {
testCompile "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}" testCompile "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
androidTestCompile 'com.android.support.test:runner:0.3' androidTestCompile 'com.android.support.test:runner:0.3'
androidTestCompile "org.mockito:mockito-core:${MOCKITO_CORE_VERSION}"
} }
apply from: 'release.gradle' apply from: 'release.gradle'

2
ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactIntegrationTestCase.java
View File

@ -35,7 +35,7 @@ import com.facebook.react.modules.core.Timing;
import com.facebook.soloader.SoLoader; import com.facebook.soloader.SoLoader;
import static org.mockito.Mockito.*; import static org.mockito.Mockito.mock;
/** /**
* Use this class for writing integration tests of catalyst. This class will run all JNI call * Use this class for writing integration tests of catalyst. This class will run all JNI call