fastify 5.3.3 → 5.5.0

package/test/custom-parser.5.test.js

@@ -1,42 +1,35 @@
 'use strict'
 
 const { test } = require('node:test')
-const sget = require('simple-get').concat
 const Fastify = require('../fastify')
 const jsonParser = require('fast-json-body')
-const { getServerUrl, plainTextParser } = require('./helper')
+const { plainTextParser } = require('./helper')
 
 process.removeAllListeners('warning')
 
-test('cannot remove all content type parsers after binding', (t, done) => {
-  t.plan(2)
+test('cannot remove all content type parsers after binding', async (t) => {
+  t.plan(1)
 
   const fastify = Fastify()
 
-  fastify.listen({ port: 0 }, function (err) {
-    t.assert.ifError(err)
-    t.assert.throws(() => fastify.removeAllContentTypeParsers())
-    fastify.close()
-    done()
-  })
+  t.after(() => fastify.close())
+
+  await fastify.listen({ port: 0 })
+  t.assert.throws(() => fastify.removeAllContentTypeParsers())
 })
 
-test('cannot remove content type parsers after binding', (t, done) => {
-  t.plan(2)
+test('cannot remove content type parsers after binding', async (t) => {
+  t.plan(1)
 
   const fastify = Fastify()
-
   t.after(() => fastify.close())
 
-  fastify.listen({ port: 0 }, function (err) {
-    t.assert.ifError(err)
-    t.assert.throws(() => fastify.removeContentTypeParser('application/json'))
-    done()
-  })
+  await fastify.listen({ port: 0 })
+  t.assert.throws(() => fastify.removeContentTypeParser('application/json'))
 })
 
-test('should be able to override the default json parser after removeAllContentTypeParsers', (t, done) => {
-  t.plan(5)
+test('should be able to override the default json parser after removeAllContentTypeParsers', async (t) => {
+  t.plan(4)
 
   const fastify = Fastify()
 
@@ -53,28 +46,24 @@ test('should be able to override the default json parser after removeAllContentT
     })
   })
 
-  fastify.listen({ port: 0 }, err => {
-    t.assert.ifError(err)
-
-    sget({
-      method: 'POST',
-      url: getServerUrl(fastify),
-      body: '{"hello":"world"}',
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    }, (err, response, body) => {
-      t.assert.ifError(err)
-      t.assert.strictEqual(response.statusCode, 200)
-      t.assert.deepStrictEqual(body.toString(), JSON.stringify({ hello: 'world' }))
-      fastify.close()
-      done()
-    })
+  const fastifyServer = await fastify.listen({ port: 0 })
+
+  const result = await fetch(fastifyServer, {
+    method: 'POST',
+    body: JSON.stringify({ hello: 'world' }),
+    headers: {
+      'Content-Type': 'application/json'
+    }
   })
+
+  t.assert.ok(result.ok)
+  t.assert.strictEqual(result.status, 200)
+  t.assert.deepStrictEqual(await result.text(), JSON.stringify({ hello: 'world' }))
+  await fastify.close()
 })
 
-test('should be able to override the default plain text parser after removeAllContentTypeParsers', (t, done) => {
-  t.plan(5)
+test('should be able to override the default plain text parser after removeAllContentTypeParsers', async (t) => {
+  t.plan(4)
 
   const fastify = Fastify()
 
@@ -91,28 +80,24 @@ test('should be able to override the default plain text parser after removeAllCo
     })
   })
 
-  fastify.listen({ port: 0 }, err => {
-    t.assert.ifError(err)
-
-    sget({
-      method: 'POST',
-      url: getServerUrl(fastify),
-      body: 'hello world',
-      headers: {
-        'Content-Type': 'text/plain'
-      }
-    }, (err, response, body) => {
-      t.assert.ifError(err)
-      t.assert.strictEqual(response.statusCode, 200)
-      t.assert.strictEqual(body.toString(), 'hello world')
-      fastify.close()
-      done()
-    })
+  const fastifyServer = await fastify.listen({ port: 0 })
+
+  const result = await fetch(fastifyServer, {
+    method: 'POST',
+    body: 'hello world',
+    headers: {
+      'Content-Type': 'text/plain'
+    }
   })
+
+  t.assert.ok(result.ok)
+  t.assert.strictEqual(result.status, 200)
+  t.assert.strictEqual(await result.text(), 'hello world')
+  await fastify.close()
 })
 
-test('should be able to add a custom content type parser after removeAllContentTypeParsers', (t, done) => {
-  t.plan(5)
+test('should be able to add a custom content type parser after removeAllContentTypeParsers', async (t) => {
+  t.plan(4)
 
   const fastify = Fastify()
 
@@ -128,22 +113,18 @@ test('should be able to add a custom content type parser after removeAllContentT
     })
   })
 
-  fastify.listen({ port: 0 }, err => {
-    t.assert.ifError(err)
-
-    sget({
-      method: 'POST',
-      url: getServerUrl(fastify),
-      body: '{"hello":"world"}',
-      headers: {
-        'Content-Type': 'application/jsoff'
-      }
-    }, (err, response, body) => {
-      t.assert.ifError(err)
-      t.assert.strictEqual(response.statusCode, 200)
-      t.assert.deepStrictEqual(body.toString(), JSON.stringify({ hello: 'world' }))
-      fastify.close()
-      done()
-    })
+  const fastifyServer = await fastify.listen({ port: 0 })
+
+  const result = await fetch(fastifyServer, {
+    method: 'POST',
+    body: JSON.stringify({ hello: 'world' }),
+    headers: {
+      'Content-Type': 'application/jsoff'
+    }
   })
+
+  t.assert.ok(result.ok)
+  t.assert.strictEqual(result.status, 200)
+  t.assert.deepStrictEqual(await result.text(), JSON.stringify({ hello: 'world' }))
+  await fastify.close()
 })

package/test/custom-querystring-parser.test.js

@@ -2,12 +2,10 @@
 
 const { test } = require('node:test')
 const querystring = require('node:querystring')
-const sget = require('simple-get').concat
 const Fastify = require('..')
-const { waitForCb } = require('./toolkit')
 
-test('Custom querystring parser', t => {
-  t.plan(9)
+test('Custom querystring parser', async t => {
+  t.plan(7)
 
   const fastify = Fastify({
     querystringParser: function (str) {
@@ -24,36 +22,22 @@ test('Custom querystring parser', t => {
     reply.send({ hello: 'world' })
   })
 
-  const completion = waitForCb({ steps: 2 })
+  const fastifyServer = await fastify.listen({ port: 0 })
+  t.after(() => fastify.close())
 
-  fastify.listen({ port: 0 }, (err, address) => {
-    t.assert.ifError(err)
-    t.after(() => fastify.close())
+  const result = await fetch(`${fastifyServer}?foo=bar&baz=faz`)
+  t.assert.ok(result.ok)
+  t.assert.strictEqual(result.status, 200)
 
-    sget({
-      method: 'GET',
-      url: `${address}?foo=bar&baz=faz`
-    }, (err, response, body) => {
-      t.assert.ifError(err)
-      t.assert.strictEqual(response.statusCode, 200)
-      completion.stepIn()
-    })
-
-    fastify.inject({
-      method: 'GET',
-      url: `${address}?foo=bar&baz=faz`
-    }, (err, response, body) => {
-      t.assert.ifError(err)
-      t.assert.strictEqual(response.statusCode, 200)
-      completion.stepIn()
-    })
+  const injectResponse = await fastify.inject({
+    method: 'GET',
+    url: `${fastifyServer}?foo=bar&baz=faz`
   })
-
-  return completion.patience
+  t.assert.strictEqual(injectResponse.statusCode, 200)
 })
 
-test('Custom querystring parser should be called also if there is nothing to parse', t => {
-  t.plan(9)
+test('Custom querystring parser should be called also if there is nothing to parse', async t => {
+  t.plan(7)
 
   const fastify = Fastify({
     querystringParser: function (str) {
@@ -67,36 +51,22 @@ test('Custom querystring parser should be called also if there is nothing to par
     reply.send({ hello: 'world' })
   })
 
-  const completion = waitForCb({ steps: 2 })
+  const fastifyServer = await fastify.listen({ port: 0 })
+  t.after(() => fastify.close())
 
-  fastify.listen({ port: 0 }, (err, address) => {
-    t.assert.ifError(err)
-    t.after(() => fastify.close())
+  const result = await fetch(fastifyServer)
+  t.assert.ok(result.ok)
+  t.assert.strictEqual(result.status, 200)
 
-    sget({
-      method: 'GET',
-      url: address
-    }, (err, response, body) => {
-      t.assert.ifError(err)
-      t.assert.strictEqual(response.statusCode, 200)
-      completion.stepIn()
-    })
-
-    fastify.inject({
-      method: 'GET',
-      url: address
-    }, (err, response, body) => {
-      t.assert.ifError(err)
-      t.assert.strictEqual(response.statusCode, 200)
-      completion.stepIn()
-    })
+  const injectResponse = await fastify.inject({
+    method: 'GET',
+    url: fastifyServer
   })
-
-  return completion.patience
+  t.assert.strictEqual(injectResponse.statusCode, 200)
 })
 
-test('Querystring without value', t => {
-  t.plan(9)
+test('Querystring without value', async t => {
+  t.plan(7)
 
   const fastify = Fastify({
     querystringParser: function (str) {
@@ -110,32 +80,18 @@ test('Querystring without value', t => {
     reply.send({ hello: 'world' })
   })
 
-  const completion = waitForCb({ steps: 2 })
-
-  fastify.listen({ port: 0 }, (err, address) => {
-    t.assert.ifError(err)
-    t.after(() => fastify.close())
+  const fastifyServer = await fastify.listen({ port: 0 })
+  t.after(() => fastify.close())
 
-    sget({
-      method: 'GET',
-      url: `${address}?foo`
-    }, (err, response, body) => {
-      t.assert.ifError(err)
-      t.assert.strictEqual(response.statusCode, 200)
-      completion.stepIn()
-    })
+  const result = await fetch(`${fastifyServer}?foo`)
+  t.assert.ok(result.ok)
+  t.assert.strictEqual(result.status, 200)
 
-    fastify.inject({
-      method: 'GET',
-      url: `${address}?foo`
-    }, (err, response, body) => {
-      t.assert.ifError(err)
-      t.assert.strictEqual(response.statusCode, 200)
-      completion.stepIn()
-    })
+  const injectResponse = await fastify.inject({
+    method: 'GET',
+    url: `${fastifyServer}?foo`
   })
-
-  return completion.patience
+  t.assert.strictEqual(injectResponse.statusCode, 200)
 })
 
 test('Custom querystring parser should be a function', t => {
@@ -153,3 +109,21 @@ test('Custom querystring parser should be a function', t => {
     )
   }
 })
+
+test('Custom querystring parser should be a function', t => {
+  t.plan(1)
+
+  try {
+    Fastify({
+      routerOptions: {
+        querystringParser: 10
+      }
+    })
+    t.fail('Should throw')
+  } catch (err) {
+    t.assert.equal(
+      err.message,
+      "querystringParser option should be a function, instead got 'number'"
+    )
+  }
+})

package/test/decorator-namespace.test._js_

@@ -2,8 +2,7 @@
 
 /* eslint no-prototype-builtins: 0 */
 
-const t = require('tap')
-const test = t.test
+const { test } = require('node:test')
 const Fastify = require('..')
 const fp = require('fastify-plugin')
 
@@ -24,8 +23,8 @@ test('plugin namespace', async t => {
   }, { namepace: 'foo' })
 
   // ! but outside the plugin the decorator would be app.foo.utility()
-  t.ok(app.foo.utility)
+  t.assert.ok(app.foo.utility)
 
   const res = await app.inject('/')
-  t.same(res.json(), { utility: 'utility' })
+  t.assert.deepStrictEqual(res.json(), { utility: 'utility' })
 })