fix android e2e and --release flags, closes #1956

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/ApplicationLifecycleTest.java

@@ -6,6 +6,7 @@ import android.provider.Settings;
 import android.support.test.uiautomator.By;
 import android.view.KeyEvent;
 
+import org.junit.Assume;
 import org.junit.Test;
 
 import static android.support.test.InstrumentationRegistry.getInstrumentation;
@@ -60,12 +61,15 @@ public class ApplicationLifecycleTest extends BaseTest {
 
 	@Test
 	public void pressingMenuOpensDevMenu() throws Exception {
+		Assume.assumeTrue(isDebug());
 		device().pressKeyCode(KeyEvent.KEYCODE_MENU);
 		assertExists(By.text("Debug JS Remotely"));
 	}
 
 	@Test
 	public void pressingRTwiceInSuccessionReloadsReactNative() throws Exception {
+		Assume.assumeTrue(isDebug());
+
 		elementByText("PUSH").click();
 		assertExists(By.text("Pushed Screen"));
 
@@ -77,6 +81,8 @@ public class ApplicationLifecycleTest extends BaseTest {
 
 	@Test
 	public void pressingRTwiceWithDelayDoesNothing() throws Exception {
+		Assume.assumeTrue(isDebug());
+
 		elementByText("PUSH").click();
 		assertExists(By.text("Pushed Screen"));
 
@@ -88,6 +94,8 @@ public class ApplicationLifecycleTest extends BaseTest {
 
 	@Test
 	public void sendingReloadBroadcastReloadsReactNative() throws Exception {
+		Assume.assumeTrue(isDebug());
+
 		elementByText("PUSH").click();
 		assertExists(By.text("Pushed Screen"));
 

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/BaseTest.java

@@ -1,5 +1,7 @@
 package com.reactnativenavigation.e2e.androide2e;
 
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.support.test.runner.AndroidJUnit4;
@@ -98,4 +100,9 @@ public abstract class BaseTest {
 	public void swipeOpenLeftSideMenu() {
 		device().swipe(5, 152, 500, 152, 15);
 	}
+
+	public boolean isDebug() throws Exception {
+		PackageInfo packageInfo = getInstrumentation().getTargetContext().getPackageManager().getPackageInfo("com.reactnativenavigation.playground", 0);
+		return (packageInfo.applicationInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
+	}
 }

AndroidE2E/app/src/main/AndroidManifest.xml

@@ -12,7 +12,6 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
     </application>
 
 </manifest>

AndroidE2E/build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

docs/docs/CONTRIBUTING.md

@@ -108,13 +108,13 @@ No PR will be accepted without adequate test coverage.
 | `npm run clean` | cleans all build directories, stops packager, fixes flakiness by removing watchman cache, etc. |
 | `npm run start` | starts the react-native packager for local debugging |
 | `npm run xcode` | for convenience, opens xcode in this project |
-| `npm run install-android`  |  builds playground debug/release version and installs on running android devices/emulators. <br> **Options:** `-- release` |
+| `npm run install-android`  |  builds playground debug/release version and installs on running android devices/emulators. <br> **Options:** `-- --release` |
 | `npm run uninstall-android` | uninstalls playground from running android devices/simulators |
 | `npm run test-js` | runs javascript tests and coverage report |
 | `npm run test-watch` | runs javascript tests in watch mode (can also use the provided wallaby config) |
-| `npm run test-unit-ios` | runs ios unit tests in debug/release <br> **Options:** `-- release` |
-| `npm run test-unit-android` | runs android unit tests in debug/release <br> **Options:** `-- release` |
-| `npm run test-e2e-ios` | runs the ios e2e suite (with detox) in debug/release |
-| `npm run test-e2e-android` | runs the android e2e suite (with uiautomator) in debug/release on running devices/emulators <br> **Options:** `-- [release] [just com.TestClass#testMethod]` |
+| `npm run test-unit-ios` | runs ios unit tests in debug/release <br> **Options:** `-- --release` |
+| `npm run test-unit-android` | runs android unit tests in debug/release <br> **Options:** `-- --release` |
+| `npm run test-e2e-ios` | runs the ios e2e suite (with detox) in debug/release <br> **Options:** `-- --release`|
+| `npm run test-e2e-android` | runs the android e2e suite (with uiautomator) in debug/release on running devices/emulators <br> **Options:** `-- [--release] [--just com.TestClass#testMethod]` |
 | `npm run test-all` | runs all tests in parallel |
 

scripts/install-android.js

@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const exec = require('shell-utils').exec;
 
-const release = _.includes(process.argv, 'release');
+const release = _.includes(process.argv, '--release');
 
 run();
 

scripts/test.e2e.android.js

@@ -2,16 +2,16 @@
 const _ = require('lodash');
 const exec = require('shell-utils').exec;
 
-const release = _.includes(process.argv, 'release');
+const release = _.includes(process.argv, '--release');
 
-// Run just a single test, e.g. npm test-e2e-android -- just com.MyClass#myMethod
-const filter = _(process.argv).dropWhile((a) => a !== 'just').take(2).last();
+// Run just a single test, e.g. npm test-e2e-android -- --just com.MyClass#myMethod
+const filter = _.chain(process.argv).dropWhile((a) => a !== '--just').take(2).last().value();
 
 run();
 
 function run() {
   if (process.env.CI) {
-    console.log(`android e2e is disabled on CI`);
+    console.log(`android e2e is disabled on CI until Travis will support x86 emulators or we migrate to our own solution`);
   } else {
     assertEnv();
     if (!isDeviceRunning()) {
@@ -38,7 +38,7 @@ function isDeviceRunning() {
 
 function startEmulator() {
   console.log(`Looking for avd...`);
-  const avds = exec.execSyncRead(`avdmanager list avd -c`);
+  const avds = exec.execSyncRead(`${process.env.ANDROID_HOME}/tools/bin/avdmanager list avd -c`);
   const avdName = /^.*package\.xml(\S+)$/.exec(avds)[1];
   if (_.isEmpty(avdName)) {
     throw new Error(`Launch an android emulator or connect a device`);
@@ -50,30 +50,8 @@ function startEmulator() {
 
 function runTests() {
   exec.execSync(`npm run uninstall-android`);
-  exec.execSync(`npm run install-android ${release ? '-- release' : ''}`);
+  exec.execSync(`npm run install-android ${release ? '-- --release' : ''}`);
   const filterParam = filter ? '-Pandroid.testInstrumentationRunnerArguments.class=' + filter : '';
   exec.execSync(`cd AndroidE2E && ./gradlew ${filterParam} connectedDebugAndroidTest`);
+  process.exit(0); // eslint-disable-line
 }
-
-// const avdName = 'pixel';
-// const sdk = 'android-24';
-// const apis = 'default';
-// const abi = 'armeabi-v7a';
-// const packageName = `system-images;${sdk};${apis};${abi}`;
-
-// function installEmulator() {
-//   exec.execSync(`sdkmanager "emulator"`);
-//   exec.execSync(`sdkmanager "${packageName}"`);
-//   exec.execSync(`echo no | avdmanager create avd --force --name "${avdName}" --abi "${apis}/${abi}" --package "${packageName}" --device "pixel"`);
-//   exec.execSync(`avdmanager list avd`);
-// }
-
-// function launchEmulator() {
-//   console.log(`Launching Android Emulator`);
-//   exec.execSync(`cd $ANDROID_HOME/tools && ./emulator -skin 1080x1920 -gpu host -no-audio @${avdName}`);
-//   exec.execSync(`./scripts/waitForAndroidEmulator.sh`);
-// }
-
-// function killEmulators() {
-//   exec.execSync(`adb devices | grep emulator | cut -f1 | while read line; do adb -s $line emu kill; done`);
-// }

scripts/test.e2e.ios.js

@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const exec = require('shell-utils').exec;
 
-const release = _.includes(process.argv, 'release');
+const release = _.includes(process.argv, '--release');
 
 function buildProjForDetox() {
   const scheme = release ? `playground_release` : `playground`;

scripts/test.unit.android.js

@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const exec = require('shell-utils').exec;
 
-const release = _.includes(process.argv, 'release');
+const release = _.includes(process.argv, '--release');
 
 run();
 

scripts/test.unit.ios.js

@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const exec = require('shell-utils').exec;
 
-const release = _.includes(process.argv, 'release');
+const release = _.includes(process.argv, '--release');
 
 function run() {
   const conf = release ? `Release` : `Debug`;

scripts/travis.sh

@@ -22,8 +22,8 @@ run_f () {
 run_f "npm install"
 run_f "npm run clean"
 run_f "npm run test-js"
-run_f "npm run test-unit-android -- release"
-run_f "npm run test-unit-ios -- release"
-run_f "npm run test-e2e-android -- release"
-run_f "npm run test-e2e-ios -- release"
+run_f "npm run test-unit-android -- --release"
+run_f "npm run test-unit-ios -- --release"
+run_f "npm run test-e2e-android -- --release"
+run_f "npm run test-e2e-ios -- --release"
 run_f "npm run release"