suitest-js-api 2.5.2 → 3.0.3

package/lib/commands/openSession.js

@@ -1,19 +1,14 @@
 /**
- * Open session with Suitest server. Set interactive session context.
+ * Set auth context for current execution.
  */
 
 const sessionConstants = require('../constants/session');
-const request = require('../api/request');
-const endpoints = require('../api/endpoints');
 const {validate, validators} = require('../validation');
 const chainPromise = require('../utils/chainPromise');
-const SuitestError = require('../utils/SuitestError');
 const {
 	invalidInputMessage,
-	authFailed,
 	sessionOpen,
 	sessionOpened,
-	notWhitelistedIp,
 } = require('../texts');
 
 /**
@@ -30,64 +25,30 @@ async function authAndConnectWS(authContext, webSockets) {
 }
 
 /**
- * Open session with suitest server by username, password.
- * Set interactive session context on success.
- *
+ *@description Open ws connection with suitest server and setup auth context.
  * @param {Object} instance main class instance
- * @param {schema} authData
- * @param {Symbol} _sessionType session type run, for internal use only
+ * @param {Object} authData
+ * @param {string} authData.tokenId
+ * @param {string} authData.tokenPassword
  * @returns {Promise} response object
  */
-async function openSession({authContext, webSockets, logger}, authData, _sessionType) {
-	let authedRequestObject,
-		response;
-
+async function openSession({authContext, webSockets, logger}, authData) {
 	logger.delayed(sessionOpen(), 4000);
 
 	// validate authData json
 	validate(validators.OPEN_SESSION, authData, invalidInputMessage(openSession.name, 'Open session data'));
 
-	if ('username' in authData) {
-		// authorize http
-		authedRequestObject = await authContext.authorizeHttp(endpoints.session, {
-			method: 'POST',
-			body: authData,
-		}, {type: SuitestError.AUTH_FAILED});
-		// make api request
-		response = await request(
-			endpoints.session,
-			authedRequestObject,
-			(err) => {
-				if (err.status === 403) {
-					return new SuitestError(notWhitelistedIp(), SuitestError.AUTH_FAILED);
-				}
-
-				return new SuitestError(authFailed(), SuitestError.AUTH_FAILED);
-			},
-		);
-		// if success, set interactive session context
-		authContext.setContext(sessionConstants.INTERACTIVE, response.deviceAccessToken);
-
-		await authAndConnectWS(authContext, webSockets);
-	} else if ('sessionToken' in authData) {
-		response = {deviceAccessToken: authData.sessionToken};
-		// if sessionToken explicitly provided, set interactive session context
-		authContext.setContext(_sessionType || sessionConstants.AUTOMATED, authData.sessionToken);
+	authContext.setContext(
+		sessionConstants.TOKEN,
+		authData.tokenId,
+		authData.tokenPassword,
+	);
 
-		await authAndConnectWS(authContext, webSockets);
-	} else {
-		response = authData;
-		// if token credentials provided, simply set access token context
-		authContext.setContext(
-			sessionConstants.ACCESS_TOKEN,
-			authData.accessTokenKey,
-			authData.accessTokenPassword
-		);
-	}
+	await authAndConnectWS(authContext, webSockets);
 
 	logger.log(sessionOpened());
 
-	return response;
+	return {accessToken: `${authData.tokenId}:${authData.tokenPassword}`};
 }
 
 module.exports = {

package/lib/commands/pairDevice.js

@@ -1,7 +1,7 @@
 /**
  * Pair with device command.
  * Request control of the device.
- * After this command is resolved, interactive or automated time starts to count until user calls release device method or timeout passes.
+ * After this command is resolved, time starts to count until user calls release device method or timeout passes.
  */
 
 const wsContentTypes = require('../api/wsContentTypes');
@@ -21,12 +21,12 @@ async function pairDevice({webSockets, authContext, logger, pairedDeviceContext}
 	// validate deviceId string to be in uuid format
 	validate(validators.UUID, deviceId, invalidInputMessage(pairDevice.name, 'Device id'));
 
-	const [deviceDetails] = await getDevicesDetails({authContext}, [deviceId]);
+	const [deviceDetails] = await getDevicesDetails({authContext}, [{device: deviceId}]);
 
 	if (!deviceDetails)
 		throw new SuitestError(
 			launcherWrongDeviceId(deviceId),
-			SuitestError.INVALID_INPUT
+			SuitestError.INVALID_INPUT,
 		);
 
 	const deviceName = deviceDetails.displayName;

package/lib/commands/releaseDevice.js

@@ -1,7 +1,7 @@
 /**
  * Release device command.
  * Notify server that device will no longer be needed.
- * After this method is called interactive or automated minutes stop counting.
+ * After this method is called minutes stop counting.
  */
 
 const wsContentTypes = require('../api/wsContentTypes');

package/lib/commands/setAppConfig.js

@@ -1,7 +1,5 @@
 /**
  * Before we can "Open app" or "Open URL" user must define application config.
- * For automated session application config already defined as part of test pack definition.
- * For interactive session it's not defined.
  * Furthermore, it's possible for user to open several apps sequentially, so he should be able to switch app config.
  */
 const {validate, validators} = require('../validation');

package/lib/commands/{interactive.js → startREPL.js}

@@ -8,7 +8,8 @@ const repl = require('../testLauncher/repl');
 const {getShortFunctionBody} = require('../utils/stringUtils');
 const texts = require('../texts');
 const {stackTraceParser} = require('../utils/stackTraceParser');
-const {authContext, logger} = require('../../index');
+const suitest = require('../../index');
+const {logger} = suitest;
 const {captureMessage} = require('../utils/sentry/Raven');
 
 let isReplActive = false;
@@ -24,7 +25,7 @@ let replModeWasActivated = false;
  * @returns {*[]}
  */
 function getReplParameters(opts, suitest) {
-	// get dir where .interactive() was called
+	// get dir where .startREPL() was called
 	const callFile = path.normalize(stackTraceParser(new Error())[2].file);
 	const cwd = opts.cwd || path.dirname(callFile);
 	const file = path.basename(callFile);
@@ -44,12 +45,13 @@ function getReplParameters(opts, suitest) {
  * @param {Function=} opts.repeater
  * @returns {Promise} response object
  */
-async function interactive(opts = {}) {
+async function startREPL(opts = {}) {
 	if (!replModeWasActivated) {
 		replModeWasActivated = true;
 		captureMessage('REPL mode activated');
 	}
 
+	// TODO: remove when nodejs minimum version will be increased.
 	if (semver.lt(process.version, '9.4.0')) {
 		logger.error(texts.replWrongNodeVersion(process.version));
 		process.exit(1);
@@ -58,10 +60,10 @@ async function interactive(opts = {}) {
 	if (isReplActive)
 		return Promise.resolve();
 
-	const {replWarnInteractive, replWelcomeMessage, replSessionEnded} = texts;
+	const {replWarn, replWelcomeMessage, replSessionEnded} = texts;
 
-	if (!authContext.isInteractiveSession()) {
-		logger.warn(replWarnInteractive());
+	if (!suitest.config.runsOnSingleDevice) {
+		logger.warn(replWarn());
 
 		return Promise.resolve();
 	}
@@ -70,7 +72,7 @@ async function interactive(opts = {}) {
 	const repeater = getShortFunctionBody(opts.repeater);
 
 	logger.special(replWelcomeMessage(
-		vars, cwd, watch, repeater, logger.colors.suit
+		vars, cwd, watch, repeater, logger.colors.suit,
 	));
 
 	isReplActive = true;
@@ -88,4 +90,4 @@ async function interactive(opts = {}) {
 	logger.info(replSessionEnded());
 }
 
-module.exports = interactive;
+module.exports = startREPL;

package/lib/composers/attributesComposer.js

@@ -0,0 +1,18 @@
+const {makeModifierComposer} = require('../utils/makeComposer');
+const composers = require('../constants/composer');
+const {validate, validators} = require('../validation');
+const {invalidInputMessage} = require('../texts');
+
+const attributesComposer = makeModifierComposer(
+	composers.ATTRIBUTES,
+	['getAttributes'],
+	(_, meta, attributes = []) => ({
+		...meta,
+		attributes: validate(
+			validators.ELEMENT_ATTRIBUTES,
+			attributes,
+			invalidInputMessage('getAttributes', 'Element attributes'),
+		),
+	}));
+
+module.exports = attributesComposer;

package/lib/composers/cssPropsComposer.js

@@ -0,0 +1,18 @@
+const {makeModifierComposer} = require('../utils/makeComposer');
+const composers = require('../constants/composer');
+const {invalidInputMessage} = require('../texts');
+const {validate, validators} = require('../validation');
+
+const cssPropsComposer = makeModifierComposer(
+	composers.CSS_PROPS,
+	['getCssProperties'],
+	(_, meta, cssProps) => ({
+		...meta,
+		cssProps: validate(
+			validators.CSS_PROPS,
+			cssProps,
+			invalidInputMessage('getCssProperties', 'CSS properties'),
+		),
+	}));
+
+module.exports = cssPropsComposer;

package/lib/composers/handleComposer.js

@@ -0,0 +1,23 @@
+const {makeModifierComposer} = require('../utils/makeComposer');
+const composers = require('../constants/composer');
+const {validate, validators} = require('../validation');
+const {invalidInputMessage} = require('../texts');
+
+const handleComposer = makeModifierComposer(
+	composers.GET_HANDLE,
+	['handle'],
+	(_, meta, opts = false) => {
+		validate(
+			validators.ELEMENT_HANDLE,
+			opts,
+			invalidInputMessage('handle'),
+		);
+		const multiple = opts === true || (opts ? (typeof opts.multiple === 'boolean' ? opts.multiple : false) : false);
+
+		return {
+			...meta,
+			handle: {multiple},
+		};
+	});
+
+module.exports = handleComposer;

package/lib/composers/index.js

@@ -41,6 +41,9 @@ const hadNoErrorComposer = require('./hadNoErrorComposer');
 const tapComposer = require('./tapComposer');
 const scrollComposer = require('./scrollComposer');
 const swipeComposer = require('./swipeComposer');
+const handleComposer = require('./handleComposer');
+const attributesComposer = require('./attributesComposer');
+const cssPropsComposer = require('./cssPropsComposer');
 
 module.exports = {
 	abandonComposer,
@@ -88,4 +91,7 @@ module.exports = {
 	tapComposer,
 	scrollComposer,
 	swipeComposer,
+	handleComposer,
+	attributesComposer,
+	cssPropsComposer,
 };

package/lib/composers/thenComposer.js

@@ -29,12 +29,11 @@ const makeThenComposer = (getSocketMessage, callback, beforeSend) => makeMethodC
 					dataToTranslate = {...data};
 					delete dataToTranslate.stack;
 				} else if (data.type === 'runSnippet') {
-					const isInteractiveSession = authContext.isInteractiveSession();
 					const {appId, versionId} = appContext.context;
 					const {testId} = data;
 
 					snippets = await fetchTestDefinitions({authContext})(
-						appId, versionId, testId, isInteractiveSession, data.stack);
+						appId, versionId, testId, config.includeChangelist, data.stack);
 				}
 
 				if (beforeSend) {

package/lib/constants/composer.js

@@ -41,6 +41,9 @@ const composers = {
 	REQUEST_MATCHES:  Symbol('requestMatches'),
 	RESPONSE_MATCHES: Symbol('responseMatches'),
 	UNTIL:            Symbol('until'),
+	GET_HANDLE:       Symbol('handle'),
+	ATTRIBUTES:       Symbol('getAttributes'),
+	CSS_PROPS:        Symbol('getCssProp'),
 };
 
 Object.freeze(composers);

package/lib/constants/element.js

@@ -88,6 +88,8 @@ const ELEMENT_PROP = {
 	EXTENDS:                   'extends',
 	UI_ELEMENT_ID:             'uiElementId',
 	INDEX:                     'index',
+	OFFSET_TOP:                'offsetTop',
+	OFFSET_LEFT:               'offsetLeft',
 };
 
 const VALUES = {

package/lib/constants/enviroment.js

@@ -1,5 +1,10 @@
 const ENVIROMENT_VARS = Object.freeze({
-	SUITEST_CHILD_PROCESS: 'SUITEST_CHILD_PROCESS', // indicates that session is running as launcher child process, contains deviceId|ipcPortNumber
+	/**
+	 * @description indicates that session is running as launcher child process, contains deviceId|configId|ipcPortNumber
+	 */
+	SUITEST_CHILD_PROCESS: 'SUITEST_CHILD_PROCESS',
+	SUITEST_PRESET_NAME: 'SUITEST_PRESET_NAME',
+	SUITEST_BE_SERVER: 'SUITEST_BE_SERVER',
 });
 
 module.exports = ENVIROMENT_VARS;

package/lib/constants/index.js

@@ -6,6 +6,7 @@ const constants = {
 	API_CONSTRUCTOR_NAME: 'SUITEST_API',
 	API_LIB_PATH_IDENTIFIERS: ['suitest-js-api/lib/', 'suitest-js-api/index.js', 'suitest-js-api/config'],
 	ASSERTION_ERROR_TYPE: 'AssertionError [ERR_ASSERTION]',
+	DEFAULT_SCREENSHOT_DIR: 'screenshots',
 };
 
 Object.freeze(constants);

package/lib/constants/ipcMessageId.js

@@ -1,7 +1,7 @@
 const messageId = Object.freeze({
 	SETUP_SESSION: 'SETUP_SESSION', // passed from launcher to child on child connect, contains config object
 
-	REPL_START: 'REPL_START', // sent from child to launcher when interactive() is called,
+	REPL_START: 'REPL_START', // sent from child to launcher when startREPL() is called,
 	REPL_INIT: 'REPL_INIT', // launcher does some manipulations and sends REPL_INIT back
 	REPL_STOP: 'REPL_STOP', // send from child to parent when repl is closed
 });

package/lib/constants/modes.js

@@ -1,6 +1,5 @@
 const modes = {
-	AUTOMATED: 'automated',
-	INTERACTIVE: 'interactive',
+	TOKEN: 'token',
 	TEST_COMMAND: 'TEST_COMMAND',
 };
 

package/lib/constants/session.js

@@ -5,10 +5,8 @@
  */
 
 const sessionConstants = {
-	AUTOMATED:    Symbol('sessionAutomated'),
-	INTERACTIVE:  Symbol('sessionInteractive'),
-	ACCESS_TOKEN: Symbol('sessionAccessToken'),
 	GUEST:        Symbol('sessionGuest'),
+	TOKEN:        Symbol('sessionToken'),
 };
 
 Object.freeze(sessionConstants);

package/lib/constants/timestamp.js

@@ -3,7 +3,7 @@
  */
 
 const timestamp = {
-	default: 'MMM D HH:mm:ss',
+	default: 'MMM D HH:mm:ss Z',
 	none: 'none',
 };
 

package/lib/constants/validationKeys.js

@@ -10,18 +10,15 @@ const validationKeys = {
 	ELEMENT_PROP_TYPE: Symbol('elementPropType'),
 	OPEN_SESSION: Symbol('openSession'),
 	UUID: Symbol('uuid'),
-	START_TEST_PACK: Symbol('startTestPack'),
 	SET_SCREEN_ORIENTATION: Symbol('setScreenOrientation'),
 	ELEMENT_SELECTOR: Symbol('elementSelector'),
 	ELEMENT_PROPS: Symbol('elementProps'),
 	ELEMENT_REPO_PROPS: Symbol('elementRepoProps'),
 	REQUEST_MATCHES: Symbol('requestMatches'),
 	RESPONSE_MATCHES: Symbol('responseMatches'),
-	TEST_LAUNCHER_AUTOMATED: Symbol('testLauncherAutomated'),
-	TEST_LAUNCHER_INTERACTIVE: Symbol('testLauncherInteractive'),
 	TEST_LAUNCHER_TEST_COMMAND: Symbol('testLauncherTestCommand'),
-	SESSION_BOOTSTRAP_AUTOMATED: Symbol('autoBootstrapAutomated'),
-	SESSION_BOOTSTRAP_INTERACTIVE: Symbol('autoBootstrapInteractive'),
+	TEST_LAUNCHER_TOKEN: Symbol('testLauncherToken'),
+	SESSION_BOOTSTRAP_TOKEN: Symbol('autoBootstrapToken'),
 	UNTIL_CONDITION_CHAIN: Symbol('untilConditionChain'),
 	STRING: Symbol('string'),
 	HAD_NO_ERROR: Symbol('hadNoError'),
@@ -30,6 +27,9 @@ const validationKeys = {
 	TAP_TYPE_AND_DURATION: Symbol('tapTypeAndDuration'),
 	DIRECTIONS: Symbol('direction'),
 	LAUNCH_MODE: Symbol('launchMode'),
+	CSS_PROPS: Symbol('getCssProperties'),
+	ELEMENT_HANDLE: Symbol('handle'),
+	ELEMENT_ATTRIBUTES: Symbol('getAttributes'),
 };
 
 Object.freeze(validationKeys);

package/lib/constants/vrc.js

@@ -36,6 +36,8 @@ const vrcConstants = {
 	NUM_7:                   '7',
 	NUM_8:                   '8',
 	NUM_9:                   '9',
+	NEXT:                    'NEXT',
+	PREVIOUS:                'PREVIOUS',
 	FAST_FWD:                'FAST_FWD',
 	REWIND:                  'REWIND',
 	STOP:                    'STOP',

package/lib/testLauncher/SuitestLauncher.js

@@ -1,30 +1,28 @@
 const {
-	finishInteractive,
 	handleLauncherError,
 	validateInput,
 	runAllDevices,
-	prepareTestPackExecution,
-	runTestOnDevice,
 	getVersion,
 	isDebugMode,
 	addLauncherIpcListeners,
-	throwDebugInAutomatedError,
+	throwDebugForManyDevicesError,
 	increaseMaxListeners,
 } = require('../utils/testLauncherHelper');
-const {AUTOMATED, INTERACTIVE, TEST_COMMAND} = require('../constants/modes');
+const {TEST_COMMAND, TOKEN} = require('../constants/modes');
+const sessionConstants = require('../constants/session');
 const {getDevicesDetails} = require('../utils/getDeviceInfo');
-const {openSessionUnchained} = require('../commands/openSession');
 const {closeSessionUnchained} = require('../commands/closeSession');
 const {captureException} = require('../utils/sentry/Raven');
-const {
-	launcherGreeting,
-	launcherSummaryInteractive,
-	launcherWrongDeviceId,
-} = require('../texts');
+const t = require('../texts');
 const {version} = require('../../package.json');
-const SuitestError = require('../utils/SuitestError');
 const ipcServer = require('./ipc/server');
 const suitest = require('../../index');
+const SuitestError = require('../utils/SuitestError');
+
+function exitProcessWithError(message) {
+	suitest.logger.error(message);
+	process.exit(1);
+}
 
 class SuitestLauncher {
 	constructor(ownArgv = {}, restArgs = []) {
@@ -36,89 +34,79 @@ class SuitestLauncher {
 		});
 	}
 
-	async runAutomatedSession() {
-		suitest.logger.intro(launcherGreeting, version, AUTOMATED);
-		validateInput(AUTOMATED.toUpperCase(), this.ownArgv);
+	async runTokenSession() {
+		suitest.logger.intro(t.launcherGreeting, version);
+		validateInput(TOKEN.toUpperCase(), this.ownArgv);
+		const appConfigIdAndDeviceIdPresented = this.ownArgv.appConfigId && this.ownArgv.deviceId;
+		const presetArrayDefined = this.ownArgv.preset && this.ownArgv.preset.length > 0;
 
-		try {
-			/* istanbul ignore if  */
-			if (isDebugMode(this.ownArgv)) {
-				// debugging not allowed in automated session
-				throwDebugInAutomatedError();
-			}
+		if (!appConfigIdAndDeviceIdPresented && !presetArrayDefined) {
+			exitProcessWithError(t['errorType.specifyRunningDevices']());
+		}
 
-			const {devices, deviceAccessToken} = await prepareTestPackExecution(this.ownArgv);
-			const devicesWithDetails = await getDevicesDetails(suitest, devices);
-			const ipcPort = await ipcServer.start({
-				...this.ownArgv,
-				launcherVersion: version,
-				sessionToken: deviceAccessToken,
-				isDebugMode: false,
-				sessionType: AUTOMATED,
-			});
-
-			addLauncherIpcListeners();
-			// increase stdout max listeners based on number of child processes to avoid node warning
-			increaseMaxListeners(process.stdout, devices.length, this.ownArgv.concurrency);
+		// check that presets are exists only if appConfigId and deviceId not specified via cli
+		if (!appConfigIdAndDeviceIdPresented && presetArrayDefined) {
+			const definedPresets = Object.keys(this.ownArgv.presets || {});
+			const notFoundPresets = this.ownArgv.preset.filter(p => !definedPresets.includes(p));
 
-			try {
-				await runAllDevices(
-					this.restArgs,
-					this.ownArgv,
-					devicesWithDetails,
-					ipcPort,
-				);
-			} finally {
-				await closeSessionUnchained();
+			if (notFoundPresets.length > 0) {
+				exitProcessWithError(t['errorType.notFoundPresets'](notFoundPresets));
 			}
-		} catch (error) {
-			await captureException(error);
-			handleLauncherError(error);
 		}
-	}
-
-	async runInteractiveSession() {
-		suitest.logger.intro(launcherGreeting, version, INTERACTIVE);
-		validateInput(INTERACTIVE.toUpperCase(), this.ownArgv);
 
 		try {
-			const {username, password, orgId, deviceId} = this.ownArgv;
-			const {deviceAccessToken} = await openSessionUnchained(suitest, {
-				username,
-				password,
-				orgId,
-			});
-			const [deviceDetails] = await getDevicesDetails(suitest, [deviceId]);
-
-			if (!deviceDetails)
-				throw new SuitestError(launcherWrongDeviceId(
-					deviceId,
-					SuitestError.INVALID_INPUT
-				));
+			const devices = appConfigIdAndDeviceIdPresented
+				? [{
+					device: this.ownArgv.deviceId,
+					config: this.ownArgv.appConfigId,
+				}]
+				: this.ownArgv.preset.map((key) => {
+					const preset = this.ownArgv.presets[key];
 
-			try {
-				suitest.logger.intro(launcherSummaryInteractive,
-					this.restArgs.join(' '),
-					this.ownArgv.logDir,
-					deviceDetails.displayName,
-				);
+					return {
+						device: typeof preset.device === 'string' ? preset.device : preset.device.deviceId,
+						config: typeof preset.config === 'string' ? preset.config : preset.config.configId,
+						presetName: key,
+					};
+				});
+
+			await suitest.authContext.setContext(
+				sessionConstants.TOKEN,
+				this.ownArgv.tokenId,
+				this.ownArgv.tokenPassword,
+			);
+
+			const devicesWithDetails = await getDevicesDetails(suitest, devices);
+			const runsOnSingleDevice = devicesWithDetails.length === 1;
+
+			if (devicesWithDetails.length === 0) {
+				throw new SuitestError(t['errorType.noDevices']());
+			}
 
+			// should be allowed for single device only
+			if (isDebugMode(this.ownArgv) && !runsOnSingleDevice) {
+				throwDebugForManyDevicesError();
+			}
+
+			try {
 				const ipcPort = await ipcServer.start({
 					...this.ownArgv,
 					launcherVersion: version,
-					sessionToken: deviceAccessToken,
 					isDebugMode: isDebugMode(this.ownArgv),
-					sessionType: INTERACTIVE,
+					runsOnSingleDevice,
+					sessionType: TOKEN,
 				});
 
 				addLauncherIpcListeners();
+				// increase stdout max listeners based on number of child processes to avoid node warning
+				increaseMaxListeners(process.stdout, devices.length, this.ownArgv.concurrency);
 
-				const exitCode = await runTestOnDevice(
-					this.restArgs, this.ownArgv, deviceDetails, INTERACTIVE, ipcPort
+				await runAllDevices(
+					this.restArgs,
+					this.ownArgv,
+					devicesWithDetails,
+					ipcPort,
 				);
-				const withError = exitCode !== 0;
-
-				finishInteractive(withError);
 			} finally {
 				await closeSessionUnchained(suitest);
 			}

package/lib/testLauncher/buildArgs.js

@@ -1,6 +1,5 @@
 const yargs = require('yargs/yargs');
-const automatedCommand = require('./commands/automated');
-const interactiveCommand = require('./commands/interactive');
+const runCommand = require('./commands/run');
 const {version} = require('../../package.json');
 const {stColors} = require('./launcherLogger');
 const texts = require('../texts');
@@ -10,8 +9,7 @@ const texts = require('../texts');
  */
 const buildYargs = () => {
 	const epilogue = texts['tl.seeMoreCommandsOptions'](
-		stColors.bold('suitest interactive --help'),
-		stColors.bold('suitest automated --help')
+		stColors.bold('suitest run --help'),
 	);
 
 	return yargs([])
@@ -34,8 +32,7 @@ const addCommandsAndHelp = yrgs => {
 		.alias('help', 'h')
 		.version(version)
 		.alias('version', 'v')
-		.command(automatedCommand)
-		.command(interactiveCommand);
+		.command(runCommand);
 };
 
 module.exports = {