Merge branch 'master' into deploy

Author: karanshah-browserstack

bin/testObservability/cypress/index.js

@@ -2,8 +2,6 @@
 
 /* Used to detect Gherkin steps */
 
-const util = require('util');
-
 let eventsQueue = [];
 let testRunStarted = false;
 

bin/testObservability/helper/helper.js

@@ -284,6 +284,10 @@ const getCypressCommandEventListener = (isJS) => {
   )
 }
 
+const isE2ESupportFile = (file) => {
+  return file.includes('e2e.js') || file.includes('e2e.ts');
+}
+
 exports.setEventListeners = (bsConfig) => {
   try {
     const supportFilesData = helper.getSupportFiles(bsConfig, false);
@@ -292,7 +296,7 @@ exports.setEventListeners = (bsConfig) => {
       if(err) return exports.debug('EXCEPTION IN BUILD START EVENT : Unable to parse cypress support files');
       files.forEach(file => {
         try {
-          if(!file.includes('commands.js')) {
+          if (isE2ESupportFile(file) || !files.some(f => isE2ESupportFile(f))) {
             const defaultFileContent = fs.readFileSync(file, {encoding: 'utf-8'});
 
             let cypressCommandEventListener = getCypressCommandEventListener(file.includes('js'));

bin/testObservability/reporter/index.js

@@ -270,6 +270,16 @@ class MyReporter {
 
       const port = process.env.REPORTER_API_PORT_NO;
 
+      this.httpServer.on('error', (error) => {
+        if (error.code === 'EADDRINUSE') {
+          debugOnConsole(`Port ${port} is already in use. HTTP server could not start.`);
+          debug(`Port ${port} is already in use. HTTP server could not start.`, true, error);
+        } else {
+          debugOnConsole(`Exception in starting reporter server : ${error}`);
+          debug(`Exception in starting reporter server : ${error}`, true, error);
+        }
+      });
+
       this.httpServer.listen(port, '127.0.0.1', async () => {
         console.log(`Reporter HTTP server listening on port ${port}`);
       });

bin/testhub/utils.js

@@ -5,7 +5,7 @@ const TESTHUB_CONSTANTS = require("./constants");
 const testObservabilityHelper = require("../../bin/testObservability/helper/helper");
 const helper = require("../helpers/helper");
 const accessibilityHelper = require("../accessibility-automation/helper");
-const { detect } = require('detect-port');
+const detectPort = require('detect-port');
 
 
 const isUndefined = (value) => value === undefined || value === null;
@@ -195,17 +195,18 @@ exports.logBuildError = (error, product = "") => {
   }
 };
 
-exports.findAvailablePort = async (preferredPort, maxAttempts = 10) => {  
+exports.findAvailablePort = async (preferredPort, maxAttempts = 10) => {
+  const findPort = detectPort.detect || detectPort;
   let port = preferredPort;
   for (let attempts = 0; attempts < maxAttempts; attempts++) {
     try {
-      const availablePort = await detect(port);
+      const availablePort = await findPort(port);
 
       if (availablePort === port) {
           return port;
       } else {
         // Double-check suggested port
-        const verify = await detect(availablePort);
+        const verify = await findPort(availablePort);
         if (verify === availablePort) {
           return availablePort;
         }