suitest-js-api 3.4.0 → 3.4.3

package/lib/chains/elementChain.js

@@ -1,6 +1,5 @@
 const {omit, compose, isNil} = require('ramda');
 const SuitestError = require('../../lib/utils/SuitestError');
-const util = require('util');
 
 // Import utils
 const makeChain = require('../utils/makeChain');

package/lib/chains/locationChain.js

@@ -16,18 +16,13 @@ const {
 	gettersComposer,
 	makeToJSONComposer,
 } = require('../composers');
-const {
-	processServerResponse,
-	getRequestType,
-} = require('../utils/socketChainHelper');
+const {getRequestType} = require('../utils/socketChainHelper');
 const {
 	applyTimeout,
 	applyNegation,
 } = require('../utils/chainUtils');
 
 const locationFactory = (classInstance) => {
-	const {logger} = classInstance;
-
 	const toJSON = data => {
 		const type = getRequestType(data);
 		const subject = {type: 'location'};
@@ -51,8 +46,8 @@ const locationFactory = (classInstance) => {
 	};
 
 	// Build Composers
-	const toStringComposer = makeToStringComposer(toString, toJSON);
-	const thenComposer = makeThenComposer(toJSON, processServerResponse(logger, classInstance.getConfig().logLevel));
+	const toStringComposer = makeToStringComposer(toJSON);
+	const thenComposer = makeThenComposer(toJSON);
 	const toJSONComposer = makeToJSONComposer(toJSON);
 
 	/**

package/lib/chains/openUrlChain.js

@@ -1,6 +1,5 @@
 // Import helpers and composers
 const makeChain = require('../utils/makeChain');
-const {processJsonMessageForToString} = require('../utils/chainUtils');
 const {
 	abandonComposer,
 	makeToStringComposer,
@@ -10,17 +9,11 @@ const {
 	gettersComposer,
 	makeToJSONComposer,
 } = require('../composers');
-const {
-	openURL,
-	invalidInputMessage,
-} = require('../texts');
-const {processServerResponse, getRequestType} = require('../utils/socketChainHelper');
+const {invalidInputMessage} = require('../texts');
+const {getRequestType} = require('../utils/socketChainHelper');
 const {validate, validators} = require('../validation');
 
 const openUrlFactory = (classInstance) => {
-	const {logger} = classInstance;
-	const toString = (jsonMessage) => openURL(processJsonMessageForToString(jsonMessage).url);
-
 	const toJSON = data => ({
 		type: getRequestType(data, false),
 		request: {
@@ -30,8 +23,8 @@ const openUrlFactory = (classInstance) => {
 	});
 
 	// Build Composers
-	const toStringComposer = makeToStringComposer(toString, toJSON);
-	const thenComposer = makeThenComposer(toJSON, processServerResponse(logger, classInstance.getConfig().logLevel));
+	const toStringComposer = makeToStringComposer(toJSON);
+	const thenComposer = makeThenComposer(toJSON);
 	const toJSONComposer = makeToJSONComposer(toJSON);
 
 	/**

package/lib/chains/playstationVideoChain.js

@@ -20,6 +20,8 @@ const {
 const {getRequestType} = require('../utils/socketChainHelper');
 const {getMatchExpression, applyTimeout} = require('../utils/chainUtils');
 const {SUBJ_COMPARATOR} = require('../constants/comparator');
+const SuitestError = require('../utils/SuitestError');
+const {psVideoMalformed} = require('../texts');
 
 const playstationVideoFactory = (classInstance) => {
 	const toJSON = data => {
@@ -28,9 +30,11 @@ const playstationVideoFactory = (classInstance) => {
 		const subject = {
 			type: 'psVideo',
 		};
+		let videoLineMalformed = true;
 
 		// query
 		if (type === 'query') {
+			videoLineMalformed = false;
 			socketMessage.subject = {
 				type: 'elementProps',
 				selector: {psVideo: true},
@@ -39,6 +43,7 @@ const playstationVideoFactory = (classInstance) => {
 
 		// element subject
 		if (data.comparator) {
+			videoLineMalformed = false;
 			socketMessage.request = applyTimeout({
 				type: 'assert',
 				condition: {subject},
@@ -53,6 +58,9 @@ const playstationVideoFactory = (classInstance) => {
 				socketMessage.request.condition.expression = getMatchExpression(data);
 			}
 		}
+		if (videoLineMalformed) {
+			throw new SuitestError(psVideoMalformed(), SuitestError.INVALID_INPUT);
+		}
 
 		return socketMessage;
 	};

package/lib/chains/videoChain.js

@@ -1,6 +1,6 @@
 // Import utils
 const makeChain = require('../utils/makeChain');
-
+const SuitestError = require('../../lib/utils/SuitestError');
 // Import chain composers
 const {
 	notComposer,
@@ -27,6 +27,7 @@ const {
 	SUBJ_COMPARATOR: SUBJ_COMPARATOR_M,
 } = require('../mappings');
 const {elementWithComparatorToJSON} = require('../utils/chainUtils');
+const {videoMalformed} = require('../texts');
 
 const videoFactory = (classInstance) => {
 	const toJSON = data => {
@@ -35,9 +36,11 @@ const videoFactory = (classInstance) => {
 		const subject = {
 			type: 'video',
 		};
+		let videoLineMalformed = true;
 
 		// query
 		if (type === 'query') {
+			videoLineMalformed = false;
 			socketMessage.subject = {
 				type: 'elementProps',
 				selector: {video: true},
@@ -46,14 +49,19 @@ const videoFactory = (classInstance) => {
 
 		// video subject
 		if (data.comparator) {
+			videoLineMalformed = false;
 			socketMessage.request = elementWithComparatorToJSON(data, subject, classInstance.config.defaultTimeout);
 		}
 
+		if (videoLineMalformed) {
+			throw new SuitestError(videoMalformed(), SuitestError.INVALID_INPUT);
+		}
+
 		return socketMessage;
 	};
 
 	// Build Composers
-	const toStringComposer = makeToStringComposer(toString, toJSON);
+	const toStringComposer = makeToStringComposer(toJSON);
 	const thenComposer = makeThenComposer(toJSON);
 	const toJSONComposer = makeToJSONComposer(toJSON);
 

package/lib/texts.js

@@ -72,6 +72,8 @@ module.exports = {
 	applicationCommandMalformed: () => 'Invalid input - application command is malformed',
 	incorrectElementIndex: () => 'the "index" supplied to the .element() selector should be > 0',
 	assertElementMalformed: () => 'Assert element line is malformed',
+	videoMalformed: () => 'Video line is malformed',
+	psVideoMalformed: () => 'PlayStation Video line is malformed',
 
 	positionIsMalformed: () => 'position command is malformed',
 	relativePositionIsMalformed: () => 'relative position is malformed',

package/lib/validation/validators.js

@@ -209,6 +209,7 @@ const allowedUntilConditionChainTypes = [
 	'location',
 	'network',
 	'video',
+	'psVideo',
 ];
 
 const allowedUntilConditionChainNames = [
@@ -219,6 +220,7 @@ const allowedUntilConditionChainNames = [
 	'location',
 	'networkRequest',
 	'video',
+	'psVideo',
 ];
 
 const getSubjectType = path(['request', 'condition', 'subject', 'type']);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "suitest-js-api",
-  "version": "3.4.0",
+  "version": "3.4.3",
   "main": "index.js",
   "repository": "git@github.com:SuitestAutomation/suitest-js-api.git",
   "author": "Suitest <hello@suite.st>",
@@ -85,7 +85,7 @@
   },
   "dependencies": {
     "@suitest/smst-to-text": "^4.4.3",
-    "@suitest/translate": "^4.5.0",
+    "@suitest/translate": "^4.5.1",
     "@types/node": "^14.0.10",
     "ajv": "^6.12.2",
     "ansi-regex": "^5.0.0",