From 2537ce127697997e3e835645a7fb46a8e8425075 Mon Sep 17 00:00:00 2001
From: Salakar <mike.diarmid@gmail.com>
Date: Tue, 27 Mar 2018 23:00:18 +0100
Subject: [PATCH] [tests][bridge][android] wip switch to npm version

---
 tests-new/android/app/build.gradle                     |  4 +---
 .../app/src/main/java/com/testing/MainApplication.java |  5 ++---
 tests-new/android/settings.gradle                      |  4 ++--
 tests-new/app.js                                       |  2 +-
 tests-new/bridge/env/node/vm.js                        | 10 +++-------
 tests-new/e2e/mocha.opts                               |  2 +-
 tests-new/package.json                                 |  1 -
 7 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/tests-new/android/app/build.gradle b/tests-new/android/app/build.gradle
index fce8183a..e50e6c2d 100755
--- a/tests-new/android/app/build.gradle
+++ b/tests-new/android/app/build.gradle
@@ -87,9 +87,7 @@ dependencies {
     transitive = false
   }
 
-  implementation(project(':react-native-restart')) {
-    transitive = false
-  }
+  implementation project(':bridge')
 
   compile fileTree(dir: "libs", include: ["*.jar"])
   compile "com.google.android.gms:play-services-base:$firebaseVersion"
diff --git a/tests-new/android/app/src/main/java/com/testing/MainApplication.java b/tests-new/android/app/src/main/java/com/testing/MainApplication.java
index 653ceee8..112ffef7 100755
--- a/tests-new/android/app/src/main/java/com/testing/MainApplication.java
+++ b/tests-new/android/app/src/main/java/com/testing/MainApplication.java
@@ -8,8 +8,8 @@ import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
 
+import io.invertase.bridge.RNBridgePackage;
 import io.invertase.firebase.RNFirebasePackage;
-import com.avishayil.rnrestart.ReactNativeRestartPackage;
 import io.invertase.firebase.admob.RNFirebaseAdMobPackage;
 import io.invertase.firebase.analytics.RNFirebaseAnalyticsPackage;
 import io.invertase.firebase.auth.RNFirebaseAuthPackage;
@@ -41,7 +41,7 @@ public class MainApplication extends Application implements ReactApplication {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
         new MainReactPackage(),
-        new ReactNativeRestartPackage(),
+        new RNBridgePackage(),
         new RNFirebasePackage(),
         new RNFirebaseAdMobPackage(),
         new RNFirebaseAnalyticsPackage(),
@@ -70,7 +70,6 @@ public class MainApplication extends Application implements ReactApplication {
   @Override
   public void onCreate() {
     super.onCreate();
-    getReactNativeHost().getReactInstanceManager().getDevSupportManager().getDevSettings().setRemoteJSDebugEnabled(true);
     SoLoader.init(this, /* native exopackage */ false);
   }
 
diff --git a/tests-new/android/settings.gradle b/tests-new/android/settings.gradle
index 3a8b98ad..51871257 100755
--- a/tests-new/android/settings.gradle
+++ b/tests-new/android/settings.gradle
@@ -3,8 +3,8 @@ rootProject.name = 'RNFTests'
 include ':react-native-firebase'
 project(':react-native-firebase').projectDir = new File(rootProject.projectDir, './../../android')
 
-include ':react-native-restart'
-project(':react-native-restart').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-restart/android')
+include ':bridge'
+project(':bridge').projectDir = new File(rootProject.projectDir, '../node_modules/bridge/android')
 
 include ':app'
 
diff --git a/tests-new/app.js b/tests-new/app.js
index 51438121..f5ccf182 100755
--- a/tests-new/app.js
+++ b/tests-new/app.js
@@ -9,7 +9,7 @@
 import React, { Component } from 'react';
 import { AppRegistry, Text, View } from 'react-native';
 
-import bridge from './bridge/env/rn';
+import bridge from 'bridge/platform/react-native';
 import firebase from './firebase';
 
 require('sinon');
diff --git a/tests-new/bridge/env/node/vm.js b/tests-new/bridge/env/node/vm.js
index 22523f5c..f5b1c578 100644
--- a/tests-new/bridge/env/node/vm.js
+++ b/tests-new/bridge/env/node/vm.js
@@ -26,9 +26,9 @@ function handleError(message) {
   throw new Error(message);
 }
 
-async function downloadUrl(url) {
+async function downloadUrl(fileUrl) {
   const res = await new Promise((resolve, reject) =>
-    http.get(url, resolve).on('error', reject)
+    http.get(fileUrl, resolve).on('error', reject)
   );
 
   let buffer = '';
@@ -60,11 +60,7 @@ async function downloadBundle(bundleUrl) {
 
 async function getBundle(request) {
   if (bundle) return bundle;
-  console.log(
-    `${chalk.blue(
-      '[bridge]'
-    )} debugger has connected! Downloading app JS bundle...`
-  );
+  console.log(`${chalk.blue('[bridge]')} debugger connected`);
 
   const parsedUrl = url.parse(request.url, true);
   invariant(parsedUrl.query);
diff --git a/tests-new/e2e/mocha.opts b/tests-new/e2e/mocha.opts
index bd8c68a6..41cc1066 100755
--- a/tests-new/e2e/mocha.opts
+++ b/tests-new/e2e/mocha.opts
@@ -3,4 +3,4 @@
 --slow 2200
 --bail
 --exit
---require ./bridge/env/node
+--require bridge/platform/node
diff --git a/tests-new/package.json b/tests-new/package.json
index d99c8de9..c3cec87c 100755
--- a/tests-new/package.json
+++ b/tests-new/package.json
@@ -26,7 +26,6 @@
     "mocha": "^4.0.1",
     "react": "^16.2.0",
     "react-native": "^0.52.3",
-    "react-native-restart": "0.0.6",
     "should": "^13.2.1",
     "should-sinon": "0.0.6",
     "sinon": "^4.4.8",