Features/use worker threads (#3592)

nightwatchjs · Mar 14, 2023 · 08e1ea6 · 08e1ea6
1 parent a157817
commit 08e1ea6
Show file tree

Hide file tree

Showing 19 changed files with 981 additions and 130 deletions.
diff --git a/lib/reporter/global-reporter.js b/lib/reporter/global-reporter.js
@@ -81,7 +81,7 @@ module.exports = class GlobalReporter {
   setupChildProcessListener(emitter) {
     if (!Concurrency.isTestWorker()) {
       emitter.on('message', data => {
-        data = JSON.parse(data);
+        data = this.settings.use_child_process ? JSON.parse(data) : data;
         this.addTestSuiteResults(data.results, data.httpOutput);
       });
     }
@@ -108,7 +108,7 @@ module.exports = class GlobalReporter {
   }
 
   print() {
-    if (Concurrency.isChildProcess() || !this.settings.output) {
+    if (Concurrency.isWorker() || !this.settings.output) {
       return this;
     }
 
@@ -381,7 +381,7 @@ module.exports = class GlobalReporter {
   }
 
   save() {
-    if (Concurrency.isChildProcess()) {
+    if (Concurrency.isWorker()) {
       return Promise.resolve();
     }
 

diff --git a/lib/reporter/index.js b/lib/reporter/index.js
@@ -288,9 +288,9 @@ class Reporter extends SimplifiedReporter {
     let currentTestResult = this.testResults.currentTestResult;
 
     const Concurrency = require('../runner/concurrency');
-    const isChildProcess = Concurrency.isChildProcess();
-    if (isChildProcess || !this.settings.detailed_output || this.unitTestsMode) {
-      this.printSimplifiedTestResult(ok, elapsedTime, isChildProcess);
+    const isWorker = Concurrency.isWorker();
+    if (isWorker || !this.settings.detailed_output || this.unitTestsMode) {
+      this.printSimplifiedTestResult(ok, elapsedTime, isWorker);
 
       return;
     }
@@ -310,14 +310,14 @@ class Reporter extends SimplifiedReporter {
   /**
    * @param {boolean} ok
    * @param {number} elapsedTime
-   * @param {boolean} isChildProcess
+   * @param {boolean} isWorker
    */
-  printSimplifiedTestResult(ok, elapsedTime, isChildProcess) {
+  printSimplifiedTestResult(ok, elapsedTime, isWorker) {
     const {currentTest} = this;
 
     let result = [colors[ok ? 'green': 'red'](Utils.symbols[ok ? 'ok' : 'fail'])];
     if (!this.unitTestsMode) {
-      if (isChildProcess) {
+      if (isWorker) {
         result.push(colors.white(process.env.__NIGHTWATCH_ENV, colors.background.black));
       }
 

diff --git a/lib/runner/cli/cli.js b/lib/runner/cli/cli.js
@@ -354,7 +354,7 @@ class CliRunner {
   }
 
   runGlobalHook(key, args = [], isParallelHook = false) {
-    if (isParallelHook && Concurrency.isChildProcess() || !isParallelHook && !Concurrency.isChildProcess()) {
+    if (isParallelHook && Concurrency.isWorker() || !isParallelHook && !Concurrency.isWorker()) {
       return this.globals.runGlobalHook(key, args);
     }
 
@@ -395,7 +395,7 @@ class CliRunner {
 
       if (isMobile(desiredCapabilities)) {
 
-        if  (Concurrency.isChildProcess()) {
+        if  (Concurrency.isWorker()) {
           Logger.info('Disabling parallelism while running tests on mobile platform');
         }
 
@@ -595,7 +595,7 @@ class CliRunner {
         return err;
       })
       .then(errorOrFailed => {
-        if (typeof done == 'function' && !Concurrency.isChildProcess()) {
+        if (typeof done == 'function' && !Concurrency.isWorker()) {
           if (errorOrFailed instanceof Error) {
             return done(errorOrFailed);
           }