code refactoring and merge issues fix

harshit-bs · Jun 5, 2023 · c967de8 · c967de8
1 parent ae9d2dc
commit c967de8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 66 deletions.
diff --git a/cucumber-js/nightwatch-format.js b/cucumber-js/nightwatch-format.js
@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const Utils = require('../lib/utils');
-const {Logger} = Utils;
+const {Logger, createFolder} = Utils;
 const {Formatter} = require('@cucumber/cucumber');
 
 const NightwatchState = require('./nightwatchState');
@@ -108,7 +108,7 @@ module.exports = class MessageFormatter extends Formatter {
   }
 
   writeReportFile(filename, rendered, shouldCreateFolder, output_folder) {
-    (shouldCreateFolder ? Utils.createFolder(output_folder) : Promise.resolve())
+    (shouldCreateFolder ? createFolder(output_folder) : Promise.resolve())
       .then(() => {
         return new Promise((resolve, reject) => {
           fs.writeFile(filename, rendered, function(err) {
@@ -172,9 +172,9 @@ module.exports = class MessageFormatter extends Formatter {
       testStepStarted: this.testStepStartedData
     };
 
-    const key = Object.keys(envelope)[0];
-    if (handlers[key]) {
-      handlers[key].call(this, envelope[key]);
+    const cucumberEvent = Object.keys(envelope)[0];
+    if (cucumberEvent && handlers[cucumberEvent]) {
+      handlers[cucumberEvent].call(this, envelope[cucumberEvent]);
     }
   }
 };
diff --git a/lib/runner/eventHandler.js b/lib/runner/eventHandler.js
diff --git a/lib/transport/selenium-webdriver/httpclient.js b/lib/transport/selenium-webdriver/httpclient.js
@@ -55,10 +55,6 @@ module.exports = function(settings, HttpResponse) {
 
       const request = new HttpRequest(this.options);
 
-      if (settings.eventHub) {
-        request.eventHub = settings.eventHub;
-      }
-
       return new Promise((resolve, reject) => {
         request.once('success', (data, response, isRedirect) => {
           const {statusCode, headers} = response;

diff --git a/lib/utils/logger/index.js b/lib/utils/logger/index.js
@@ -36,7 +36,7 @@ function timestamp(d = new Date(), format) {
     return d.toISOString();
   }
 
-  let time = [
+  const time = [
     pad(d.getHours()),
     pad(d.getMinutes()),
     pad(d.getSeconds())
@@ -76,8 +76,8 @@ function logMessage(type, message, args, alwaysShow) {
   let messageStr = '';
   let logMethod = 'log';
   let prefix;
-  let d = new Date();
-  let timeIso = d.toISOString();
+  const d = new Date();
+  const timeIso = d.toISOString();
   let timestamp = logTimestamp(d);
 
   switch (type) {
@@ -472,19 +472,6 @@ module.exports.collectOutput = function() {
   return output;
 };
 
-module.exports.collectCommandOutput = function() {
-  const instance = Logger.getInstance();
-
-  if (!instance) {
-    return [];
-  }
-
-  const {commandOutput} = instance;
-  instance.commandOutput = [];
-
-  return commandOutput;
-};
-
 module.exports.collectTestSectionOutput = function() {
   const instance = Logger.getInstance();