mirror of https://github.com/embarklabs/embark.git
Merge pull request #518 from embark-framework/bug_fix/test-should-log
Enable loglevel for test logger and actually log
This commit is contained in:
commit
a69d3f7ba1
|
@ -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});
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue