mocha import fix

Author: amaanbs

bin/testObservability/helper/helper.js

@@ -377,19 +377,22 @@ const getCypressCommandEventListener = () => {
 
 const setEventListeners = () => {
   try {
+    const cypressCommandEventListener = getCypressCommandEventListener();
     glob(process.cwd() + '/cypress/support/*.js', {}, (err, files) => {
       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')) {
             const defaultFileContent = fs.readFileSync(file, {encoding: 'utf-8'});
-    
-            let newFileContent =  defaultFileContent + 
+            
+            if(!defaultFileContent.includes(cypressCommandEventListener)) {
+              let newFileContent =  defaultFileContent + 
                                   '\n' +
-                                  getCypressCommandEventListener() +
+                                  cypressCommandEventListener +
                                   '\n'
-            fs.writeFileSync(file, newFileContent, {encoding: 'utf-8'});
-            supportFileContentMap[file] = defaultFileContent;
+              fs.writeFileSync(file, newFileContent, {encoding: 'utf-8'});
+              supportFileContentMap[file] = defaultFileContent;
+            }
           }
         } catch(e) {
           exports.debug(`Unable to modify file contents for ${file} to set event listeners with error ${e}`, true, e);

bin/testObservability/reporter/index.js

@@ -4,12 +4,12 @@ const util = require('util');
 const fs = require('fs');
 const path = require('path');
 const { requireModule } = require('../helper/helper');
-const Base = requireModule('mocha/lib/reporters/base.js', true),
-      utils = requireModule('mocha/lib/utils.js', true);
+const Base = requireModule('mocha/lib/reporters/base.js'),
+      utils = requireModule('mocha/lib/utils.js');
 const color = Base.color;
-const Mocha = requireModule('mocha', true);
+const Mocha = requireModule('mocha');
 // const Runnable = requireModule('mocha/lib/runnable');
-const Runnable = require('mocha/lib/runnable', true); // need to handle as this isn't present in older mocha versions
+const Runnable = require('mocha/lib/runnable'); // need to handle as this isn't present in older mocha versions
 const { v4: uuidv4 } = require('uuid');
 
 const { IPC_EVENTS } = require('../helper/constants');