diff --git a/detox/android/detox/build.gradle b/detox/android/detox/build.gradle index bf7a18319b..69251506ce 100644 --- a/detox/android/detox/build.gradle +++ b/detox/android/detox/build.gradle @@ -63,15 +63,17 @@ dependencies { minReactNative46Implementation 'com.squareup.okhttp3:okhttp:3.6.0' minReactNative46Implementation 'com.squareup.okio:okio:1.13.0' - implementation('com.android.support.test.espresso:espresso-core:3.0.0', { + implementation('com.android.support.test.espresso:espresso-core:3.0.2', { exclude group: 'com.google.code.findbugs' }) + implementation 'com.android.support.test:runner:1.0.2' + implementation 'com.android.support.test:rules:1.0.2' implementation 'org.apache.commons:commons-lang3:3.4' implementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3' testImplementation 'org.json:json:20140107' testImplementation 'junit:junit:4.12' - testImplementation 'org.assertj:assertj-core:3.5.2' + testImplementation 'org.assertj:assertj-core:3.8.0' testImplementation 'org.apache.commons:commons-io:1.3.2' } diff --git a/detox/test/android/app/build.gradle b/detox/test/android/app/build.gradle index 4a78b93713..6130f7ebb8 100644 --- a/detox/test/android/app/build.gradle +++ b/detox/test/android/app/build.gradle @@ -4,7 +4,7 @@ apply from: "../../node_modules/react-native/react.gradle" android { compileSdkVersion 27 - buildToolsVersion '27.0.2' + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.wix.detox.test" @@ -60,15 +60,15 @@ android { } dependencies { - implementation "com.android.support:appcompat-v7:27.0.2" + implementation "com.android.support:appcompat-v7:27.1.1" fromSourceImplementation(project(path: ":ReactAndroid")) fromBinImplementation "com.facebook.react:react-native:+" androidTestImplementation(project(path: ":detox")) androidTestImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.1' - androidTestImplementation 'com.android.support.test:rules:1.0.1' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test:rules:1.0.2' } // Run this once to be able to run the application with BUCK diff --git a/detox/test/android/build.gradle b/detox/test/android/build.gradle index 787881f4c4..900226844c 100644 --- a/detox/test/android/build.gradle +++ b/detox/test/android/build.gradle @@ -4,7 +4,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.4' classpath 'de.undercouch:gradle-download-task:3.1.2' } } diff --git a/detox/test/android/gradle/wrapper/gradle-wrapper.properties b/detox/test/android/gradle/wrapper/gradle-wrapper.properties index 749eaf0e74..e8df00778a 100644 --- a/detox/test/android/gradle/wrapper/gradle-wrapper.properties +++ b/detox/test/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip diff --git a/detox/test/package.json b/detox/test/package.json index af41ea8bbf..8892047e80 100644 --- a/detox/test/package.json +++ b/detox/test/package.json @@ -15,8 +15,8 @@ "verify-artifacts:android": "jest ./scripts/verify_artifacts_are_not_missing.android.test.js --testEnvironment node" }, "dependencies": { - "react": "16.0.0", - "react-native": "0.51.x" + "react": "16.4.1", + "react-native": "0.56.0" }, "devDependencies": { "detox": "^8.0.0", @@ -74,4 +74,4 @@ } } } -} +} \ No newline at end of file diff --git a/detox/test/scripts/__snapshots__/verify_artifacts_are_not_missing.android.test.js.snap b/detox/test/scripts/__snapshots__/verify_artifacts_are_not_missing.android.test.js.snap index 6b7fef87a0..8997c124ea 100644 --- a/detox/test/scripts/__snapshots__/verify_artifacts_are_not_missing.android.test.js.snap +++ b/detox/test/scripts/__snapshots__/verify_artifacts_are_not_missing.android.test.js.snap @@ -108,6 +108,10 @@ Array [ "./✓ Async and Callbacks should handle done() callback/afterEach.png", "./✓ Async and Callbacks should handle done() callback/beforeEach.png", "./✓ Async and Callbacks should handle done() callback/test.log", + "./✓ Device :android: device back button :android: should show popup back pressed when back button is pressed", + "./✓ Device :android: device back button :android: should show popup back pressed when back button is pressed/afterEach.png", + "./✓ Device :android: device back button :android: should show popup back pressed when back button is pressed/beforeEach.png", + "./✓ Device :android: device back button :android: should show popup back pressed when back button is pressed/test.log", "./✓ Device Orientation OrientationLandscape", "./✓ Device Orientation OrientationLandscape/afterEach.png", "./✓ Device Orientation OrientationLandscape/beforeEach.png", diff --git a/scripts/ci.android.sh b/scripts/ci.android.sh index 3a9f559542..5a66740f60 100755 --- a/scripts/ci.android.sh +++ b/scripts/ci.android.sh @@ -6,14 +6,12 @@ pushd detox/android run_f "./gradlew test" popd -if [ $JENKINS_CI ] ; then - pushd detox/test - # Workaround until react android issue will be fixed - react-native: 0.55 - mv node_modules/react-native/ReactAndroid/release.gradle node_modules/react-native/ReactAndroid/release.gradle.bak - cp extras/release.gradle node_modules/react-native/ReactAndroid/ +pushd detox/test +# Workaround until react android issue will be fixed - react-native: 0.55 +mv node_modules/react-native/ReactAndroid/release.gradle node_modules/react-native/ReactAndroid/release.gradle.bak +cp extras/release.gradle node_modules/react-native/ReactAndroid/ - run_f "npm run build:android" - run_f "npm run e2e:android -- --headless --no-color" - run_f "npm run verify-artifacts:android" - popd -fi +run_f "npm run build:android" +run_f "npm run e2e:android -- --headless --no-color" +run_f "npm run verify-artifacts:android" +popd