Skip to content

Commit 80fbb76

Browse files
authored
test: remove AsyncLocalStorage check (#549)
1 parent 51e90e7 commit 80fbb76

File tree

4 files changed

+12
-60
lines changed

4 files changed

+12
-60
lines changed

test/json.js

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
'use strict'
22

33
var assert = require('assert')
4-
var asyncHooks = tryRequire('async_hooks')
4+
var AsyncLocalStorage = require('async_hooks').AsyncLocalStorage
55
var http = require('http')
66
var request = require('supertest')
77

88
var bodyParser = require('..')
99

10-
var describeAsyncHooks = typeof asyncHooks.AsyncLocalStorage === 'function'
11-
? describe
12-
: describe.skip
13-
1410
describe('bodyParser.json()', function () {
1511
it('should parse JSON', function (done) {
1612
request(createServer())
@@ -511,13 +507,13 @@ describe('bodyParser.json()', function () {
511507
})
512508
})
513509

514-
describeAsyncHooks('async local storage', function () {
510+
describe('async local storage', function () {
515511
before(function () {
516512
var jsonParser = bodyParser.json()
517513
var store = { foo: 'bar' }
518514

519515
this.server = createServer(function (req, res, next) {
520-
var asyncLocalStorage = new asyncHooks.AsyncLocalStorage()
516+
var asyncLocalStorage = new AsyncLocalStorage()
521517

522518
asyncLocalStorage.run(store, function () {
523519
jsonParser(req, res, function (err) {
@@ -761,11 +757,3 @@ function shouldContainInBody (str) {
761757
'expected \'' + res.text + '\' to contain \'' + str + '\'')
762758
}
763759
}
764-
765-
function tryRequire (name) {
766-
try {
767-
return require(name)
768-
} catch (e) {
769-
return {}
770-
}
771-
}

test/raw.js

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
'use strict'
22

33
var assert = require('assert')
4-
var asyncHooks = tryRequire('async_hooks')
4+
var AsyncLocalStorage = require('async_hooks').AsyncLocalStorage
55
var http = require('http')
66
var request = require('supertest')
77

88
var bodyParser = require('..')
99

10-
var describeAsyncHooks = typeof asyncHooks.AsyncLocalStorage === 'function'
11-
? describe
12-
: describe.skip
13-
1410
describe('bodyParser.raw()', function () {
1511
before(function () {
1612
this.server = createServer()
@@ -329,13 +325,13 @@ describe('bodyParser.raw()', function () {
329325
})
330326
})
331327

332-
describeAsyncHooks('async local storage', function () {
328+
describe('async local storage', function () {
333329
before(function () {
334330
var rawParser = bodyParser.raw()
335331
var store = { foo: 'bar' }
336332

337333
this.server = createServer(function (req, res, next) {
338-
var asyncLocalStorage = new asyncHooks.AsyncLocalStorage()
334+
var asyncLocalStorage = new AsyncLocalStorage()
339335

340336
asyncLocalStorage.run(store, function () {
341337
rawParser(req, res, function (err) {
@@ -502,11 +498,3 @@ function createServer (opts) {
502498
})
503499
})
504500
}
505-
506-
function tryRequire (name) {
507-
try {
508-
return require(name)
509-
} catch (e) {
510-
return {}
511-
}
512-
}

test/text.js

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
'use strict'
22

33
var assert = require('assert')
4-
var asyncHooks = tryRequire('async_hooks')
4+
var AsyncLocalStorage = require('async_hooks').AsyncLocalStorage
55
var http = require('http')
66
var request = require('supertest')
77

88
var bodyParser = require('..')
99

10-
var describeAsyncHooks = typeof asyncHooks.AsyncLocalStorage === 'function'
11-
? describe
12-
: describe.skip
13-
1410
describe('bodyParser.text()', function () {
1511
before(function () {
1612
this.server = createServer()
@@ -370,13 +366,13 @@ describe('bodyParser.text()', function () {
370366
})
371367
})
372368

373-
describeAsyncHooks('async local storage', function () {
369+
describe('async local storage', function () {
374370
before(function () {
375371
var textParser = bodyParser.text()
376372
var store = { foo: 'bar' }
377373

378374
this.server = createServer(function (req, res, next) {
379-
var asyncLocalStorage = new asyncHooks.AsyncLocalStorage()
375+
var asyncLocalStorage = new AsyncLocalStorage()
380376

381377
asyncLocalStorage.run(store, function () {
382378
textParser(req, res, function (err) {
@@ -565,11 +561,3 @@ function createServer (opts) {
565561
})
566562
})
567563
}
568-
569-
function tryRequire (name) {
570-
try {
571-
return require(name)
572-
} catch (e) {
573-
return {}
574-
}
575-
}

test/urlencoded.js

+3-15
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
'use strict'
22

33
var assert = require('assert')
4-
var asyncHooks = tryRequire('async_hooks')
4+
var AsyncLocalStorage = require('async_hooks').AsyncLocalStorage
55
var http = require('http')
66
var request = require('supertest')
77

88
var bodyParser = require('..')
99

10-
var describeAsyncHooks = typeof asyncHooks.AsyncLocalStorage === 'function'
11-
? describe
12-
: describe.skip
13-
1410
describe('bodyParser.urlencoded()', function () {
1511
before(function () {
1612
this.server = createServer()
@@ -755,13 +751,13 @@ describe('bodyParser.urlencoded()', function () {
755751
})
756752
})
757753

758-
describeAsyncHooks('async local storage', function () {
754+
describe('async local storage', function () {
759755
before(function () {
760756
var urlencodedParser = bodyParser.urlencoded()
761757
var store = { foo: 'bar' }
762758

763759
this.server = createServer(function (req, res, next) {
764-
var asyncLocalStorage = new asyncHooks.AsyncLocalStorage()
760+
var asyncLocalStorage = new AsyncLocalStorage()
765761

766762
asyncLocalStorage.run(store, function () {
767763
urlencodedParser(req, res, function (err) {
@@ -968,11 +964,3 @@ function expectKeyCount (count) {
968964
assert.strictEqual(Object.keys(JSON.parse(res.text)).length, count)
969965
}
970966
}
971-
972-
function tryRequire (name) {
973-
try {
974-
return require(name)
975-
} catch (e) {
976-
return {}
977-
}
978-
}

0 commit comments

Comments
 (0)