status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #869 from embark-framework/cli/coverage-only-with-vm 

--coverage requires --node be "vm"
This commit is contained in:
Iuri Matias 2018-09-19 11:58:39 -04:00 committed by GitHub
parent d3e14c0d8a a6231851b0
commit 501ddd610e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmd/cmd.js
View File

@ -267,12 +267,12 @@ class Cmd {
test() { test() {
program program
.command('test [file]') .command('test [file]')
.option('-n , --node <node>', __('Node to connect to. Valid values are ["vm", "embark", "<custom node endpoint>"]: \n') + .option('-n , --node <node>', __('node for running the tests ["vm", "embark", <endpoint>] (default: vm)\n') +
' vm - ' + __('Starts an Ethereum simulator (ganache) and runs the tests using the simulator') + '\n' + ' vm - ' + __('start and use an Ethereum simulator (ganache)') + '\n' +
' embark - ' + __('Uses the node associated with an already running embark process') + '\n' + ' embark - ' + __('use the node of a running embark process') + '\n' +
' ' + __('<custom node endpoint> - Connects to a running node available at the end point and uses it to run the tests')) ' <endpoint> - ' + __('connect to and use the specified node'))
.option('-d , --gasDetails', __('When set, will print the gas cost for each contract deployment')) .option('-d , --gasDetails', __('print the gas cost for each contract deployment when running the tests'))
.option('-c , --coverage', __('When set, will generate the coverage after the tests')) .option('-c , --coverage', __('generate a coverage report after running the tests (vm only)'))
.option('--locale [locale]', __('language to use (default: en)')) .option('--locale [locale]', __('language to use (default: en)'))
.option('--loglevel [loglevel]', __('level of logging to display') + ' ["error", "warn", "info", "debug", "trace"]', /^(error|warn|info|debug|trace)$/i, 'warn') .option('--loglevel [loglevel]', __('level of logging to display') + ' ["error", "warn", "info", "debug", "trace"]', /^(error|warn|info|debug|trace)$/i, 'warn')
.description(__('run tests')) .description(__('run tests'))
@ -280,11 +280,16 @@ class Cmd {
const node = options.node || 'vm'; const node = options.node || 'vm';
const urlRegexExp = /^(vm|embark|((ws|https?):\/\/([a-zA-Z0-9_.-]*):?([0-9]*)?))$/i; const urlRegexExp = /^(vm|embark|((ws|https?):\/\/([a-zA-Z0-9_.-]*):?([0-9]*)?))$/i;
if (!urlRegexExp.test(node)) { if (!urlRegexExp.test(node)) {
console.error(`invalid --node option: must be 'vm', 'embark' or a valid URL\n`.red); console.error(`invalid --node option: must be "vm", "embark" or a valid URL\n`.red);
options.outputHelp(); options.outputHelp();
process.exit(1); process.exit(1);
} }
options.node = node; options.node = node;
if (options.coverage && options.node !== 'vm') {
console.error(`invalid --node option: coverage supports "vm" only\n`.red);
options.outputHelp();
process.exit(1);
}
checkDeps(); checkDeps();
i18n.setOrDetectLocale(options.locale); i18n.setOrDetectLocale(options.locale);
embark.runTests({file, loglevel: options.loglevel, gasDetails: options.gasDetails, embark.runTests({file, loglevel: options.loglevel, gasDetails: options.gasDetails,