upgraded detox to version 6.x.x (#2284)

* upgraded detox to version 6.x.x

* fixed detox script, added release config

e2e/init.js

@@ -1,17 +1,9 @@
 require('babel-polyfill'); // eslint-disable-line import/no-extraneous-dependencies
 const detox = require('detox');
+const config = require('../package.json').detox;
 
 before(async () => {
-  const detoxConfig = {
-    configurations: {
-      ios: {
-        binaryPath: process.env.detoxAppBuildPath,
-        type: 'ios.simulator',
-        name: 'iPhone 7'
-      }
-    }
-  };
-  await detox.init(detoxConfig, { launchApp: false });
+  await detox.init(config, { launchApp: false });
 });
 
 after(async () => {

e2e/mocha.opts

@@ -0,0 +1 @@
+--recursive --timeout 300000 --bail

package-lock.json

@@ -2123,27 +2123,29 @@
       }
     },
     "detox": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/detox/-/detox-5.10.0.tgz",
-      "integrity": "sha512-ji/7dyO3GBTlhD6CNt/hMpeYJymRLm7Cl6np8tMO2tG9PPrJZqhNUDGxENPLwKxHDZ+NqC8PrbEA1PzeqdbcUw==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/detox/-/detox-6.0.2.tgz",
+      "integrity": "sha512-q2Wx7x0Lc/LXh0BxgEPDdntxVbt7apJAZ3Tu6mjkNBuCy8mh9yEAGhOvtC9eI8tor+BMMi9kxzl26W6AHFjYxA==",
       "dev": true,
       "requires": {
         "child-process-promise": "2.2.1",
         "commander": "2.12.2",
-        "detox-server": "2.1.0",
+        "detox-server": "6.0.2",
         "fs-extra": "4.0.2",
         "get-port": "2.1.0",
+        "ini": "1.3.5",
         "lodash": "4.17.4",
         "npmlog": "4.1.2",
         "shell-utils": "1.0.9",
+        "tail": "1.2.3",
         "telnet-client": "0.15.3",
         "ws": "1.1.5"
       }
     },
     "detox-server": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detox-server/-/detox-server-2.1.0.tgz",
-      "integrity": "sha512-Q4ZBcCYmRSymMabizH+Fao8SgKHCgvwYuHsutLslcDW5s0UR8hegC55cX0y/7vNA3Y+qtD844ivzWps5TjBJ+A==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/detox-server/-/detox-server-6.0.2.tgz",
+      "integrity": "sha512-Pt1Lfnkdpm5uGcuXs5fwLj7sOX2DpRlTXTiUrrMWKXtIX3yZhaUTmgpN+30bWhmh0WBAJA+yZeAwdxwqI0WPrA==",
       "dev": true,
       "requires": {
         "lodash": "4.17.4",
@@ -6206,9 +6208,9 @@
       }
     },
     "mobx": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/mobx/-/mobx-3.3.2.tgz",
-      "integrity": "sha1-6RKp98grLfafGr5lFeyqVRgooCQ=",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/mobx/-/mobx-3.4.0.tgz",
+      "integrity": "sha1-uX+Y2XPRvibRhdPPx4BT3Ugp7JU=",
       "dev": true
     },
     "mocha": {
@@ -7838,7 +7840,7 @@
       "dev": true,
       "requires": {
         "lodash": "4.17.4",
-        "mobx": "3.3.2"
+        "mobx": "3.4.0"
       }
     },
     "repeat-element": {
@@ -8650,6 +8652,12 @@
         }
       }
     },
+    "tail": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/tail/-/tail-1.2.3.tgz",
+      "integrity": "sha1-sI1vp5+5KIaWMaNBpRwUSXwcQlU=",
+      "dev": true
+    },
     "telnet-client": {
       "version": "0.15.3",
       "resolved": "https://registry.npmjs.org/telnet-client/-/telnet-client-0.15.3.tgz",

package.json

@@ -52,7 +52,7 @@
     "eslint-config-xo": "0.18.x",
     "eslint-config-xo-react": "0.14.x",
     "eslint-plugin-react": "7.x.x",
-    "detox": "5.x.x",
+    "detox": "6.x.x",
     "jest": "21.x.x",
     "mocha": "4.x.x",
     "react": "16.0.0-alpha.6",
@@ -98,6 +98,25 @@
       }
     }
   },
+  "detox": {
+    "test-runner": "mocha",
+    "specs": "e2e",
+    "runner-config": "e2e/mocha.opts",
+    "configurations": {
+      "ios.sim.debug": {
+        "binaryPath": "playground/ios/DerivedData/playground/Build/Products/Debug-iphonesimulator/playground.app",
+        "build": "RCT_NO_LAUNCH_PACKAGER=true xcodebuild build -scheme playground -project playground/ios/playground.xcodeproj -sdk iphonesimulator -configuration Debug -derivedDataPath playground/ios/DerivedData/playground ONLY_ACTIVE_ARCH=YES -quiet",
+        "type": "ios.simulator",
+        "name": "iPhone 7"
+      },
+      "ios.sim.release": {
+        "binaryPath": "playground/ios/DerivedData/playground/Build/Products/Release-iphonesimulator/playground.app",
+        "build": "RCT_NO_LAUNCH_PACKAGER=true xcodebuild build -scheme playground_release -project playground/ios/playground.xcodeproj -sdk iphonesimulator -configuration Release -derivedDataPath playground/ios/DerivedData/playground ONLY_ACTIVE_ARCH=YES -quiet",
+        "type": "ios.simulator",
+        "name": "iPhone 7"
+      }
+    }
+  },
   "xo": {
     "extends": "xo-react",
     "space": true,

scripts/test.e2e.ios.js

@@ -3,47 +3,10 @@ const exec = require('shell-utils').exec;
 
 const release = _.includes(process.argv, '--release');
 
-function buildProjForDetox() {
-  const scheme = release ? `playground_release` : `playground`;
-  const conf = release ? `Release` : `Debug`;
-
-  execWithXcprettyIfPossible(`cd ./playground/ios &&
-            RCT_NO_LAUNCH_PACKAGER=true
-            xcodebuild build
-            -scheme ${scheme}
-            -project playground.xcodeproj
-            -sdk iphonesimulator
-            -configuration ${conf}
-            -derivedDataPath ./DerivedData/playground
-            ONLY_ACTIVE_ARCH=YES`);
-}
-
-function runDetoxUsingMocha() {
-  const detoxAppBuildPath = `playground/ios/DerivedData/playground/Build/Products/${release ? 'Release' : 'Debug'}-iphonesimulator/playground.app`;
-
-  exec.execSync(`detoxAppBuildPath="${detoxAppBuildPath}"
-                              ./node_modules/mocha/bin/mocha e2e
-                                --timeout ${5 * 60 * 1000}
-                                --recursive
-                                --bail
-                                ${process.env.CI ? '--cleanup' : ''}`);
-}
-
-function e2e() {
-  runDetoxUsingMocha();
-}
+run();
 
 function run() {
-  buildProjForDetox();
-  e2e();
+  const conf = release ? `release` : `debug`;
+  exec.execSync(`detox build --configuration ios.sim.${conf} && detox test --configuration ios.sim.${conf} ${process.env.CI ? '--cleanup' : ''}`);
 }
 
-function execWithXcprettyIfPossible(cmd) {
-  if (exec.which('xcpretty')) {
-    exec.execSync(`${cmd} | xcpretty`);
-  } else {
-    exec.execSync(cmd);
-  }
-}
-
-run();