Skip to content

Commit 3cb380b

Browse files
dougwilsondougwilson
committedSep 8, 2017
tests: store server on mocha context instead of variable shadowing
·
v2.2.01.18.0
1 parent 29c8cd0 commit 3cb380b

File tree

5 files changed

+122
-144
lines changed

5 files changed

+122
-144
lines changed
 

‎test/body-parser.js

+9-13
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,26 @@ var request = require('supertest')
66
var bodyParser = require('..')
77

88
describe('bodyParser()', function () {
9-
var server
109
before(function () {
11-
server = createServer()
10+
this.server = createServer()
1211
})
1312

1413
it('should default to {}', function (done) {
15-
request(server)
14+
request(this.server)
1615
.post('/')
1716
.expect(200, '{}', done)
1817
})
1918

2019
it('should parse JSON', function (done) {
21-
request(server)
20+
request(this.server)
2221
.post('/')
2322
.set('Content-Type', 'application/json')
2423
.send('{"user":"tobi"}')
2524
.expect(200, '{"user":"tobi"}', done)
2625
})
2726

2827
it('should parse x-www-form-urlencoded', function (done) {
29-
request(server)
28+
request(this.server)
3029
.post('/')
3130
.set('Content-Type', 'application/x-www-form-urlencoded')
3231
.send('user=tobi')
@@ -53,12 +52,10 @@ describe('bodyParser()', function () {
5352
})
5453

5554
describe('http methods', function () {
56-
var server
57-
5855
before(function () {
5956
var _bodyParser = bodyParser()
6057

61-
server = http.createServer(function (req, res) {
58+
this.server = http.createServer(function (req, res) {
6259
_bodyParser(req, res, function (err) {
6360
if (err) {
6461
res.statusCode = 500
@@ -81,7 +78,7 @@ describe('bodyParser()', function () {
8178
}
8279

8380
it('should support ' + method.toUpperCase() + ' requests', function (done) {
84-
request(server)[method]('/')
81+
request(this.server)[method]('/')
8582
.set('Content-Type', 'application/json')
8683
.send('{"user":"tobi"}')
8784
.expect(201, done)
@@ -90,21 +87,20 @@ describe('bodyParser()', function () {
9087
})
9188

9289
describe('with type option', function () {
93-
var server
9490
before(function () {
95-
server = createServer({ limit: '1mb', type: 'application/octet-stream' })
91+
this.server = createServer({ limit: '1mb', type: 'application/octet-stream' })
9692
})
9793

9894
it('should parse JSON', function (done) {
99-
request(server)
95+
request(this.server)
10096
.post('/')
10197
.set('Content-Type', 'application/json')
10298
.send('{"user":"tobi"}')
10399
.expect(200, '{"user":"tobi"}', done)
104100
})
105101

106102
it('should parse x-www-form-urlencoded', function (done) {
107-
request(server)
103+
request(this.server)
108104
.post('/')
109105
.set('Content-Type', 'application/x-www-form-urlencoded')
110106
.send('user=tobi')

‎test/json.js

+36-34
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,12 @@ describe('bodyParser.json()', function () {
8686
})
8787

8888
describe('when strict is false', function () {
89+
before(function () {
90+
this.server = createServer({ strict: false })
91+
})
92+
8993
it('should parse primitives', function (done) {
90-
request(createServer({ strict: false }))
94+
request(this.server)
9195
.post('/')
9296
.set('Content-Type', 'application/json')
9397
.send('true')
@@ -96,29 +100,28 @@ describe('bodyParser.json()', function () {
96100
})
97101

98102
describe('when strict is true', function () {
99-
var server
100103
before(function () {
101-
server = createServer({ strict: true })
104+
this.server = createServer({ strict: true })
102105
})
103106

104107
it('should not parse primitives', function (done) {
105-
request(server)
108+
request(this.server)
106109
.post('/')
107110
.set('Content-Type', 'application/json')
108111
.send('true')
109112
.expect(400, parseError('#rue').replace('#', 't'), done)
110113
})
111114

112115
it('should not parse primitives with leading whitespaces', function (done) {
113-
request(server)
116+
request(this.server)
114117
.post('/')
115118
.set('Content-Type', 'application/json')
116119
.send(' true')
117120
.expect(400, parseError(' #rue').replace('#', 't'), done)
118121
})
119122

120123
it('should allow leading whitespaces in JSON', function (done) {
121-
request(server)
124+
request(this.server)
122125
.post('/')
123126
.set('Content-Type', 'application/json')
124127
.send(' { "user": "tobi" }')
@@ -127,8 +130,12 @@ describe('bodyParser.json()', function () {
127130
})
128131

129132
describe('by default', function () {
133+
before(function () {
134+
this.server = createServer()
135+
})
136+
130137
it('should 400 on primitives', function (done) {
131-
request(createServer())
138+
request(this.server)
132139
.post('/')
133140
.set('Content-Type', 'application/json')
134141
.send('true')
@@ -195,13 +202,12 @@ describe('bodyParser.json()', function () {
195202

196203
describe('with inflate option', function () {
197204
describe('when false', function () {
198-
var server
199205
before(function () {
200-
server = createServer({ inflate: false })
206+
this.server = createServer({ inflate: false })
201207
})
202208

203209
it('should not accept content-encoding', function (done) {
204-
var test = request(server).post('/')
210+
var test = request(this.server).post('/')
205211
test.set('Content-Encoding', 'gzip')
206212
test.set('Content-Type', 'application/json')
207213
test.write(Buffer.from('1f8b080000000000000bab56ca4bcc4d55b2527ab16e97522d00515be1cc0e000000', 'hex'))
@@ -210,13 +216,12 @@ describe('bodyParser.json()', function () {
210216
})
211217

212218
describe('when true', function () {
213-
var server
214219
before(function () {
215-
server = createServer({ inflate: true })
220+
this.server = createServer({ inflate: true })
216221
})
217222

218223
it('should accept content-encoding', function (done) {
219-
var test = request(server).post('/')
224+
var test = request(this.server).post('/')
220225
test.set('Content-Encoding', 'gzip')
221226
test.set('Content-Type', 'application/json')
222227
test.write(Buffer.from('1f8b080000000000000bab56ca4bcc4d55b2527ab16e97522d00515be1cc0e000000', 'hex'))
@@ -227,21 +232,20 @@ describe('bodyParser.json()', function () {
227232

228233
describe('with type option', function () {
229234
describe('when "application/vnd.api+json"', function () {
230-
var server
231235
before(function () {
232-
server = createServer({ type: 'application/vnd.api+json' })
236+
this.server = createServer({ type: 'application/vnd.api+json' })
233237
})
234238

235239
it('should parse JSON for custom type', function (done) {
236-
request(server)
240+
request(this.server)
237241
.post('/')
238242
.set('Content-Type', 'application/vnd.api+json')
239243
.send('{"user":"tobi"}')
240244
.expect(200, '{"user":"tobi"}', done)
241245
})
242246

243247
it('should ignore standard type', function (done) {
244-
request(server)
248+
request(this.server)
245249
.post('/')
246250
.set('Content-Type', 'application/json')
247251
.send('{"user":"tobi"}')
@@ -359,103 +363,101 @@ describe('bodyParser.json()', function () {
359363
})
360364

361365
describe('charset', function () {
362-
var server
363366
before(function () {
364-
server = createServer()
367+
this.server = createServer()
365368
})
366369

367370
it('should parse utf-8', function (done) {
368-
var test = request(server).post('/')
371+
var test = request(this.server).post('/')
369372
test.set('Content-Type', 'application/json; charset=utf-8')
370373
test.write(Buffer.from('7b226e616d65223a22e8aeba227d', 'hex'))
371374
test.expect(200, '{"name":"论"}', done)
372375
})
373376

374377
it('should parse utf-16', function (done) {
375-
var test = request(server).post('/')
378+
var test = request(this.server).post('/')
376379
test.set('Content-Type', 'application/json; charset=utf-16')
377380
test.write(Buffer.from('feff007b0022006e0061006d00650022003a00228bba0022007d', 'hex'))
378381
test.expect(200, '{"name":"论"}', done)
379382
})
380383

381384
it('should parse when content-length != char length', function (done) {
382-
var test = request(server).post('/')
385+
var test = request(this.server).post('/')
383386
test.set('Content-Type', 'application/json; charset=utf-8')
384387
test.set('Content-Length', '13')
385388
test.write(Buffer.from('7b2274657374223a22c3a5227d', 'hex'))
386389
test.expect(200, '{"test":"å"}', done)
387390
})
388391

389392
it('should default to utf-8', function (done) {
390-
var test = request(server).post('/')
393+
var test = request(this.server).post('/')
391394
test.set('Content-Type', 'application/json')
392395
test.write(Buffer.from('7b226e616d65223a22e8aeba227d', 'hex'))
393396
test.expect(200, '{"name":"论"}', done)
394397
})
395398

396399
it('should fail on unknown charset', function (done) {
397-
var test = request(server).post('/')
400+
var test = request(this.server).post('/')
398401
test.set('Content-Type', 'application/json; charset=koi8-r')
399402
test.write(Buffer.from('7b226e616d65223a22cec5d4227d', 'hex'))
400403
test.expect(415, 'unsupported charset "KOI8-R"', done)
401404
})
402405
})
403406

404407
describe('encoding', function () {
405-
var server
406408
before(function () {
407-
server = createServer({ limit: '1kb' })
409+
this.server = createServer({ limit: '1kb' })
408410
})
409411

410412
it('should parse without encoding', function (done) {
411-
var test = request(server).post('/')
413+
var test = request(this.server).post('/')
412414
test.set('Content-Type', 'application/json')
413415
test.write(Buffer.from('7b226e616d65223a22e8aeba227d', 'hex'))
414416
test.expect(200, '{"name":"论"}', done)
415417
})
416418

417419
it('should support identity encoding', function (done) {
418-
var test = request(server).post('/')
420+
var test = request(this.server).post('/')
419421
test.set('Content-Encoding', 'identity')
420422
test.set('Content-Type', 'application/json')
421423
test.write(Buffer.from('7b226e616d65223a22e8aeba227d', 'hex'))
422424
test.expect(200, '{"name":"论"}', done)
423425
})
424426

425427
it('should support gzip encoding', function (done) {
426-
var test = request(server).post('/')
428+
var test = request(this.server).post('/')
427429
test.set('Content-Encoding', 'gzip')
428430
test.set('Content-Type', 'application/json')
429431
test.write(Buffer.from('1f8b080000000000000bab56ca4bcc4d55b2527ab16e97522d00515be1cc0e000000', 'hex'))
430432
test.expect(200, '{"name":"论"}', done)
431433
})
432434

433435
it('should support deflate encoding', function (done) {
434-
var test = request(server).post('/')
436+
var test = request(this.server).post('/')
435437
test.set('Content-Encoding', 'deflate')
436438
test.set('Content-Type', 'application/json')
437439
test.write(Buffer.from('789cab56ca4bcc4d55b2527ab16e97522d00274505ac', 'hex'))
438440
test.expect(200, '{"name":"论"}', done)
439441
})
440442

441443
it('should be case-insensitive', function (done) {
442-
var test = request(server).post('/')
444+
var test = request(this.server).post('/')
443445
test.set('Content-Encoding', 'GZIP')
444446
test.set('Content-Type', 'application/json')
445447
test.write(Buffer.from('1f8b080000000000000bab56ca4bcc4d55b2527ab16e97522d00515be1cc0e000000', 'hex'))
446448
test.expect(200, '{"name":"论"}', done)
447449
})
448450

449451
it('should 415 on unknown encoding', function (done) {
450-
var test = request(server).post('/')
452+
var test = request(this.server).post('/')
451453
test.set('Content-Encoding', 'nulls')
452454
test.set('Content-Type', 'application/json')
453455
test.write(Buffer.from('000000000000', 'hex'))
454456
test.expect(415, 'unsupported content encoding "nulls"', done)
455457
})
456458

457459
it('should 400 on malformed encoding', function (done) {
458-
var test = request(server).post('/')
460+
var test = request(this.server).post('/')
459461
test.set('Content-Encoding', 'gzip')
460462
test.set('Content-Type', 'application/json')
461463
test.write(Buffer.from('1f8b080000000000000bab56cc4d55b2527ab16e97522d00515be1cc0e000000', 'hex'))
@@ -464,7 +466,7 @@ describe('bodyParser.json()', function () {
464466

465467
it('should 413 when inflated value exceeds limit', function (done) {
466468
// gzip'd data exceeds 1kb, but deflated below 1kb
467-
var test = request(server).post('/')
469+
var test = request(this.server).post('/')
468470
test.set('Content-Encoding', 'gzip')
469471
test.set('Content-Type', 'application/json')
470472
test.write(Buffer.from('1f8b080000000000000bedc1010d000000c2a0f74f6d0f071400000000000000', 'hex'))

0 commit comments

Comments
 (0)
Please sign in to comment.