update e2e app setup

devfd · Jul 15, 2016 · 566198a · 566198a
1 parent 882646b
commit 566198a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 227 deletions.
diff --git a/e2e/android/app/build.gradle b/e2e/android/app/build.gradle
diff --git a/e2e/android/app/src/main/java/com/geocodere2eapp/MainActivity.java b/e2e/android/app/src/main/java/com/geocodere2eapp/MainActivity.java
diff --git a/e2e/android/build.gradle b/e2e/android/build.gradle
diff --git a/e2e/android/settings.gradle b/e2e/android/settings.gradle
diff --git a/e2e/js/index.android.js b/e2e/js/index.android.js
@@ -51,9 +51,11 @@ class GeocoderE2EApp extends Component {
         <TouchableOpacity style={{padding: 10, backgroundColor: '#2c3e50'}} onPress={() => {
           this.refs.geoInput.blur();
 
+          this.setState({result: null});
+
           const [lat, lng] = this.state.reverseInput.split(' ');
 
-          Geocoder.reverseGeocodeLocation({latitude: 1 * lat, longitude: 1 * lng}).then((res) => {
+          Geocoder.geocodePosition({lat: 1 * lat, lng: 1 * lng}).then((res) => {
             this.setState({ result: res[0] });
           });
         }}>

diff --git a/e2e/prepare.sh b/e2e/prepare.sh
@@ -21,11 +21,11 @@ npm install ../../$NPM_PACKAGE > /dev/null
 rm -rf ../../$NPM_PACKAGE
 
 echo "Prepare android"
-cp -r ../android .
+rnpm link react-native-geocoder
 
 echo "Prepare JS app"
 cp ../js/index.android.js .
 
 echo "Compile android"
 cd android
-./gradlew clean assembleDebug -PdisablePreDex
+./gradlew clean assembleDebug
diff --git a/e2e/run.sh b/e2e/run.sh
@@ -9,15 +9,20 @@ echo "Start Appium"
 node_modules/.bin/appium &
 APPIUM_PID=$!
 
+echo "Start static http server"
+http-server &
+HTTPSERVER_PID=$!
+
 echo "Start packager"
 node e2e/GeocoderE2EApp/node_modules/react-native/local-cli/cli.js start --reset-cache &
 PACKAGER_PID=$!
 
 sleep 5
 
-node_modules/.bin/mocha && SUCCESS=$? || SUCCESS=$?
+node_modules/.bin/mocha --require test/setup.js test/e2e && SUCCESS=$? || SUCCESS=$?
 
 kill $APPIUM_PID
+kill $HTTPSERVER_PID
 kill $PACKAGER_PID
 
 exit $SUCCESS