Skip to content

Commit

Permalink
fixed an issue where the number of available workers wasn't set corre…
Browse files Browse the repository at this point in the history
…ctly in some cases
  • Loading branch information
beatfactor committed Jun 18, 2021
1 parent 504bdb2 commit 7754054
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 17 deletions.
3 changes: 3 additions & 0 deletions bin/show_survey.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env node

console.log('\t 👋 Hey there! Thanks for installing Nightwatch. \n\n\tPlease let us know what features you\'d like to see \n\tin Nightwatch v2.0 by taking this quick survey: \n\n\t\thttps://forms.gle/zBhbjdsDE77hTHSB7\n');
21 changes: 5 additions & 16 deletions lib/runner/concurrency/concurrency.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const EventEmitter = require('events');
const Utils = require('../../utils');
const ChildProcess = require('./child-process.js');
const {Logger, isObject} = Utils;
const {Logger, isObject, isNumber} = Utils;

class Concurrency extends EventEmitter {
constructor(settings = {}, argv = {}) {
Expand Down Expand Up @@ -178,25 +178,14 @@ class Concurrency extends EventEmitter {
* @return {number}
*/
getTestWorkersCount() {
let workers = 1;

if (this.isWorkersSettingAuto()) {
workers = require('os').cpus().length;
} else if ('number' == typeof this.settings.test_workers.workers) {
workers = this.settings.test_workers.workers;
}

return workers;
}

isWorkersSettingAuto() {
const {test_workers} = this.settings;
let workers = require('os').cpus().length;

if (isObject(test_workers)) {
return test_workers.workers === 'auto' || test_workers.enabled === true && !('workers' in test_workers);
if (isObject(test_workers) && isNumber(test_workers.workers)) {
workers = test_workers.workers;
}

return test_workers === true;
return workers;
}

/**
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@
"mocha-coverage": "nyc --reporter=html mocha test/src/",
"test": "mocha test/src/",
"test-ci": "mocha test/src/ --bail",
"coverage": "npx nyc report --reporter=text-lcov > ./coverage/mocha_coverage.lcov"
"coverage": "npx nyc report --reporter=text-lcov > ./coverage/mocha_coverage.lcov",
"postinstall": "bin/show_survey.js"
},
"eslintConfig": {
"extends": "eslint:recommended",
Expand Down

0 comments on commit 7754054

Please sign in to comment.