From 0f670c898705f2d0040f0edc149515360a4b27f8 Mon Sep 17 00:00:00 2001
From: Erjan Gavalji <erjan.gavalji@gmail.com>
Date: Wed, 7 Oct 2015 17:11:17 +0300
Subject: [PATCH] Fix the grunt file. Fix uninstallation. Add a tee command

---
 expect.exp     | 4 ++--
 gruntfile.js   | 4 ++--
 runtestsapp.sh | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/expect.exp b/expect.exp
index 7483184b4..22b575a5c 100755
--- a/expect.exp
+++ b/expect.exp
@@ -10,6 +10,6 @@
 
 
 set timeout 600
-spawn adb logcat
-expect 'Done.'
+spawn adb logcat | tee __TESTRESULT__.txt
+expect '=== ALL TESTS COMPLETE ==='
 send \003
diff --git a/gruntfile.js b/gruntfile.js
index e08999367..a616fc8ce 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -388,8 +388,8 @@ module.exports = function(grunt) {
 //                    "adb install ./platforms/android/build/outputs/apk/TestsApp-debug.apk",
 //                    "adb shell am start -n org.nativescript.TestsApp/com.tns.NativeScriptActivity",
 ////                    "expect -c '
-                ].join(" && ")
-            }
+//                ].join(" && ")
+//            }
         },
         multidest: {
             copyLicenseFiles: {
diff --git a/runtestsapp.sh b/runtestsapp.sh
index 1a774fef8..37ff0274b 100755
--- a/runtestsapp.sh
+++ b/runtestsapp.sh
@@ -48,7 +48,7 @@ cd $workingdir
 
 echo "------------------------------------------------"
 echo "Uninstalling the app..."
-time adb uninstall org.nativescript.TestApp
+time adb uninstall org.nativescript.TestsApp
 
 echo "------------------------------------------------"
 echo "Installing the app..."