code refactoring for capabilities issue

(cherry picked from commit 370c01e) (cherry picked from commit 0c2e119)
harshit-bs · Aug 17, 2023 · 12b3cfe · 12b3cfe
1 parent 0d5a9a0
commit 12b3cfe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -137,7 +137,13 @@ module.exports.createClient = function({
         .then(() => {
           return client.createSession({argv});
         })
-        .then(_ => {
+        .then((data) => {
+          if (this.settings.test_runner?.type === 'cucumber' && NightwatchEventHub.isAvailable) {
+            const NightwatchFormatter = require('./runner/test-runners/cucumber/nightwatch-format');
+
+            NightwatchFormatter.setCapabilities(data);
+          }
+
           return client.api;
         })
         .catch((error) => {

diff --git a/lib/transport/selenium-webdriver/index.js b/lib/transport/selenium-webdriver/index.js
@@ -12,7 +12,6 @@ const CDP = require('./cdp.js');
 const {colors} = Logger;
 const {isErrorResponse, checkLegacyResponse, throwDecodedError, WebDriverError} = error;
 const {IosSessionErrors} = require('../errors');
-const {NightwatchEventHub} = require('../../runner/eventHub.js');
 
 let _driverService = null;
 let _driver = null;
@@ -298,20 +297,11 @@ class Transport extends BaseTransport {
       this.__elementKey = elementKey;
       await this.showConnectInfo({startTime, host, port, start_process, sessionInfo});
 
-      if (this.settings.test_runner?.type === 'cucumber' && NightwatchEventHub.isAvailable) {
-        const NightwatchFormatter = require('../../runner/test-runners/cucumber/nightwatch-format.js');
-
-        NightwatchFormatter.setCapabilities({
-          sessionId,
-          capabilities,
-          host, 
-          port
-        });
-      }
-
       return {
         sessionId,
-        capabilities
+        capabilities,
+        host, 
+        port
       };
     } catch (err) {
       const error = this.handleConnectError(err);