refactor(utils): resolve new ios app paths (#197)

* refactor(utils): resolve new ios app paths

Author: SvetoslavTsenov

lib/appium-server.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-import * as child_process from "child_process";
 import { INsCapabilities } from "./interfaces/ns-capabilities";
 import { IDeviceManager } from "./interfaces/device-manager";
 export declare class AppiumServer {
@@ -12,7 +10,7 @@ export declare class AppiumServer {
     constructor(_args: INsCapabilities);
     port: number;
     runType: string;
-    readonly server: child_process.ChildProcess;
+    readonly server: any;
     hasStarted: boolean;
     start(port: any, deviceManager?: IDeviceManager): Promise<boolean | this>;
     private startAppiumServer;

lib/appium-server.ts

@@ -18,7 +18,7 @@ import { existsSync } from "fs";
 import { killAllProcessAndRelatedCommand } from "mobile-devices-controller";
 
 export class AppiumServer {
-    private _server: child_process.ChildProcess;
+    private _server: any;
     private _appium;
     private _port: number;
     private _runType: string;

lib/utils.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-import * as childProcess from "child_process";
 import { INsCapabilities } from "./interfaces/ns-capabilities";
 import { Point } from "./point";
 import { Direction } from "./direction";
@@ -8,7 +6,7 @@ export declare function resolvePath(mainPath: any, ...args: any[]): string;
 export declare function isDirectory(fullName: any): boolean;
 export declare function isFile(fullName: any): boolean;
 export declare function copy(src: any, dest: any, verbose: any): any;
-export declare function shutdown(processToKill: childProcess.ChildProcess, verbose: any): void;
+export declare function shutdown(processToKill: any, verbose: any): void;
 export declare function killPid(pid: any, verbose: any): void;
 export declare function waitForOutput(process: any, matcher: any, errorMatcher: any, timeout: any, verbose: any): Promise<boolean>;
 export declare function executeCommand(args: any, cwd?: string): string;

lib/utils.ts

@@ -141,7 +141,7 @@ function getAllFileNames(folder) {
 //     return files;
 // }
 
-export function shutdown(processToKill: childProcess.ChildProcess, verbose) {
+export function shutdown(processToKill: any, verbose) {
     try {
         if (processToKill && processToKill !== null) {
             if (isWin()) {
@@ -307,22 +307,39 @@ export function getAppPath(caps: INsCapabilities) {
             }
         } else {
             const iosPlatformsPath = 'platforms/ios/build';
-            const appType = caps.runType || caps.device.type === DeviceType.SIMULATOR ? "sim" : "device";
-            basePath = appType.includes("device") ? `${iosPlatformsPath}/device/**/*.ipa` : `${iosPlatformsPath}/emulator/**/*.app`;
+            // possible paths
+            // "Release-iphoneos"
+            // "Release-iphonesimulator"
+            // "Debug-iphoneos"
+            // "Debug-iphonesimulator"
+            // "device"
+            // "emulator"
+            if (caps.device && caps.device.type) {
+                basePath = caps.device.type === DeviceType.DEVICE ? `${iosPlatformsPath}/**/*.ipa` : `${iosPlatformsPath}/**/*.app`;
+            } else if (caps.runType.startsWith("dev")) {
+                basePath = `${iosPlatformsPath}/**/*.ipa`;
+            } else {
+                basePath = `${iosPlatformsPath}/**/*.app`;
+            }
         }
     }
 
     let apps = glob.sync(basePath);
-
     if (!apps || apps.length === 0) {
-        apps = glob.sync(`${caps.projectDir}`)
-            .filter(function (file) {
-                return file.endsWith(".ipa") || file.endsWith(".app") || file.endsWith(".apk")
-            });
+        if (caps.isAndroid) {
+            apps = glob.sync(`${caps.projectDir}/**/*.apk`);
+        }
+        if (caps.isIOS) {
+            if (caps.runType.startsWith("dev")) {
+                apps = glob.sync(`${caps.projectDir}/**/*.app`);
+            } else {
+                apps = glob.sync(`${caps.projectDir}/**/*.ipa`);
+            }
+        }
     }
 
     if (!apps || apps.length === 0) {
-        logError(`No 'app' capability provided or the convension for 'runType'${caps.runType} is not as excpeced! 
+        logError(`No 'app' capability provided or the convention for 'runType'${caps.runType} is not as expected! 
                 In order to automatically search and locate app package please use 'device' in your 'runType' name. E.g --runType device.iPhone7.iOS110, --runType sim.iPhone7.iOS110 or
                 specify correct app path`);
     }
@@ -582,7 +599,7 @@ const convertObjToString = obj => {
     return "";
 }
 
-export const shouldUserMobileDevicesController = (args: INsCapabilities)=>{
+export const shouldUserMobileDevicesController = (args: INsCapabilities) => {
     const useDsCS = process.env["USE_DEVICES_CONTROLLER_SERVER"] || false;
     const useMDsCS = process.env["USE_MOBILE_DEVICES_CONTROLLER_SERVER"] || false;
 

postinstall.js

@@ -249,6 +249,7 @@ const run = async () => {
             switch (template.testingFramwork) {
                 case jasmine:
                     tsConfigJson.compilerOptions.types.push("jasmine");
+                    tsConfigJson.compilerOptions.types.push("node");
                     break;
                 case mocha:
                     tsConfigJson.compilerOptions.types.push("mocha");

test-app/package.json

@@ -4,18 +4,12 @@
   "readme": "NativeScript Application",
   "repository": "<fill-your-repository-here>",
   "devDependencies": {
-    "typescript": "~2.5.1", 
-    "@types/chai": "^4.0.2",
-    "@types/mocha": "^2.2.41",
-    "@types/node": "^7.0.5",
-    "babel-traverse": "6.25.0",
-    "babel-types": "6.25.0",
-    "babylon": "6.17.4",
-    "chai": "~4.1.1",
-    "chai-as-promised": "~7.1.1",
-    "mocha": "~3.5.0",
-    "mocha-junit-reporter": "^1.13.0",
-    "mocha-multi": "^0.11.0",
-    "mocha-typescript": "^1.1.9"
+    "typescript": "~3.3.3", 
+    "@types/chai": "~4.1.7",
+    "@types/mocha": "~5.2.5",
+    "@types/node": "~10.12.18",
+    "mocha": "~5.2.0",
+    "mocha-junit-reporter": "~1.18.0",
+    "mocha-multi": "~1.0.1"
   }
 }