Skip to content

Commit 96ebdc4

Browse files
dignifiedquiredignifiedquire
committed
revert: "Merge pull request #1791 from budde377/feature-adding-no-colors-to-run-command"
This reverts commit 56073fc, reversing changes made to b7d591f. Fixes #1894, #1895
1 parent c6076bd commit 96ebdc4

13 files changed

Lines changed: 36 additions & 87 deletions

File tree

‎lib/cli.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,6 @@ var describeRun = function () {
185185
.describe('fail-on-empty-test-suite', 'Fail on empty test suite.')
186186
.describe('no-fail-on-empty-test-suite', 'Do not fail on empty test suite.')
187187
.describe('help', 'Print usage.')
188-
.describe('log-level', '<disable | error | warn | info | debug> Level of logging.')
189-
.describe('colors', 'Use colors when reporting and printing logs.')
190-
.describe('no-colors', 'Do not use colors when reporting or printing logs.')
191188
}
192189

193190
var describeCompletion = function () {

‎lib/init.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ var exec = require('child_process').exec
66

77
var helper = require('./helper')
88
var logger = require('./logger')
9+
var constant = require('./constants')
910

1011
var log = logger.create('init')
1112

@@ -210,13 +211,21 @@ var processAnswers = function (answers, basePath, testMainFile) {
210211
}
211212

212213
exports.init = function (config) {
213-
logger.setupFromConfig(config)
214-
214+
var useColors = true
215+
var logLevel = constant.LOG_INFO
215216
var colorScheme = COLOR_SCHEME.ON
216217

217218
if (helper.isDefined(config.colors)) {
218219
colorScheme = config.colors ? COLOR_SCHEME.ON : COLOR_SCHEME.OFF
220+
useColors = config.colors
221+
}
222+
223+
if (helper.isDefined(config.logLevel)) {
224+
logLevel = config.logLevel
219225
}
226+
227+
logger.setup(logLevel, useColors)
228+
220229
// need to be registered before creating readlineInterface
221230
process.stdin.on('keypress', function (s, key) {
222231
sm.onKeypress(key)

‎lib/logger.js‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -43,29 +43,6 @@ var setup = function (level, colors, appenders) {
4343
})
4444
}
4545

46-
// Setup the logger by passing in the config object. The function sets the
47-
// `colors` and `logLevel` if they are defined. It takes two arguments:
48-
//
49-
// setupFromConfig(config, appenders)
50-
//
51-
// * `config`: *Object* The configuration object.
52-
// * `appenders`: *Array* This will be passed as appenders to log4js
53-
// to allow for fine grained configuration of log4js. For more information
54-
// see https://github.com/nomiddlename/log4js-node.
55-
var setupFromConfig = function (config, appenders) {
56-
var useColors = true
57-
var logLevel = constant.LOG_INFO
58-
59-
if (helper.isDefined(config.colors)) {
60-
useColors = config.colors
61-
}
62-
63-
if (helper.isDefined(config.logLevel)) {
64-
logLevel = config.logLevel
65-
}
66-
setup(logLevel, useColors, appenders)
67-
}
68-
6946
// Create a new logger. There are two optional arguments
7047
// * `name`, which defaults to `karma` and
7148
// If the `name = 'socket.io'` this will create a special wrapper
@@ -83,4 +60,3 @@ var create = function (name, level) {
8360

8461
exports.create = create
8562
exports.setup = setup
86-
exports.setupFromConfig = setupFromConfig

‎lib/middleware/runner.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@ var createRunnerMiddleware = function (emitter, fileList, capturedBrowsers, repo
3333
response.write('Waiting for previous execution...\n')
3434
}
3535

36-
var data = request.body
3736
emitter.once('run_start', function () {
3837
var responseWrite = response.write.bind(response)
39-
responseWrite.colors = data.colors
38+
4039
reporter.addAdapter(responseWrite)
4140

4241
// clean up, close runner response
@@ -47,6 +46,7 @@ var createRunnerMiddleware = function (emitter, fileList, capturedBrowsers, repo
4746
})
4847
})
4948

49+
var data = request.body
5050
log.debug('Setting client.args to ', data.args)
5151
config.client.args = data.args
5252

‎lib/reporter.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,8 @@ var createReporters = function (names, config, emitter, injector) {
9191
// TODO(vojta): instantiate all reporters through DI
9292
names.forEach(function (name) {
9393
if (['dots', 'progress'].indexOf(name) !== -1) {
94-
var Cls = require('./reporters/' + name)
95-
var ClsColor = require('./reporters/' + name + '_color')
96-
reporters.push(new Cls(errorFormatter, config.reportSlowerThan, config.colors))
97-
return reporters.push(new ClsColor(errorFormatter, config.reportSlowerThan, config.colors))
94+
var Cls = require('./reporters/' + name + (config.colors ? '_color' : ''))
95+
return reporters.push(new Cls(errorFormatter, config.reportSlowerThan))
9896
}
9997

10098
var locals = {

‎lib/reporters/base.js‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var util = require('util')
22

33
var helper = require('../helper')
44

5-
var BaseReporter = function (formatError, reportSlow, useColors, adapter) {
5+
var BaseReporter = function (formatError, reportSlow, adapter) {
66
this.adapters = [adapter || process.stdout.write.bind(process.stdout)]
77

88
this.onRunStart = function () {
@@ -46,15 +46,9 @@ var BaseReporter = function (formatError, reportSlow, useColors, adapter) {
4646

4747
this.write = function () {
4848
var msg = util.format.apply(null, Array.prototype.slice.call(arguments))
49-
var self = this
50-
this.adapters.forEach(function (adapter) {
51-
if (!helper.isDefined(adapter.colors)) {
52-
adapter.colors = useColors
53-
}
5449

55-
if (adapter.colors === self.USE_COLORS) {
56-
return adapter(msg)
57-
}
50+
this.adapters.forEach(function (adapter) {
51+
adapter(msg)
5852
})
5953
}
6054

@@ -142,7 +136,7 @@ BaseReporter.decoratorFactory = function (formatError, reportSlow) {
142136
}
143137
}
144138

145-
BaseReporter.decoratorFactory.$inject = ['formatError', 'config.reportSlowerThan', 'config.colors']
139+
BaseReporter.decoratorFactory.$inject = ['formatError', 'config.reportSlowerThan']
146140

147141
// PUBLISH
148142
module.exports = BaseReporter

‎lib/reporters/dots.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var BaseReporter = require('./base')
22

3-
var DotsReporter = function (formatError, reportSlow, useColors) {
4-
BaseReporter.call(this, formatError, reportSlow, useColors)
3+
var DotsReporter = function (formatError, reportSlow) {
4+
BaseReporter.call(this, formatError, reportSlow)
55

66
var DOTS_WRAP = 80
77

‎lib/reporters/dots_color.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
var DotsReporter = require('./dots')
22
var BaseColorReporter = require('./base_color')
33

4-
var DotsColorReporter = function (formatError, reportSlow, useColors) {
5-
DotsReporter.call(this, formatError, reportSlow, useColors)
4+
var DotsColorReporter = function (formatError, reportSlow) {
5+
DotsReporter.call(this, formatError, reportSlow)
66
BaseColorReporter.call(this)
77
}
88

‎lib/reporters/progress.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var BaseReporter = require('./base')
22

3-
var ProgressReporter = function (formatError, reportSlow, useColors) {
4-
BaseReporter.call(this, formatError, reportSlow, useColors)
3+
var ProgressReporter = function (formatError, reportSlow) {
4+
BaseReporter.call(this, formatError, reportSlow)
55

66
this.writeCommonMsg = function (msg) {
77
this.write(this._remove() + msg + this._render())

‎lib/reporters/progress_color.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
var ProgressReporter = require('./progress')
22
var BaseColorReporter = require('./base_color')
33

4-
var ProgressColorReporter = function (formatError, reportSlow, useColors) {
5-
ProgressReporter.call(this, formatError, reportSlow, useColors)
4+
var ProgressColorReporter = function (formatError, reportSlow) {
5+
ProgressReporter.call(this, formatError, reportSlow)
66
BaseColorReporter.call(this)
77
}
88

0 commit comments

Comments
 (0)