From 2baf36939d85ad018e86fe004c4103ed1231a726 Mon Sep 17 00:00:00 2001
From: Jonathan Lipps <jlipps@gmail.com>
Date: Thu, 6 Feb 2014 11:56:29 -0800
Subject: [PATCH] fix gappium test app path

---
 lib/devices/ios/ios-controller.js  | 4 ++--
 test/functional/gappium/gappium.js | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/devices/ios/ios-controller.js b/lib/devices/ios/ios-controller.js
index 0b32eada88e..2b8a6a14e99 100644
--- a/lib/devices/ios/ios-controller.js
+++ b/lib/devices/ios/ios-controller.js
@@ -21,8 +21,8 @@ var iOSController = {};
 var FLICK_MS = 3000;
 
 var logTypesSupported = {
-  'syslog' : 'Logs for iOS applications on real devices and simulators',
-  'crashlog' : 'Crash logs for iOS applications on real devices and simulators'
+  'syslog': 'Logs for iOS applications on real devices and simulators',
+  'crashlog': 'Crash logs for iOS applications on real devices and simulators'
 };
 
 iOSController.findUIElementOrElements = function (strategy, selector, ctx, many, cb) {
diff --git a/test/functional/gappium/gappium.js b/test/functional/gappium/gappium.js
index deec1f9d5e8..16dcb4eff6a 100644
--- a/test/functional/gappium/gappium.js
+++ b/test/functional/gappium/gappium.js
@@ -7,16 +7,17 @@ var env = require("../../helpers/env")
 
 var desired;
 if (env.DEVICE === 'selendroid' || env.DEVICE === 'android') {
-  var appPath = path.resolve(__dirname, '../../../sample-code/apps/io.appium.gappium.sampleapp/platforms/' +
-    "android/bin/HelloGappium-debug.apk"),
+  var appPath = path.resolve(__dirname, '../../../sample-code/apps/' +
+      'io.appium.gappium.sampleapp/platforms/android/bin/' +
+      'HelloGappium-debug.apk'),
   desired = {
     app: appPath,
     'app-package': 'io.appium.gappium.sampleapp',
     'app-activity': '.HelloGappium',
   };
 } else {
-  var appPath = path.resolve(__dirname, '../../../sample-code/apps/io.appium.gappium.sampleapp/platforms/' +
-    "ios/build" + (env.EMU ? '/emulator' : '') + "/HelloGappium.app"),
+  var appPath = path.resolve(__dirname, '../../../sample-code/apps/' +
+      'io.appium.gappium.sampleapp/platforms/ios/build/HelloGappium.app'),
   desired = {
     app: appPath
   };