From 8205f918028aff12fe3f0bd7797c0d1fccaa779c Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Wed, 13 Jun 2018 09:44:19 -0400 Subject: [PATCH] enable loglevel for test logger and actually log --- lib/cmd.js | 3 ++- lib/index.js | 4 ++-- lib/tests/run_tests.js | 6 ++++-- lib/tests/test.js | 2 +- lib/tests/test_logger.js | 12 +----------- 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/lib/cmd.js b/lib/cmd.js index 77af40171..ab681ab90 100644 --- a/lib/cmd.js +++ b/lib/cmd.js @@ -185,10 +185,11 @@ class Cmd { program .command('test [file]') .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') .description(__('run tests')) .action(function (file, options) { i18n.setOrDetectLocale(options.locale); - embark.runTests(file); + embark.runTests({file, loglevel: options.loglevel}); }); } diff --git a/lib/index.js b/lib/index.js index 9cac7e81e..be2a2eb6c 100644 --- a/lib/index.js +++ b/lib/index.js @@ -362,10 +362,10 @@ class Embark { }); } - runTests(file) { + runTests(options) { this.context = [constants.contexts.test]; let RunTests = require('./tests/run_tests.js'); - RunTests.run(file); + RunTests.run(options); } } diff --git a/lib/tests/run_tests.js b/lib/tests/run_tests.js index 9efc7197a..adc9672e5 100644 --- a/lib/tests/run_tests.js +++ b/lib/tests/run_tests.js @@ -22,9 +22,11 @@ function getFilesFromDir(filePath, cb) { } module.exports = { - run: function (filePath) { + run: function (options) { process.env.isTest = true; let failures = 0; + let filePath = options.file; + const loglevel = options.loglevel || 'warn'; if (!filePath) { filePath = 'test/'; } @@ -49,7 +51,7 @@ module.exports = { }, function setupGlobalNamespace(files, next) { // TODO put default config - const test = new Test(); + const test = new Test({loglevel}); global.embark = test; global.assert = assert; global.config = test.config.bind(test); diff --git a/lib/tests/test.js b/lib/tests/test.js index a15bb7b9b..43be482e1 100644 --- a/lib/tests/test.js +++ b/lib/tests/test.js @@ -90,7 +90,7 @@ class Test { }); this.engine.init({ - logger: new TestLogger({logLevel: 'debug'}) + logger: new TestLogger({logLevel: this.options.loglevel}) }); this.versions_default = this.engine.config.contractsConfig.versions; diff --git a/lib/tests/test_logger.js b/lib/tests/test_logger.js index b96b9a0f3..9d9fe39fb 100644 --- a/lib/tests/test_logger.js +++ b/lib/tests/test_logger.js @@ -5,21 +5,11 @@ require('colors'); class TestLogger { constructor(options) { this.logLevels = ['error', 'warn', 'info', 'debug', 'trace']; - this.logs = []; this.logLevel = options.logLevel || 'info'; } logFunction() { - this.logs.push(arguments); - // console.log(...arguments); - } - - contractsState() { - this.logs.push(arguments); - } - - availableServices() { - this.logs.push(arguments); + console.log(...arguments); } error(txt) {