testing e2e works

package.json

@@ -30,10 +30,12 @@
     "install-android": "cd playground/android && ./gradlew installDebug",
     "uninstall-android": "cd playground/android && ./gradlew uninstallAll",
     "start": "adb reverse tcp:8081 tcp:8081; watchman watch-del-all; node ./node_modules/react-native/local-cli/cli.js start --root=./playground",
-    "test-js": "eslint lib/src integration scripts playground/src playground/e2e playground/scripts && BABEL_ENV=test jest --coverage",
-    "test-android": "node ./scripts/test.android.js",
+    "test-js": "eslint lib/src integration e2e scripts playground/src && BABEL_ENV=test jest --coverage",
+    "test-unit-android": "node ./scripts/test.unit.android.js",
     "test-unit-ios": "node ./scripts/test.unit.ios.js",
-    "test": "yarn run test-js && yarn run test-android && yarn run test-ios",
+    "test-e2e-android": "node ./scripts/test.e2e.android.js",
+    "test-e2e-ios": "node ./scripts/test.e2e.ios.js",
+    "test": "yarn run test-js && yarn run test-unit-android && yarn run test-e2e-android && yarn run test-unit-ios && yarn run test-e2e-ios",
     "test-watch": "BABEL_ENV=test jest --coverage --watch",
     "release": "node ./scripts/release.js"
   },

scripts/test.android.js → scripts/test.e2e.android.js

@@ -1,10 +1,6 @@
 const exec = require('shell-utils').exec;
 
-function unitTests() {
-  exec.execSync(`cd lib/android && ./gradlew clean testDebugUnitTest`);
-}
-
-function e2e() {
+function run() {
   if (process.env.CI) {
     console.log(`e2e disabled on CI`); //eslint-disable-line
     return;
@@ -20,12 +16,4 @@ function e2e() {
   }
 }
 
-function run() {
-  if (process.env.CI) {
-    exec.execSync(`./scripts/installAndroidSDK.sh`);
-  }
-  unitTests();
-  e2e();
-}
-
 run();

playground/scripts/e2e.ios.js → scripts/test.e2e.ios.js

@@ -8,7 +8,7 @@ function buildProjForDetox() {
 
   shellUtils.exec.execSync(`echo 'travis_fold:start:xcodebuild'`);
   const cmd = `RCT_NO_LAUNCH_PACKAGER=true
-          cd ios && xcodebuild
+          cd ./playground/ios && xcodebuild
             -scheme ${scheme}
             ${release ? 'clean build' : 'build'}
             -project playground.xcodeproj
@@ -34,7 +34,7 @@ function e2e() { //eslint-disable-line
   try {
     shellUtils.exec.execSync(`echo 'travis_fold:start:detox-ios'`);
     shellUtils.exec.execSyncSilent(`watchman watch-del-all || true`);
-    const detoxAppBuildPath = `ios/DerivedData/playground/Build/Products/${release ? 'Release' : 'Debug'}-iphonesimulator/playground.app`;
+    const detoxAppBuildPath = `playground/ios/DerivedData/playground/Build/Products/${release ? 'Release' : 'Debug'}-iphonesimulator/playground.app`;
 
     shellUtils.exec.execSync(`detoxAppBuildPath="${detoxAppBuildPath}"
                               BABEL_ENV=test

scripts/test.unit.android.js

@@ -0,0 +1,10 @@
+const exec = require('shell-utils').exec;
+
+function run() {
+  if (process.env.CI) {
+    exec.execSync(`./scripts/installAndroidSDK.sh`);
+  }
+  exec.execSync(`cd lib/android && ./gradlew clean testDebugUnitTest`);
+}
+
+run();

scripts/test.unit.ios.js

@@ -16,7 +16,7 @@ function hasXcpretty() {
   }
 }
 
-function testProject() {
+function run() {
   try {
     shellUtils.exec.execSync(`echo 'travis_fold:start:xcodeunit'`);
     runWithXcprettyIfPossible(`RCT_NO_LAUNCH_PACKAGER=true
@@ -37,8 +37,4 @@ function testProject() {
   }
 }
 
-function run() {
-  testProject();
-}
-
 run();