Skip to content

Commit 4e92ac9

Browse files
Phillip9587wesleytodd
Phillip9587
and
wesleytodd
authored
cleanup: remove AsyncLocalStorage check from tests (#6147)
Co-authored-by: Wes Todd <[email protected]>
1 parent 9f8589e commit 4e92ac9

7 files changed

+28
-92
lines changed

‎History.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ unreleased
22
========================
33

44
* Remove `Object.setPrototypeOf` polyfill
5+
* cleanup: remove AsyncLocalStorage check from tests
56
* cleanup: remove unnecessary require for global Buffer
67

8+
79
5.0.1 / 2024-10-08
810
==========
911

‎test/express.json.js

+4-15
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
'use strict'
22

33
var assert = require('assert')
4-
var asyncHooks = tryRequire('async_hooks')
4+
var AsyncLocalStorage = require('async_hooks').AsyncLocalStorage
5+
56
var express = require('..')
67
var request = require('supertest')
78

8-
var describeAsyncHooks = typeof asyncHooks.AsyncLocalStorage === 'function'
9-
? describe
10-
: describe.skip
11-
129
describe('express.json()', function () {
1310
it('should parse JSON', function (done) {
1411
request(createApp())
@@ -502,13 +499,13 @@ describe('express.json()', function () {
502499
})
503500
})
504501

505-
describeAsyncHooks('async local storage', function () {
502+
describe('async local storage', function () {
506503
before(function () {
507504
var app = express()
508505
var store = { foo: 'bar' }
509506

510507
app.use(function (req, res, next) {
511-
req.asyncLocalStorage = new asyncHooks.AsyncLocalStorage()
508+
req.asyncLocalStorage = new AsyncLocalStorage()
512509
req.asyncLocalStorage.run(store, next)
513510
})
514511

@@ -755,11 +752,3 @@ function shouldContainInBody (str) {
755752
'expected \'' + res.text + '\' to contain \'' + str + '\'')
756753
}
757754
}
758-
759-
function tryRequire (name) {
760-
try {
761-
return require(name)
762-
} catch (e) {
763-
return {}
764-
}
765-
}

‎test/express.raw.js

+4-15
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
'use strict'
22

33
var assert = require('assert')
4-
var asyncHooks = tryRequire('async_hooks')
4+
var AsyncLocalStorage = require('async_hooks').AsyncLocalStorage
5+
56
var express = require('..')
67
var request = require('supertest')
78

8-
var describeAsyncHooks = typeof asyncHooks.AsyncLocalStorage === 'function'
9-
? describe
10-
: describe.skip
11-
129
describe('express.raw()', function () {
1310
before(function () {
1411
this.app = createApp()
@@ -327,13 +324,13 @@ describe('express.raw()', function () {
327324
})
328325
})
329326

330-
describeAsyncHooks('async local storage', function () {
327+
describe('async local storage', function () {
331328
before(function () {
332329
var app = express()
333330
var store = { foo: 'bar' }
334331

335332
app.use(function (req, res, next) {
336-
req.asyncLocalStorage = new asyncHooks.AsyncLocalStorage()
333+
req.asyncLocalStorage = new AsyncLocalStorage()
337334
req.asyncLocalStorage.run(store, next)
338335
})
339336

@@ -513,11 +510,3 @@ function createApp (options) {
513510

514511
return app
515512
}
516-
517-
function tryRequire (name) {
518-
try {
519-
return require(name)
520-
} catch (e) {
521-
return {}
522-
}
523-
}

‎test/express.text.js

+4-15
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
'use strict'
22

33
var assert = require('assert')
4-
var asyncHooks = tryRequire('async_hooks')
4+
var AsyncLocalStorage = require('async_hooks').AsyncLocalStorage
5+
56
var express = require('..')
67
var request = require('supertest')
78

8-
var describeAsyncHooks = typeof asyncHooks.AsyncLocalStorage === 'function'
9-
? describe
10-
: describe.skip
11-
129
describe('express.text()', function () {
1310
before(function () {
1411
this.app = createApp()
@@ -360,13 +357,13 @@ describe('express.text()', function () {
360357
})
361358
})
362359

363-
describeAsyncHooks('async local storage', function () {
360+
describe('async local storage', function () {
364361
before(function () {
365362
var app = express()
366363
var store = { foo: 'bar' }
367364

368365
app.use(function (req, res, next) {
369-
req.asyncLocalStorage = new asyncHooks.AsyncLocalStorage()
366+
req.asyncLocalStorage = new AsyncLocalStorage()
370367
req.asyncLocalStorage.run(store, next)
371368
})
372369

@@ -567,11 +564,3 @@ function createApp (options) {
567564

568565
return app
569566
}
570-
571-
function tryRequire (name) {
572-
try {
573-
return require(name)
574-
} catch (e) {
575-
return {}
576-
}
577-
}

‎test/express.urlencoded.js

+4-15
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
'use strict'
22

33
var assert = require('assert')
4-
var asyncHooks = tryRequire('async_hooks')
4+
var AsyncLocalStorage = require('async_hooks').AsyncLocalStorage
5+
56
var express = require('..')
67
var request = require('supertest')
78

8-
var describeAsyncHooks = typeof asyncHooks.AsyncLocalStorage === 'function'
9-
? describe
10-
: describe.skip
11-
129
describe('express.urlencoded()', function () {
1310
before(function () {
1411
this.app = createApp()
@@ -605,13 +602,13 @@ describe('express.urlencoded()', function () {
605602
})
606603
})
607604

608-
describeAsyncHooks('async local storage', function () {
605+
describe('async local storage', function () {
609606
before(function () {
610607
var app = express()
611608
var store = { foo: 'bar' }
612609

613610
app.use(function (req, res, next) {
614-
req.asyncLocalStorage = new asyncHooks.AsyncLocalStorage()
611+
req.asyncLocalStorage = new AsyncLocalStorage()
615612
req.asyncLocalStorage.run(store, next)
616613
})
617614

@@ -828,11 +825,3 @@ function expectKeyCount (count) {
828825
assert.strictEqual(Object.keys(JSON.parse(res.text)).length, count)
829826
}
830827
}
831-
832-
function tryRequire (name) {
833-
try {
834-
return require(name)
835-
} catch (e) {
836-
return {}
837-
}
838-
}

‎test/res.download.js

+5-16
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22

33
var after = require('after');
44
var assert = require('assert')
5-
var asyncHooks = tryRequire('async_hooks')
5+
var AsyncLocalStorage = require('async_hooks').AsyncLocalStorage
6+
67
var express = require('..');
78
var path = require('path')
89
var request = require('supertest');
910
var utils = require('./support/utils')
1011

1112
var FIXTURES_PATH = path.join(__dirname, 'fixtures')
1213

13-
var describeAsyncHooks = typeof asyncHooks.AsyncLocalStorage === 'function'
14-
? describe
15-
: describe.skip
16-
1714
describe('res', function(){
1815
describe('.download(path)', function(){
1916
it('should transfer as an attachment', function(done){
@@ -90,14 +87,14 @@ describe('res', function(){
9087
.expect(200, cb);
9188
})
9289

93-
describeAsyncHooks('async local storage', function () {
90+
describe('async local storage', function () {
9491
it('should presist store', function (done) {
9592
var app = express()
9693
var cb = after(2, done)
9794
var store = { foo: 'bar' }
9895

9996
app.use(function (req, res, next) {
100-
req.asyncLocalStorage = new asyncHooks.AsyncLocalStorage()
97+
req.asyncLocalStorage = new AsyncLocalStorage()
10198
req.asyncLocalStorage.run(store, next)
10299
})
103100

@@ -124,7 +121,7 @@ describe('res', function(){
124121
var store = { foo: 'bar' }
125122

126123
app.use(function (req, res, next) {
127-
req.asyncLocalStorage = new asyncHooks.AsyncLocalStorage()
124+
req.asyncLocalStorage = new AsyncLocalStorage()
128125
req.asyncLocalStorage.run(store, next)
129126
})
130127

@@ -487,11 +484,3 @@ describe('res', function(){
487484
})
488485
})
489486
})
490-
491-
function tryRequire (name) {
492-
try {
493-
return require(name)
494-
} catch (e) {
495-
return {}
496-
}
497-
}

‎test/res.sendFile.js

+5-16
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22

33
var after = require('after');
44
var assert = require('assert')
5-
var asyncHooks = tryRequire('async_hooks')
5+
var AsyncLocalStorage = require('async_hooks').AsyncLocalStorage
6+
67
var express = require('../')
78
, request = require('supertest')
89
var onFinished = require('on-finished');
910
var path = require('path');
1011
var fixtures = path.join(__dirname, 'fixtures');
1112
var utils = require('./support/utils');
1213

13-
var describeAsyncHooks = typeof asyncHooks.AsyncLocalStorage === 'function'
14-
? describe
15-
: describe.skip
16-
1714
describe('res', function(){
1815
describe('.sendFile(path)', function () {
1916
it('should error missing path', function (done) {
@@ -266,14 +263,14 @@ describe('res', function(){
266263
.expect(200, 'got 404 error', done)
267264
})
268265

269-
describeAsyncHooks('async local storage', function () {
266+
describe('async local storage', function () {
270267
it('should presist store', function (done) {
271268
var app = express()
272269
var cb = after(2, done)
273270
var store = { foo: 'bar' }
274271

275272
app.use(function (req, res, next) {
276-
req.asyncLocalStorage = new asyncHooks.AsyncLocalStorage()
273+
req.asyncLocalStorage = new AsyncLocalStorage()
277274
req.asyncLocalStorage.run(store, next)
278275
})
279276

@@ -299,7 +296,7 @@ describe('res', function(){
299296
var store = { foo: 'bar' }
300297

301298
app.use(function (req, res, next) {
302-
req.asyncLocalStorage = new asyncHooks.AsyncLocalStorage()
299+
req.asyncLocalStorage = new AsyncLocalStorage()
303300
req.asyncLocalStorage.run(store, next)
304301
})
305302

@@ -900,11 +897,3 @@ function createApp(path, options, fn) {
900897

901898
return app;
902899
}
903-
904-
function tryRequire (name) {
905-
try {
906-
return require(name)
907-
} catch (e) {
908-
return {}
909-
}
910-
}

0 commit comments

Comments
 (0)