fix: parser (#145)

* fix: parser and ns-caps-args

Author: SvetoslavTsenov

index.d.ts

@@ -1,3 +1,4 @@
+import { AppiumServer } from "./lib/appium-server";
 import { IDeviceManager } from "./lib/interfaces/device-manager";
 import * as frameComparerHelper from "./lib/frame-comparer";
 import { INsCapabilitiesArgs } from "./lib/interfaces/ns-capabilities-args";
@@ -16,7 +17,7 @@ export { IDeviceManager } from "./lib/interfaces/device-manager";
 export { LogType } from "./lib/log-types";
 export { INsCapabilities } from "./lib/interfaces/ns-capabilities";
 export { INsCapabilitiesArgs } from "./lib/interfaces/ns-capabilities-args";
-export declare function startServer(port?: number, deviceManager?: IDeviceManager): Promise<void>;
+export declare function startServer(port?: number, deviceManager?: IDeviceManager): Promise<AppiumServer>;
 export declare function stopServer(): Promise<void>;
 export declare function createDriver(args?: INsCapabilitiesArgs): Promise<any>;
 /**

index.ts

@@ -27,7 +27,7 @@ export { LogType } from "./lib/log-types";
 export { INsCapabilities } from "./lib/interfaces/ns-capabilities";
 export { INsCapabilitiesArgs } from "./lib/interfaces/ns-capabilities-args";
 
-const nsCapabilities: INsCapabilities = new NsCapabilities({ ...<INsCapabilities>parser });
+const nsCapabilities: INsCapabilities = new NsCapabilities(parser);
 const appiumServer = new AppiumServer(nsCapabilities);
 let frameComparer: FrameComparer;
 let appiumDriver = null;
@@ -69,8 +69,9 @@ if (nsCapabilities.startSession) {
 }
 
 export async function startServer(port?: number, deviceManager?: IDeviceManager) {
-    await appiumServer.start(port, deviceManager);
+    await appiumServer.start(port || nsCapabilities.port, deviceManager);
     await attachToExitProcessHoockup(appiumServer.server, "appium");
+    return appiumServer;
 }
 
 export async function stopServer() {

lib/appium-driver.ts

@@ -197,7 +197,8 @@ export class AppiumDriver {
 
         if (!args.attachToDebug && !args.sessionId) {
             if (!args.device) {
-                args.device = DeviceManager.getDefaultDevice(args);
+                args.deviceManager = args.deviceManager || new DeviceManager();
+                args.device = await args.deviceManager.startDevice(args);
             }
             await AppiumDriver.applyAdditionalSettings(args);
         }

lib/appium-server.ts

@@ -69,11 +69,9 @@ export class AppiumServer {
             await this.prepApp();
         }
 
-
         log("Starting server...", this._args.verbose);
         const logLevel = this._args.verbose === true ? "debug" : "info";
         this.port = this._args.port || port;
-        let retry = false;
 
         if (!this._args.attachToDebug) {
 

lib/capabilities-helper.d.ts

@@ -1,2 +1,2 @@
 export declare function resolveCapabilities(capsLocation: string, runType: string, projectDir: string, capabilitiesName: string, verbose?: boolean): {};
-export declare function searchCapabilities(capabilitiesLocation: any, projectDir: any, capabilitiesName: any, verbose?: boolean): any;
+export declare function searchCapabilities(capabilitiesLocation: string, projectDir: string, capabilitiesName: string, verbose?: boolean): any;

lib/capabilities-helper.ts

@@ -23,7 +23,7 @@ export function resolveCapabilities(capsLocation: string, runType: string, proje
     return caps;
 }
 
-export function searchCapabilities(capabilitiesLocation, projectDir, capabilitiesName, verbose: boolean = false) {
+export function searchCapabilities(capabilitiesLocation: string, projectDir: string, capabilitiesName: string, verbose: boolean = false) {
     let appiumCapabilitiesFile = undefined;
 
     if (existsSync(capabilitiesLocation) && statSync(capabilitiesLocation).isFile()) {
@@ -32,7 +32,7 @@ export function searchCapabilities(capabilitiesLocation, projectDir, capabilitie
     }
 
     if (!appiumCapabilitiesFile) {
-        logInfo(`Search capabilities in ${capabilitiesLocation}`);
+        logInfo(`Search capabilities in ${capabilitiesLocation} for ${capabilitiesName}`);
         appiumCapabilitiesFile = sreachCapabilitiesByFolder(capabilitiesLocation, capabilitiesName);
     }
 

lib/ns-capabilities.d.ts

@@ -1,4 +1,5 @@
 import { INsCapabilities } from "./interfaces/ns-capabilities";
+import { INsCapabilitiesArgs } from "./interfaces/ns-capabilities-args";
 import { AutomationName } from "./automation-name";
 import { IDevice } from "mobile-devices-controller";
 import { IDeviceManager } from "./interfaces/device-manager";
@@ -36,13 +37,13 @@ export declare class NsCapabilities implements INsCapabilities {
     private _device;
     private _deviceManager;
     private _exceptions;
-    constructor(_parser: INsCapabilities);
+    constructor(_parser: INsCapabilitiesArgs);
     readonly path: string;
     readonly projectDir: string;
     readonly projectBinary: string;
     readonly pluginRoot: string;
     readonly pluginBinary: string;
-    readonly port: number;
+    port: number;
     readonly verbose: boolean;
     readonly appiumCapsLocation: string;
     appiumCaps: any;

lib/ns-capabilities.ts

@@ -1,4 +1,5 @@
 import { INsCapabilities } from "./interfaces/ns-capabilities";
+import { INsCapabilitiesArgs } from "./interfaces/ns-capabilities-args";
 import { AutomationName } from "./automation-name";
 import { resolveCapabilities } from "./capabilities-helper";
 import { getAppPath, fileExists, logInfo, logError } from "./utils";
@@ -39,7 +40,7 @@ export class NsCapabilities implements INsCapabilities {
     private _deviceManager: IDeviceManager;
     private _exceptions: Array<string> = new Array();
 
-    constructor(private _parser: INsCapabilities) {
+    constructor(private _parser: INsCapabilitiesArgs) {
         this._projectDir = this._parser.projectDir;
         this._projectBinary = this._parser.projectBinary;
         this._pluginRoot = this._parser.pluginRoot;
@@ -72,6 +73,7 @@ export class NsCapabilities implements INsCapabilities {
     get pluginRoot() { return this._pluginRoot; }
     get pluginBinary() { return this._pluginBinary; }
     get port() { return this._port; }
+    set port(port) { this._port = port; }
     get verbose() { return this._verbose; }
     get appiumCapsLocation() { return this._appiumCapsLocation; }
     get appiumCaps() { return this._appiumCaps; }
@@ -121,17 +123,17 @@ export class NsCapabilities implements INsCapabilities {
             this._isValidated = true;
         }
         if (!this._attachToDebug && !this._sessionId) {
-            this._appiumCaps = resolveCapabilities(this._appiumCapsLocation, this._parser.runType || this.runType, this.projectDir, this._capabilitiesName);
+            this._appiumCaps = resolveCapabilities(this.appiumCapsLocation, this.runType, this.projectDir, this._capabilitiesName);
 
             this.setAutomationName();
             this.resolveApplication();
             this.checkMandatoryCapabiliies();
             this.throwExceptions();
             this.shouldSetFullResetOption();
             this._isValidated = true;
+        } else {
+            this._isValidated = false;
         }
-
-        this._isValidated = false;
     }
 
     private isAndroidPlatform() { return this._appiumCaps && this._appiumCaps ? this._appiumCaps.platformName.toLowerCase().includes("android") : undefined; }

lib/parser.d.ts

@@ -1 +1 @@
-export declare const projectDir: any, projectBinary: any, pluginRoot: any, pluginBinary: any, port: any, verbose: any, appiumCapsLocation: any, testFolder: any, runType: any, isSauceLab: any, appPath: any, storage: any, testReports: any, reuseDevice: any, devMode: any, ignoreDeviceController: any, wdaLocalPort: any, path: any, relaxedSecurity: any, cleanApp: boolean, attachToDebug: any, sessionId: any, startSession: any;
+export declare const projectDir: string, projectBinary: string, pluginRoot: string, pluginBinary: string, port: number, verbose: boolean, appiumCapsLocation: string, testFolder: string, runType: string, isSauceLab: boolean, appPath: string, storage: string, testReports: string, reuseDevice: boolean, devMode: boolean, ignoreDeviceController: boolean, wdaLocalPort: number, path: string, relaxedSecurity: boolean, cleanApp: boolean, attachToDebug: boolean, sessionId: string, startSession: boolean, capabilitiesName: string;

lib/parser.ts

@@ -1,15 +1,15 @@
 import * as yargs from "yargs";
-import { join, dirname } from "path";
+import { join } from "path";
 import { resolve, logError } from "./utils";
-import { ParserArgs } from "./interfaces/parser-args";
+import { INsCapabilitiesArgs } from "./interfaces/ns-capabilities-args";
 
 const config = (() => {
     const options = yargs
         .option("runType", { describe: "Path to excute command.", type: "string", default: null })
         .option("testFolder", { describe: "e2e test folder name", default: "e2e", type: "string" })
         .option("appiumCapsLocation", { describe: "Capabilities", type: "string" })
         .option("sauceLab", { describe: "SauceLab", default: false, type: "boolean" })
-        .option("port", { alias: "p", describe: "Appium port", type: "number" })
+        .option("port", { alias: "p", describe: "Appium port", type: "number", default: 8300 })
         .option("attachToDebug", { alias: "a", describe: "Attach to appium desktop app.", default: false, type: "boolean" })
         .option("capabilitiesName", { describe: "Capabilities file name", default: "appium.capabilities.json", type: "string" })
         .option("sessionId", { alias: "s", describe: "Session to attach", default: false, type: "string" })
@@ -87,7 +87,8 @@ const config = (() => {
         relaxedSecurity: options.relaxedSecurity,
         attachToDebug: options.attachToDebug,
         sessionId: options.sessionId,
-        startSession: options.startSession
+        startSession: options.startSession,
+        capabilitiesName: options.capabilitiesName,
     };
 
     return config;
@@ -116,5 +117,6 @@ export const {
     cleanApp,
     attachToDebug,
     sessionId,
-    startSession
-} = config;
+    startSession,
+    capabilitiesName
+}: INsCapabilitiesArgs = config;