@zohodesk/testinglibrary 0.0.1-exp.2 → 0.0.1-exp.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.0.1-exp.2",
+  "version": "0.0.1-exp.3",
   "description": "",
   "main": "./src/index.js",
   "scripts": {

package/src/core/jest/runner/jest-runner.js

@@ -14,10 +14,9 @@
 
 const { spawn } = require('child_process');
 const path = require('path');
-const getFilePathWithExtension = require('../../../utils/getFilePath');
-const { getBinPath } = require('../../../utils/rootPath');
+const { getExecutableBinaryPath } = require('../../../utils/rootPath');
 
-const jestPath = path.resolve(getBinPath(), getFilePathWithExtension('jest'));
+const jestPath = path.resolve(getExecutableBinaryPath('jest'));
 
 // Command and arguments for npx playwright test
 const command = jestPath;

package/src/core/playwright/codegen.js

@@ -1,13 +1,12 @@
 const { spawn } = require('child_process')
 const path = require('path');
-const getFilePathWithExtension = require('../../utils/getFilePath');
 const { chromium } = require('@playwright/test');
 const { Logger } = require('../../utils/logger');
-const { getBinPath } = require('../../utils/rootPath');
+const { getExecutableBinaryPath } = require('../../utils/rootPath');
 
 const userArgs = process.argv.slice(3);
 
-const playwrightPath = path.resolve(getBinPath(), getFilePathWithExtension('playwright'));
+const playwrightPath = path.resolve(getExecutableBinaryPath('playwright'));
 const command = playwrightPath;
 
 const args = ['codegen'].concat(userArgs);

package/src/core/playwright/report-generator.js

@@ -1,13 +1,12 @@
 const { spawn } = require('child_process');
 const path = require('path');
 const { Logger } = require('../../utils/logger');
-const getFilePathWithExtension = require('../../utils/getFilePath');
-const { getBinPath } = require('../../utils/rootPath');
+const { getExecutableBinaryPath } = require('../../utils/rootPath');
 
 
 const userArgs = process.argv.slice(3);
 
-const playwrightPath = path.resolve(getBinPath(), getFilePathWithExtension('playwright'));;
+const playwrightPath = path.resolve(getExecutableBinaryPath('playwright'));;
 const command = playwrightPath;
 const reportPath = path.resolve(process.cwd(), './playwright-report');
 

package/src/core/playwright/test-runner.js

@@ -6,7 +6,7 @@ const { initializeEnvConfig } = require('./env-initializer');
 const { Logger } = require('../../utils/logger');
 const getFilePathWithExtension = require('../../utils/getFilePath');
 const generateConfigFromFile = require('./readConfigFile');
-const { getBinPath } = require('../../utils/rootPath');
+const { getExecutableBinaryPath } = require('../../utils/rootPath');
 
 
 
@@ -25,7 +25,7 @@ generateConfigFromFile();
 const playwrightArgs = objectToCliArgs(userArgsObject, (key) => !CUSTOM_COMMANDS.includes(key));
 
 // Command and arguments for npx playwright test
-const playwrightPath = path.resolve(getBinPath(), getFilePathWithExtension('playwright'));
+const playwrightPath = path.resolve(getExecutableBinaryPath('playwright'));
 
 const command = playwrightPath;
 const args = ['test', '--config', require.resolve('../../../playwright.config.js')].concat(playwrightArgs);

package/src/utils/rootPath.js

@@ -1,19 +1,21 @@
 const path = require('path')
 const fs = require('fs');
+const { Logger } = require('./logger');
+const getFilePathWithExtension = require('./getFilePath');
 
-function findBinaryPath(directory) {
-  const binaryPath = path.join(directory, '.bin');
+function findBinaryPath(directory, command) {
+  const binaryPath = path.join(directory, '.bin', getFilePathWithExtension(command));
   if (fs.existsSync(binaryPath)) {
     return binaryPath;
   }
 
-  // Recursively search parent directories
+  // Recursively search parent directories. Might be time-consuming ?? Can we look for npm module like which?
   const parentDir = path.dirname(directory);
-  if (parentDir !== directory) {
-    return findBinaryPath(parentDir);
+  if (parentDir === directory) {
+    return null;
   }
 
-  return null;
+  return findBinaryPath(parentDir);
 }
 
 function getRootPath() {
@@ -24,13 +26,26 @@ function getRootNodeModulesPath() {
   return path.resolve(getRootPath(), 'node_modules');
 }
 
-function getBinPath() {
+function getBinPath(command) {
   const packageNodeModulesPath = getRootNodeModulesPath();
-  return findBinaryPath(packageNodeModulesPath)
+  return findBinaryPath(packageNodeModulesPath, command);
+
+}
+
+
+function getExecutableBinaryPath(command) {
+  const binPath = getBinPath(command);
+  if (binPath !== null) {
+    return binPath;
+  } else {
+    Logger.log(Logger.FAILURE_TYPE, `Error: Could not find executable bin file. Make sure to npm install before proceeding`);
+    process.exit();
+  }
 }
 
 module.exports = {
   getRootPath,
   getBinPath,
-  getRootNodeModulesPath
+  getRootNodeModulesPath,
+  getExecutableBinaryPath
 }