Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2a54d53

Browse files
mcollinamcollina
committed
Replaced zuul with airtap
1 parent 3b1645e commit 2a54d53

File tree

3 files changed

+162
-157
lines changed

3 files changed

+162
-157
lines changed

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"lib"
2020
],
2121
"scripts": {
22-
"browser-test": "zuul tape test/browser*test.js --local",
22+
"browser-test": "airtap --local 8080 test/browser*test.js",
2323
"test": "standard | snazzy && NODE_OPTIONS='--no-warnings' tap --no-cov test/*test.js",
2424
"ci": "standard | snazzy && NODE_OPTIONS='--no-warnings' tap --cov test/*test.js",
2525
"bench-all": "node benchmarks/runbench all",
@@ -55,6 +55,7 @@
5555
},
5656
"homepage": "http://getpino.io",
5757
"devDependencies": {
58+
"airtap": "0.0.7",
5859
"benchmark": "^2.1.4",
5960
"bole": "^3.0.2",
6061
"bunyan": "^1.8.12",
@@ -69,14 +70,13 @@
6970
"snazzy": "^7.1.1",
7071
"standard": "^11.0.1",
7172
"steed": "^1.1.3",
72-
"tap": "^11.1.3",
73+
"tap": "^11.1.5",
7374
"tape": "^4.9.0",
7475
"through2": "^2.0.3",
75-
"winston": "^3.0.0-rc3",
76-
"zuul": "^3.11.1"
76+
"winston": "^3.0.0-rc5"
7777
},
7878
"dependencies": {
79-
"chalk": "^2.3.2",
79+
"chalk": "^2.4.1",
8080
"fast-json-parse": "^1.0.3",
8181
"fast-safe-stringify": "^1.2.3",
8282
"flatstr": "^1.0.5",

‎test/browser.serializers.test.js‎

Lines changed: 140 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -38,173 +38,175 @@ test('without the serialize option, serializers do not override values', functio
3838
parent.fatal({test: 'test'})
3939
})
4040

41-
test('if serialize option is true, standard error serializer is auto enabled', function (t) {
42-
t.plan(1)
43-
var err = Error('test')
44-
err.code = 'test'
45-
err.type = 'Error' // get that cov
46-
var expect = pino.stdSerializers.err(err)
47-
48-
var consoleError = console.error
49-
console.error = function (err) {
50-
t.deepEqual(err, expect)
51-
}
52-
53-
var logger = fresh('../browser', require)({
54-
browser: { serialize: true }
41+
if (process.title !== 'browser') {
42+
test('if serialize option is true, standard error serializer is auto enabled', function (t) {
43+
t.plan(1)
44+
var err = Error('test')
45+
err.code = 'test'
46+
err.type = 'Error' // get that cov
47+
var expect = pino.stdSerializers.err(err)
48+
49+
var consoleError = console.error
50+
console.error = function (err) {
51+
t.deepEqual(err, expect)
52+
}
53+
54+
var logger = fresh('../browser', require)({
55+
browser: { serialize: true }
56+
})
57+
58+
console.error = consoleError
59+
60+
logger.fatal(err)
5561
})
5662

57-
console.error = consoleError
63+
test('if serialize option is array, standard error serializer is auto enabled', function (t) {
64+
t.plan(1)
65+
var err = Error('test')
66+
err.code = 'test'
67+
var expect = pino.stdSerializers.err(err)
5868

59-
logger.fatal(err)
60-
})
69+
var consoleError = console.error
70+
console.error = function (err) {
71+
t.deepEqual(err, expect)
72+
}
6173

62-
test('if serialize option is array, standard error serializer is auto enabled', function (t) {
63-
t.plan(1)
64-
var err = Error('test')
65-
err.code = 'test'
66-
var expect = pino.stdSerializers.err(err)
74+
var logger = fresh('../browser', require)({
75+
browser: { serialize: [] }
76+
})
6777

68-
var consoleError = console.error
69-
console.error = function (err) {
70-
t.deepEqual(err, expect)
71-
}
78+
console.error = consoleError
7279

73-
var logger = fresh('../browser', require)({
74-
browser: { serialize: [] }
80+
logger.fatal(err)
7581
})
7682

77-
console.error = consoleError
83+
test('if serialize option is array containing !stdSerializers.err, standard error serializer is disabled', function (t) {
84+
t.plan(1)
85+
var err = Error('test')
86+
err.code = 'test'
87+
var expect = err
7888

79-
logger.fatal(err)
80-
})
89+
var consoleError = console.error
90+
console.error = function (err) {
91+
t.is(err, expect)
92+
}
8193

82-
test('if serialize option is array containing !stdSerializers.err, standard error serializer is disabled', function (t) {
83-
t.plan(1)
84-
var err = Error('test')
85-
err.code = 'test'
86-
var expect = err
94+
var logger = fresh('../browser', require)({
95+
browser: { serialize: ['!stdSerializers.err'] }
96+
})
8797

88-
var consoleError = console.error
89-
console.error = function (err) {
90-
t.is(err, expect)
91-
}
98+
console.error = consoleError
9299

93-
var logger = fresh('../browser', require)({
94-
browser: { serialize: ['!stdSerializers.err'] }
100+
logger.fatal(err)
95101
})
96102

97-
console.error = consoleError
98-
99-
logger.fatal(err)
100-
})
101-
102-
test('in browser, serializers apply to all objects', function (t) {
103-
t.plan(3)
104-
var consoleError = console.error
105-
console.error = function (test, test2, test3, test4, test5) {
106-
t.is(test.key, 'serialized')
107-
t.is(test2.key2, 'serialized2')
108-
t.is(test5.key3, 'serialized3')
109-
}
110-
111-
var logger = fresh('../browser', require)({
112-
serializers: {
113-
key: function () { return 'serialized' },
114-
key2: function () { return 'serialized2' },
115-
key3: function () { return 'serialized3' }
116-
},
117-
browser: { serialize: true }
103+
test('in browser, serializers apply to all objects', function (t) {
104+
t.plan(3)
105+
var consoleError = console.error
106+
console.error = function (test, test2, test3, test4, test5) {
107+
t.is(test.key, 'serialized')
108+
t.is(test2.key2, 'serialized2')
109+
t.is(test5.key3, 'serialized3')
110+
}
111+
112+
var logger = fresh('../browser', require)({
113+
serializers: {
114+
key: function () { return 'serialized' },
115+
key2: function () { return 'serialized2' },
116+
key3: function () { return 'serialized3' }
117+
},
118+
browser: { serialize: true }
119+
})
120+
121+
console.error = consoleError
122+
123+
logger.fatal({key: 'test'}, {key2: 'test'}, 'str should skip', [{foo: 'array should skip'}], {key3: 'test'})
118124
})
119125

120-
console.error = consoleError
121-
122-
logger.fatal({key: 'test'}, {key2: 'test'}, 'str should skip', [{foo: 'array should skip'}], {key3: 'test'})
123-
})
124-
125-
test('serialize can be an array of selected serializers', function (t) {
126-
t.plan(3)
127-
var consoleError = console.error
128-
console.error = function (test, test2, test3, test4, test5) {
129-
t.is(test.key, 'test')
130-
t.is(test2.key2, 'serialized2')
131-
t.is(test5.key3, 'test')
132-
}
133-
134-
var logger = fresh('../browser', require)({
135-
serializers: {
136-
key: function () { return 'serialized' },
137-
key2: function () { return 'serialized2' },
138-
key3: function () { return 'serialized3' }
139-
},
140-
browser: { serialize: ['key2'] }
126+
test('serialize can be an array of selected serializers', function (t) {
127+
t.plan(3)
128+
var consoleError = console.error
129+
console.error = function (test, test2, test3, test4, test5) {
130+
t.is(test.key, 'test')
131+
t.is(test2.key2, 'serialized2')
132+
t.is(test5.key3, 'test')
133+
}
134+
135+
var logger = fresh('../browser', require)({
136+
serializers: {
137+
key: function () { return 'serialized' },
138+
key2: function () { return 'serialized2' },
139+
key3: function () { return 'serialized3' }
140+
},
141+
browser: { serialize: ['key2'] }
142+
})
143+
144+
console.error = consoleError
145+
146+
logger.fatal({key: 'test'}, {key2: 'test'}, 'str should skip', [{foo: 'array should skip'}], {key3: 'test'})
141147
})
142148

143-
console.error = consoleError
144-
145-
logger.fatal({key: 'test'}, {key2: 'test'}, 'str should skip', [{foo: 'array should skip'}], {key3: 'test'})
146-
})
147-
148-
test('serialize filter applies to child loggers', function (t) {
149-
t.plan(3)
150-
var consoleError = console.error
151-
console.error = function (binding, test, test2, test3, test4, test5) {
152-
t.is(test.key, 'test')
153-
t.is(test2.key2, 'serialized2')
154-
t.is(test5.key3, 'test')
155-
}
156-
157-
var logger = fresh('../browser', require)({
158-
browser: { serialize: ['key2'] }
149+
test('serialize filter applies to child loggers', function (t) {
150+
t.plan(3)
151+
var consoleError = console.error
152+
console.error = function (binding, test, test2, test3, test4, test5) {
153+
t.is(test.key, 'test')
154+
t.is(test2.key2, 'serialized2')
155+
t.is(test5.key3, 'test')
156+
}
157+
158+
var logger = fresh('../browser', require)({
159+
browser: { serialize: ['key2'] }
160+
})
161+
162+
console.error = consoleError
163+
164+
logger.child({aBinding: 'test',
165+
serializers: {
166+
key: function () { return 'serialized' },
167+
key2: function () { return 'serialized2' },
168+
key3: function () { return 'serialized3' }
169+
}}).fatal({key: 'test'}, {key2: 'test'}, 'str should skip', [{foo: 'array should skip'}], {key3: 'test'})
159170
})
160171

161-
console.error = consoleError
172+
test('parent serializers apply to child bindings', function (t) {
173+
t.plan(1)
174+
var consoleError = console.error
175+
console.error = function (binding) {
176+
t.is(binding.key, 'serialized')
177+
}
162178

163-
logger.child({aBinding: 'test',
164-
serializers: {
165-
key: function () { return 'serialized' },
166-
key2: function () { return 'serialized2' },
167-
key3: function () { return 'serialized3' }
168-
}}).fatal({key: 'test'}, {key2: 'test'}, 'str should skip', [{foo: 'array should skip'}], {key3: 'test'})
169-
})
179+
var logger = fresh('../browser', require)({
180+
serializers: {
181+
key: function () { return 'serialized' }
182+
},
183+
browser: { serialize: true }
184+
})
170185

171-
test('parent serializers apply to child bindings', function (t) {
172-
t.plan(1)
173-
var consoleError = console.error
174-
console.error = function (binding) {
175-
t.is(binding.key, 'serialized')
176-
}
186+
console.error = consoleError
177187

178-
var logger = fresh('../browser', require)({
179-
serializers: {
180-
key: function () { return 'serialized' }
181-
},
182-
browser: { serialize: true }
188+
logger.child({key: 'test'}).fatal({test: 'test'})
183189
})
184190

185-
console.error = consoleError
191+
test('child serializers apply to child bindings', function (t) {
192+
t.plan(1)
193+
var consoleError = console.error
194+
console.error = function (binding) {
195+
t.is(binding.key, 'serialized')
196+
}
186197

187-
logger.child({key: 'test'}).fatal({test: 'test'})
188-
})
198+
var logger = fresh('../browser', require)({
199+
browser: { serialize: true }
200+
})
189201

190-
test('child serializers apply to child bindings', function (t) {
191-
t.plan(1)
192-
var consoleError = console.error
193-
console.error = function (binding) {
194-
t.is(binding.key, 'serialized')
195-
}
202+
console.error = consoleError
196203

197-
var logger = fresh('../browser', require)({
198-
browser: { serialize: true }
204+
logger.child({key: 'test',
205+
serializers: {
206+
key: function () { return 'serialized' }
207+
}}).fatal({test: 'test'})
199208
})
200-
201-
console.error = consoleError
202-
203-
logger.child({key: 'test',
204-
serializers: {
205-
key: function () { return 'serialized' }
206-
}}).fatal({test: 'test'})
207-
})
209+
}
208210

209211
test('child does not overwrite parent serializers', function (t) {
210212
t.plan(2)

‎test/browser.test.js‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -136,20 +136,23 @@ absentConsoleMethodTest('info', 'log')
136136
absentConsoleMethodTest('debug', 'log')
137137
absentConsoleMethodTest('trace', 'log')
138138

139-
test('in absence of console, log methods become noops', function (t) {
140-
var console = global.console
141-
delete global.console
142-
var instance = fresh('../browser', require)()
143-
global.console = console
144-
t.is(fnName(instance.log), 'noop')
145-
t.is(fnName(instance.fatal), 'noop')
146-
t.is(fnName(instance.error), 'noop')
147-
t.is(fnName(instance.warn), 'noop')
148-
t.is(fnName(instance.info), 'noop')
149-
t.is(fnName(instance.debug), 'noop')
150-
t.is(fnName(instance.trace), 'noop')
151-
t.end()
152-
})
139+
// do not run this with airtap
140+
if (process.title !== 'browser') {
141+
test('in absence of console, log methods become noops', function (t) {
142+
var console = global.console
143+
delete global.console
144+
var instance = fresh('../browser', require)()
145+
global.console = console
146+
t.is(fnName(instance.log), 'noop')
147+
t.is(fnName(instance.fatal), 'noop')
148+
t.is(fnName(instance.error), 'noop')
149+
t.is(fnName(instance.warn), 'noop')
150+
t.is(fnName(instance.info), 'noop')
151+
t.is(fnName(instance.debug), 'noop')
152+
t.is(fnName(instance.trace), 'noop')
153+
t.end()
154+
})
155+
}
153156

154157
test('opts.browser.asObject logs pino-like object to console', function (t) {
155158
t.plan(3)

0 commit comments

Comments
 (0)