detox migration completed

playground/e2e/app.test.js

@@ -1,173 +1,171 @@
 describe('app', () => {
-  beforeEach((done) => {
-    global.simulator.relaunchApp(done);
+  beforeEach(async () => {
+    await device.relaunchApp();
   });
 
-  it('shows welcome screen', () => {
-    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+  it('shows welcome screen', async () => {
+    await expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
 
-  it('switch to tab based app, passProps and functions', () => {
-    elementByLabel('Switch to tab based app').tap();
-    expect(elementByLabel('This is tab 1')).toBeVisible();
-    expect(elementByLabel('Hello from a function!')).toBeVisible();
+  it('switch to tab based app, passProps and functions', async () => {
+    await elementByLabel('Switch to tab based app').tap();
+    await expect(elementByLabel('This is tab 1')).toBeVisible();
+    await expect(elementByLabel('Hello from a function!')).toBeVisible();
   });
 
-  it('switch to tabs with side menus', () => {
-    elementByLabel('Switch to app with side menus').tap();
-    elementByLabel('This is a side menu center screen tab 1').swipe('right');
-    expect(elementByLabel('This is a left side menu screen')).toBeVisible();
+  it('switch to tabs with side menus', async () => {
+    await elementByLabel('Switch to app with side menus').tap();
+    await elementByLabel('This is a side menu center screen tab 1').swipe('right');
+    await expect(elementByLabel('This is a left side menu screen')).toBeVisible();
   });
 
-  it('screen lifecycle', () => {
-    elementByLabel('Push lifecycle screen').tap();
-    expect(elementByLabel('onStart!')).toBeVisible();
-    elementByLabel('Push to test onStop').tap();
-    expect(elementByLabel('Alert')).toBeVisible();
-    expect(elementByLabel('onStop')).toBeVisible();
+  it('screen lifecycle', async () => {
+    await elementByLabel('Push lifecycle screen').tap();
+    await expect(elementByLabel('onStart!')).toBeVisible();
+    await elementByLabel('Push to test onStop').tap();
+    await expect(elementByLabel('Alert')).toBeVisible();
+    await expect(elementByLabel('onStop')).toBeVisible();
   });
 
-  it('unmount is called on pop', () => {
-    elementByLabel('Push lifecycle screen').tap();
-    expect(elementByLabel('onStart!')).toBeVisible();
-    element(by.traits(['button']).and(by.label('Back'))).tap();
-    expect(elementByLabel('onStop')).toBeVisible();
-    expect(elementByLabel('componentWillUnmount')).toBeVisible();
+  it('unmount is called on pop', async () => {
+    await elementByLabel('Push lifecycle screen').tap();
+    await expect(elementByLabel('onStart!')).toBeVisible();
+    await element(by.traits(['button']).and(by.label('Back'))).tap();
+    await expect(elementByLabel('onStop')).toBeVisible();
+    await expect(elementByLabel('componentWillUnmount')).toBeVisible();
   });
 });
 
 describe('screen stack', () => {
-  beforeEach((done) => {
-    global.simulator.relaunchApp(done);
+  beforeEach(async () => {
+    await device.relaunchApp();
   });
 
-  it('push screen', () => {
-    elementByLabel('Push').tap();
-    expect(elementByLabel('Pushed Screen')).toBeVisible();
+  it('push screen', async () => {
+    await elementByLabel('Push').tap();
+    await expect(elementByLabel('Pushed Screen')).toBeVisible();
   });
 
-  it('pop screen', () => {
-    elementByLabel('Push').tap();
-    expect(elementByLabel('Pushed Screen')).toBeVisible();
-    elementByLabel('Pop').tap();
-    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+  it('pop screen', async () => {
+    await elementByLabel('Push').tap();
+    await expect(elementByLabel('Pushed Screen')).toBeVisible();
+    await elementByLabel('Pop').tap();
+    await expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
 
-  it('pop screen deep in the stack', () => {
-    elementByLabel('Push').tap();
-    expect(elementByLabel('Stack Position: 1')).toBeVisible();
-    elementByLabel('Push').tap();
-    expect(elementByLabel('Stack Position: 2')).toBeVisible();
-    elementByLabel('Pop Previous').tap();
-    expect(elementByLabel('Stack Position: 2')).toBeVisible();
-    elementByLabel('Pop').tap();
-    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+  it('pop screen deep in the stack', async () => {
+    await elementByLabel('Push').tap();
+    await expect(elementByLabel('Stack Position: 1')).toBeVisible();
+    await elementByLabel('Push').tap();
+    await expect(elementByLabel('Stack Position: 2')).toBeVisible();
+    await elementByLabel('Pop Previous').tap();
+    await expect(elementByLabel('Stack Position: 2')).toBeVisible();
+    await elementByLabel('Pop').tap();
+    await expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
 });
 
 describe('modal', () => {
-  beforeEach((done) => {
-    global.simulator.relaunchApp(done);
+  beforeEach(async () => {
+    await device.relaunchApp();
   });
 
-  it('show modal', () => {
-    elementByLabel('Show Modal').tap();
-    expect(elementByLabel('Modal Screen')).toBeVisible();
+  it('show modal', async () => {
+    await elementByLabel('Show Modal').tap();
+    await expect(elementByLabel('Modal Screen')).toBeVisible();
   });
 
-  it('dismiss modal', () => {
-    elementByLabel('Show Modal').tap();
-    expect(elementByLabel('Modal Screen')).toBeVisible();
-    elementByLabel('Dismiss Modal').tap();
-    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+  it('dismiss modal', async () => {
+    await elementByLabel('Show Modal').tap();
+    await expect(elementByLabel('Modal Screen')).toBeVisible();
+    await elementByLabel('Dismiss Modal').tap();
+    await expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
 
-  it('show multiple modals', () => {
-    elementByLabel('Show Modal').tap();
-    expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
-    elementByLabel('Show Modal').tap();
-    expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
-    elementByLabel('Dismiss Modal').tap();
-    expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
-    elementByLabel('Dismiss Modal').tap();
-    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+  it('show multiple modals', async () => {
+    await elementByLabel('Show Modal').tap();
+    await expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
+    await elementByLabel('Show Modal').tap();
+    await expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
+    await elementByLabel('Dismiss Modal').tap();
+    await expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
+    await elementByLabel('Dismiss Modal').tap();
+    await expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
 
-  it('dismiss unknown screen id', () => {
-    elementByLabel('Show Modal').tap();
-    expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
-    elementByLabel('Dismiss Unknown Modal').tap();
-    expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
-    elementByLabel('Dismiss Modal').tap();
-    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+  it('dismiss unknown screen id', async () => {
+    await elementByLabel('Show Modal').tap();
+    await expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
+    await elementByLabel('Dismiss Unknown Modal').tap();
+    await expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
+    await elementByLabel('Dismiss Modal').tap();
+    await expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
 
-  it('dismiss modal by id which is not the top most', () => {
-    elementByLabel('Show Modal').tap();
-    expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
-    elementByLabel('Show Modal').tap();
-    expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
-    elementByLabel('Dismiss Previous Modal').tap();
-    expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
-    elementByLabel('Dismiss Modal').tap();
-    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+  it('dismiss modal by id which is not the top most', async () => {
+    await elementByLabel('Show Modal').tap();
+    await expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
+    await elementByLabel('Show Modal').tap();
+    await expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
+    await elementByLabel('Dismiss Previous Modal').tap();
+    await expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
+    await elementByLabel('Dismiss Modal').tap();
+    await expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
 
-  it('dismiss all previous modals by id when they are below top presented modal', () => {
-    elementByLabel('Show Modal').tap();
-    expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
-    elementByLabel('Show Modal').tap();
-    expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
-    elementByLabel('Show Modal').tap();
-    expect(elementByLabel('Modal Stack Position: 3')).toBeVisible();
+  it('dismiss all previous modals by id when they are below top presented modal', async () => {
+    await elementByLabel('Show Modal').tap();
+    await expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
+    await elementByLabel('Show Modal').tap();
+    await expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
+    await elementByLabel('Show Modal').tap();
+    await expect(elementByLabel('Modal Stack Position: 3')).toBeVisible();
 
-    elementByLabel('Dismiss ALL Previous Modals').tap();
-    expect(elementByLabel('Modal Stack Position: 3')).toBeVisible();
+    await elementByLabel('Dismiss ALL Previous Modals').tap();
+    await expect(elementByLabel('Modal Stack Position: 3')).toBeVisible();
 
-    elementByLabel('Dismiss Modal').tap();
-    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+    await elementByLabel('Dismiss Modal').tap();
+    await expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
 
-  it('dismiss some modal by id deep in the stack', () => {
-    elementByLabel('Show Modal').tap();
-    expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
-    elementByLabel('Show Modal').tap();
-    expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
-    elementByLabel('Show Modal').tap();
-    expect(elementByLabel('Modal Stack Position: 3')).toBeVisible();
+  it('dismiss some modal by id deep in the stack', async () => {
+    await elementByLabel('Show Modal').tap();
+    await expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
+    await elementByLabel('Show Modal').tap();
+    await expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
+    await elementByLabel('Show Modal').tap();
+    await expect(elementByLabel('Modal Stack Position: 3')).toBeVisible();
 
-    elementByLabel('Dismiss First In Stack').tap();
-    expect(elementByLabel('Modal Stack Position: 3')).toBeVisible();
+    await elementByLabel('Dismiss First In Stack').tap();
+    await expect(elementByLabel('Modal Stack Position: 3')).toBeVisible();
 
-    elementByLabel('Dismiss Modal').tap();
-    expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
+    await elementByLabel('Dismiss Modal').tap();
+    await expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
 
-    elementByLabel('Dismiss Modal').tap();
-    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+    await elementByLabel('Dismiss Modal').tap();
+    await expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
 
-  it('dismissAllModals', () => {
-    elementByLabel('Show Modal').tap();
-    expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
-    elementByLabel('Show Modal').tap();
-    expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
-    elementByLabel('Dismiss All Modals').tap();
-    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+  it('dismissAllModals', async () => {
+    await elementByLabel('Show Modal').tap();
+    await expect(elementByLabel('Modal Stack Position: 1')).toBeVisible();
+    await elementByLabel('Show Modal').tap();
+    await expect(elementByLabel('Modal Stack Position: 2')).toBeVisible();
+    await elementByLabel('Dismiss All Modals').tap();
+    await expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
 });
 
-describe('reload app', () => {
-  beforeEach((done) => {
-    simulator.reloadReactNativeApp(done);
+describe('reload app', async () => {
+  beforeEach(async () => {
+    await device.relaunchApp();
   });
 
-  it('push a screen to ensure its not there after reload', () => {
-    elementByLabel('Push').tap();
-    expect(elementByLabel('Pushed Screen')).toBeVisible();
-  });
-
-  it('show welcome screen after reload', () => {
-    expect(elementByLabel('React Native Navigation!')).toBeVisible();
+  it('push a screen to ensure its not there after reload', async () => {
+    await elementByLabel('Push').tap();
+    await expect(elementByLabel('Pushed Screen')).toBeVisible();
+    await device.reloadReactNative();
+    await expect(elementByLabel('React Native Navigation!')).toBeVisible();
   });
 });
 

playground/e2e/init.js

@@ -1,19 +1,20 @@
 /*eslint-disable*/
 require('babel-polyfill');
 const detox = require('detox');
-const detoxConfig = require('../package.json').detox;
 
-detoxConfig['ios-simulator'].app = process.env.detoxAppBuildPath;
-
-before(function (done) {
-  detox.config(detoxConfig);
-  detox.start(done);
-});
-
-afterEach(function (done) {
-  detox.waitForTestResult(done);
+before(async () => {
+  const detoxConfig = {
+    configurations: {
+      ios: {
+        binaryPath: process.env.detoxAppBuildPath,
+        type: 'simulator',
+        name: 'iPhone 7'
+      }
+    }
+  }
+  await detox.init(detoxConfig);
 });
 
-after(function (done) {
-  detox.cleanup(done);
+after(async () => {
+  await detox.cleanup();
 });

playground/package.json

@@ -14,15 +14,6 @@
   },
   "//": "use react-native-navigation: 2.x.x --> we are manually installing it from a script for quicker workflow. Along with detox and shell-utils",
   "dependencies": {},
-  "detox": {
-    "session": {
-      "server": "ws://localhost:8099",
-      "sessionId": "playground"
-    },
-    "ios-simulator": {
-      "device": "iPhone 7"
-    }
-  },
   "babel": {
     "env": {
       "test": {

playground/scripts/e2e.ios.js

@@ -44,8 +44,7 @@ function e2e() { //eslint-disable-line
                               ./node_modules/mocha/bin/mocha e2e
                                 --timeout ${10 * 60 * 1000}
                                 --recursive
-                                --bail
-                                --compilers js:babel-register`);
+                                --bail`);
   } finally {
     shellUtils.exec.kill(`detox-server`);
     if (process.env.CI) {