diff --git a/test/err.test.js b/test/err.test.js index 483633d..956cb5b 100644 --- a/test/err.test.js +++ b/test/err.test.js @@ -7,8 +7,8 @@ const wrapErrorSerializer = require('../').wrapErrorSerializer test('serializes Error objects', function (t) { t.plan(3) const serialized = serializer(Error('foo')) - t.is(serialized.type, 'Error') - t.is(serialized.message, 'foo') + t.equal(serialized.type, 'Error') + t.equal(serialized.message, 'foo') t.match(serialized.stack, /err\.test\.js:/) }) @@ -17,10 +17,10 @@ test('serializes Error objects with extra properties', function (t) { const err = Error('foo') err.statusCode = 500 const serialized = serializer(err) - t.is(serialized.type, 'Error') - t.is(serialized.message, 'foo') + t.equal(serialized.type, 'Error') + t.equal(serialized.message, 'foo') t.ok(serialized.statusCode) - t.is(serialized.statusCode, 500) + t.equal(serialized.statusCode, 500) t.match(serialized.stack, /err\.test\.js:/) }) @@ -29,7 +29,7 @@ test('serializes Error objects with subclass "type"', function (t) { class MyError extends Error {} const err = new MyError('foo') const serialized = serializer(err) - t.is(serialized.type, 'MyError') + t.equal(serialized.type, 'MyError') }) test('serializes nested errors', function (t) { @@ -37,11 +37,11 @@ test('serializes nested errors', function (t) { const err = Error('foo') err.inner = Error('bar') const serialized = serializer(err) - t.is(serialized.type, 'Error') - t.is(serialized.message, 'foo') + t.equal(serialized.type, 'Error') + t.equal(serialized.message, 'foo') t.match(serialized.stack, /err\.test\.js:/) - t.is(serialized.inner.type, 'Error') - t.is(serialized.inner.message, 'bar') + t.equal(serialized.inner.type, 'Error') + t.equal(serialized.inner.message, 'bar') t.match(serialized.inner.stack, /Error: bar/) t.match(serialized.inner.stack, /err\.test\.js:/) }) @@ -52,8 +52,8 @@ test('serializes error causes', function (t) { err.cause = Error('bar') err.cause.cause = Error('abc') const serialized = serializer(err) - t.is(serialized.type, 'Error') - t.is(serialized.message, 'foo: bar: abc') + t.equal(serialized.type, 'Error') + t.equal(serialized.message, 'foo: bar: abc') t.match(serialized.stack, /err\.test\.js:/) t.match(serialized.stack, /Error: foo/) t.match(serialized.stack, /Error: bar/) @@ -70,8 +70,8 @@ test('serializes error causes with VError support', function (t) { return err } const serialized = serializer(err) - t.is(serialized.type, 'Error') - t.is(serialized.message, 'foo: bar: abc') + t.equal(serialized.type, 'Error') + t.equal(serialized.message, 'foo: bar: abc') t.match(serialized.stack, /err\.test\.js:/) t.match(serialized.stack, /Error: foo/) t.match(serialized.stack, /Error: bar/) @@ -83,8 +83,8 @@ test('prevents infinite recursion', function (t) { const err = Error('foo') err.inner = err const serialized = serializer(err) - t.is(serialized.type, 'Error') - t.is(serialized.message, 'foo') + t.equal(serialized.type, 'Error') + t.equal(serialized.message, 'foo') t.match(serialized.stack, /err\.test\.js:/) t.notOk(serialized.inner) }) @@ -99,12 +99,12 @@ test('cleans up infinite recursion tracking', function (t) { serializer(err) const serialized = serializer(err) - t.is(serialized.type, 'Error') - t.is(serialized.message, 'foo') + t.equal(serialized.type, 'Error') + t.equal(serialized.message, 'foo') t.match(serialized.stack, /err\.test\.js:/) t.ok(serialized.inner) - t.is(serialized.inner.type, 'Error') - t.is(serialized.inner.message, 'bar') + t.equal(serialized.inner.type, 'Error') + t.equal(serialized.inner.message, 'bar') t.match(serialized.inner.stack, /Error: bar/) t.notOk(serialized.inner.inner) }) @@ -120,8 +120,8 @@ test('redefined err.constructor doesnt crash serializer', function (t) { t.plan(10) function check (a, name) { - t.is(a.type, name) - t.is(a.message, 'foo') + t.equal(a.type, name) + t.equal(a.message, 'foo') } const err1 = TypeError('foo') @@ -153,7 +153,7 @@ test('pass through anything that is not an Error', function (t) { t.plan(3) function check (a) { - t.is(serializer(a), a) + t.equal(serializer(a), a) } check('foo') @@ -171,11 +171,11 @@ test('can wrap err serializers', function (t) { return err }) const serialized = serializer(err) - t.is(serialized.type, 'Error') - t.is(serialized.message, 'foo') + t.equal(serialized.type, 'Error') + t.equal(serialized.message, 'foo') t.match(serialized.stack, /err\.test\.js:/) t.notOk(serialized.foo) - t.is(serialized.bar, 'bar') + t.equal(serialized.bar, 'bar') }) test('serializes aggregate errors', { skip: !global.AggregateError }, function (t) { diff --git a/test/req.test.js b/test/req.test.js index bd97cd3..4ac9a58 100644 --- a/test/req.test.js +++ b/test/req.test.js @@ -14,7 +14,7 @@ test('maps request', function (t) { http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { const serialized = serializers.mapHttpRequest(req) @@ -34,11 +34,11 @@ test('does not return excessively long object', function (t) { http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { const serialized = serializers.reqSerializer(req) - t.is(Object.keys(serialized).length, 6) + t.equal(Object.keys(serialized).length, 6) res.end() } }) @@ -52,13 +52,13 @@ test('req.raw is available', function (t) { http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { req.foo = 'foo' const serialized = serializers.reqSerializer(req) t.ok(serialized.raw) - t.is(serialized.raw.foo, 'foo') + t.equal(serialized.raw.foo, 'foo') res.end() } }) @@ -72,13 +72,13 @@ test('req.raw will be obtained in from input request raw property if input reque http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { req.raw = { req: { foo: 'foo' }, res: {} } const serialized = serializers.reqSerializer(req) t.ok(serialized.raw) - t.is(serialized.raw.req.foo, 'foo') + t.equal(serialized.raw.req.foo, 'foo') res.end() } }) @@ -92,11 +92,11 @@ test('req.id defaults to undefined', function (t) { http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { const serialized = serializers.reqSerializer(req) - t.is(serialized.id, undefined) + t.equal(serialized.id, undefined) res.end() } }) @@ -110,11 +110,11 @@ test('req.id has a non-function value', function (t) { http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { const serialized = serializers.reqSerializer(req) - t.is(typeof serialized.id === 'function', false) + t.equal(typeof serialized.id === 'function', false) res.end() } }) @@ -128,12 +128,12 @@ test('req.id will be obtained from input request info.id when input request id d http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { req.info = { id: 'test' } const serialized = serializers.reqSerializer(req) - t.is(serialized.id, 'test') + t.equal(serialized.id, 'test') res.end() } }) @@ -147,13 +147,13 @@ test('req.id has a non-function value with custom id function', function (t) { http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { req.id = function () { return 42 } const serialized = serializers.reqSerializer(req) - t.is(typeof serialized.id === 'function', false) - t.is(serialized.id, 42) + t.equal(typeof serialized.id === 'function', false) + t.equal(serialized.id, 42) res.end() } }) @@ -167,12 +167,12 @@ test('req.url will be obtained from input request req.path when input request ur http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { req.path = '/test' const serialized = serializers.reqSerializer(req) - t.is(serialized.url, '/test') + t.equal(serialized.url, '/test') res.end() } }) @@ -186,12 +186,12 @@ test('req.url will be obtained from input request url.path when input request ur http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { req.url = { path: '/test' } const serialized = serializers.reqSerializer(req) - t.is(serialized.url, '/test') + t.equal(serialized.url, '/test') res.end() } }) @@ -205,12 +205,12 @@ test('req.url will be obtained from input request url when input request url is http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { req.url = '/test' const serialized = serializers.reqSerializer(req) - t.is(serialized.url, '/test') + t.equal(serialized.url, '/test') res.end() } }) @@ -224,11 +224,11 @@ test('req.url will be empty when input request path and url are not defined', fu http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { const serialized = serializers.reqSerializer(req) - t.is(serialized.url, '/') + t.equal(serialized.url, '/') res.end() } }) @@ -242,12 +242,12 @@ test('req.url will be obtained from input request originalUrl when available', f http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { req.originalUrl = '/test' const serialized = serializers.reqSerializer(req) - t.is(serialized.url, '/test') + t.equal(serialized.url, '/test') res.end() } }) @@ -261,11 +261,11 @@ test('can wrap request serializers', function (t) { http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) const serailizer = wrapRequestSerializer(function (req) { t.ok(req.method) - t.is(req.method, 'GET') + t.equal(req.method, 'GET') delete req.method return req }) @@ -286,12 +286,12 @@ test('req.remoteAddress will be obtained from request socket.remoteAddress as fa http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { req.socket = { remoteAddress: 'http://localhost' } const serialized = serializers.reqSerializer(req) - t.is(serialized.remoteAddress, 'http://localhost') + t.equal(serialized.remoteAddress, 'http://localhost') res.end() } }) @@ -305,12 +305,12 @@ test('req.remoteAddress will be obtained from request info.remoteAddress if avai http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { req.info = { remoteAddress: 'http://localhost' } const serialized = serializers.reqSerializer(req) - t.is(serialized.remoteAddress, 'http://localhost') + t.equal(serialized.remoteAddress, 'http://localhost') res.end() } }) @@ -324,12 +324,12 @@ test('req.remotePort will be obtained from request socket.remotePort as fallback http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { req.socket = { remotePort: 3000 } const serialized = serializers.reqSerializer(req) - t.is(serialized.remotePort, 3000) + t.equal(serialized.remotePort, 3000) res.end() } }) @@ -343,12 +343,12 @@ test('req.remotePort will be obtained from request info.remotePort if available' http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { req.info = { remotePort: 3000 } const serialized = serializers.reqSerializer(req) - t.is(serialized.remotePort, 3000) + t.equal(serialized.remotePort, 3000) res.end() } }) @@ -362,13 +362,13 @@ test('req.query is available', function (t) { http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { req.originalUrl = '/test' req.query = '/foo?bar=foobar&bar=foo' const serialized = serializers.reqSerializer(req) - t.is(serialized.query, '/foo?bar=foobar&bar=foo') + t.equal(serialized.query, '/foo?bar=foobar&bar=foo') res.end() } }) @@ -382,13 +382,13 @@ test('req.params is available', function (t) { http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { req.originalUrl = '/test' req.params = '/foo/bar' const serialized = serializers.reqSerializer(req) - t.is(serialized.params, '/foo/bar') + t.equal(serialized.params, '/foo/bar') res.end() } }) diff --git a/test/res.test.js b/test/res.test.js index a5ce6c9..c9bea24 100644 --- a/test/res.test.js +++ b/test/res.test.js @@ -16,11 +16,11 @@ test('res.raw is not enumerable', function (t) { http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { const serialized = serializers.resSerializer(res) - t.is(serialized.propertyIsEnumerable('raw'), false) + t.equal(serialized.propertyIsEnumerable('raw'), false) res.end() } }) @@ -34,13 +34,13 @@ test('res.raw is available', function (t) { http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { res.statusCode = 200 const serialized = serializers.resSerializer(res) t.ok(serialized.raw) - t.is(serialized.raw.statusCode, 200) + t.equal(serialized.raw.statusCode, 200) res.end() } }) @@ -54,11 +54,11 @@ test('can wrap response serializers', function (t) { http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) const serializer = wrapResponseSerializer(function (res) { t.ok(res.statusCode) - t.is(res.statusCode, 200) + t.equal(res.statusCode, 200) delete res.statusCode return res }) @@ -80,12 +80,12 @@ test('res.headers is serialized', function (t) { http.get(server.address(), () => {}) }) - t.tearDown(() => server.close()) + t.teardown(() => server.close()) function handler (req, res) { res.setHeader('x-custom', 'y') const serialized = serializers.resSerializer(res) - t.is(serialized.headers['x-custom'], 'y') + t.equal(serialized.headers['x-custom'], 'y') res.end() } })