restore code coverage

.c8rc.json

@@ -0,0 +1,8 @@
+{
+  "exclude": [
+    "lib/configValidator.js",
+    "lib/error-serializer.js",
+    "build/build-error-serializer.js",
+    "test/*"
+  ]
+}

.github/workflows/ci.yml

@@ -135,8 +135,6 @@ jobs:
       - name: Run tests
         run: |
           npm run unit
-        env:
-          NODE_OPTIONS: no-network-family-autoselection 
 
   test-typescript:
     needs: 

.github/workflows/coverage-nix.yml

@@ -28,8 +28,6 @@ jobs:
       - name: Generate coverage report
         run: |
           npm run coverage:ci
-        env:
-          NODE_OPTIONS: no-network-family-autoselection 
 
       - uses: actions/upload-artifact@v3
         if: ${{ success() }}

.github/workflows/coverage-win.yml

@@ -28,8 +28,6 @@ jobs:
       - name: Generate coverage report
         run: |
           npm run coverage:ci
-        env:
-          NODE_OPTIONS: no-network-family-autoselection 
 
       - uses: actions/upload-artifact@v3
         if: ${{ success() }}

.taprc

@@ -1,8 +1,8 @@
 ts: false
 jsx: false
 flow: false
-check-coverage: true
-coverage: true
+check-coverage: false
+coverage: false
 node-arg: --allow-natives-syntax
 
 files:

fastify.js

@@ -452,6 +452,7 @@ function fastify (options) {
         // https://github.com/nodejs/node/issues/48604
         if (!options.serverFactory || fastify[kState].listening) {
           instance.server.close(function (err) {
+            /* c8 ignore next 6 */
             if (err && err.code !== 'ERR_SERVER_NOT_RUNNING') {
               done(null)
             } else {

lib/server.js

@@ -22,8 +22,6 @@ function defaultResolveServerListeningText (address) {
 function createServer (options, httpHandler) {
   const server = getServerInstance(options, httpHandler)
 
-  return { server, listen }
-
   // `this` is the Fastify object
   function listen (listenOptions, ...args) {
     let cb = args.slice(-1).pop()
@@ -99,6 +97,8 @@ function createServer (options, httpHandler) {
 
     this.ready(listenCallback.call(this, server, listenOptions))
   }
+
+  return { server, listen }
 }
 
 function multipleBindings (mainServer, httpHandler, serverOpts, listenOptions, onListen) {
@@ -138,17 +138,16 @@ function multipleBindings (mainServer, httpHandler, serverOpts, listenOptions, o
                 // pace through the `onClose` hook.
                 // It also allows them to handle possible connections already
                 // attached to them if any.
+                /* c8 ignore next 20 */
                 this.onClose((instance, done) => {
                   if (instance[kState].listening) {
                     // No new TCP connections are accepted
                     // We swallow any error from the secondary
                     // server
                     secondaryServer.close(() => done())
-                    /* istanbul ignore next: Cannot test this without Node.js core support */
                     if (serverOpts.forceCloseConnections === 'idle') {
                       // Not needed in Node 19
                       secondaryServer.closeIdleConnections()
-                    /* istanbul ignore next: Cannot test this without Node.js core support */
                     } else if (typeof secondaryServer.closeAllConnections === 'function' && serverOpts.forceCloseConnections) {
                       secondaryServer.closeAllConnections()
                     }

package.json

@@ -10,23 +10,23 @@
     "benchmark": "npx concurrently -k -s first \"node ./examples/benchmark/simple.js\" \"npx autocannon -c 100 -d 30 -p 10 localhost:3000/\"",
     "benchmark:parser": "npx concurrently -k -s first \"node ./examples/benchmark/parser.js\" \"npx autocannon -c 100 -d 30 -p 10 -i ./examples/benchmark/body.json -H \"content-type:application/jsoff\" -m POST localhost:3000/\"",
     "build:validation": "node build/build-error-serializer.js && node build/build-validation.js",
-    "coverage": "cross-env NODE_OPTIONS=no-network-family-autoselection npm run unit -- --cov --coverage-report=html",
-    "coverage:ci": "npm run unit -- --cov --coverage-report=html --no-browser --no-check-coverage",
-    "coverage:ci-check-coverage": "nyc check-coverage --branches 100 --functions 100 --lines 100 --statements 100",
+    "coverage": "npm run unit -- --coverage-report=html",
+    "coverage:ci": "npm run unit -- --coverage-report=html --no-browser --no-check-coverage",
+    "coverage:ci-check-coverage": "c8 check-coverage --branches 100 --functions 100 --lines 100 --statements 100",
     "license-checker": "license-checker --production --onlyAllow=\"MIT;ISC;BSD-3-Clause;BSD-2-Clause\"",
     "lint": "npm run lint:standard && npm run lint:typescript && npm run lint:markdown",
     "lint:fix": "standard --fix",
     "lint:markdown": "markdownlint-cli2",
     "lint:standard": "standard | snazzy",
     "lint:typescript": "eslint -c types/.eslintrc.json types/**/*.d.ts test/types/**/*.test-d.ts",
     "prepublishOnly": "cross-env PREPUBLISH=true tap --no-check-coverage test/build/**.test.js && npm run test:validator:integrity",
-    "test": "npm run lint && cross-env NODE_OPTIONS=no-network-family-autoselection npm run unit && npm run test:typescript",
+    "test": "npm run lint && npm run unit && npm run test:typescript",
     "test:ci": "npm run unit -- --cov --coverage-report=lcovonly && npm run test:typescript",
     "test:report": "npm run lint && npm run unit:report && npm run test:typescript",
     "test:validator:integrity": "npm run build:validation && git diff --quiet --ignore-all-space --ignore-blank-lines --ignore-cr-at-eol lib/error-serializer.js && git diff --quiet --ignore-all-space --ignore-blank-lines --ignore-cr-at-eol lib/configValidator.js",
     "test:typescript": "tsc test/types/import.ts && tsd",
     "test:watch": "npm run unit -- -w --no-coverage-report -R terse",
-    "unit": "tap",
+    "unit": "c8 tap",
     "unit:junit": "tap-mocha-reporter xunit < out.tap > test/junit-testresults.xml",
     "unit:report": "tap --cov --coverage-report=html --coverage-report=cobertura | tee out.tap"
   },
@@ -145,6 +145,7 @@
     "ajv-i18n": "^4.2.0",
     "ajv-merge-patch": "^5.0.1",
     "branch-comparer": "^1.1.0",
+    "c8": "^8.0.0",
     "cross-env": "^7.0.3",
     "eslint": "^8.39.0",
     "eslint-config-standard": "^17.0.0",
@@ -169,7 +170,7 @@
     "send": "^0.18.0",
     "simple-get": "^4.0.1",
     "snazzy": "^9.0.0",
-    "split2": "^4.2.0",
+    "split3": "^4.2.0",
     "standard": "^17.0.0",
     "tap": "^16.3.4",
     "tsd": "^0.28.1",

test/500s.test.js

@@ -9,6 +9,7 @@ test('default 500', t => {
   t.plan(4)
 
   const fastify = Fastify()
+  t.teardown(fastify.close.bind(fastify))
 
   fastify.get('/', function (req, reply) {
     reply.send(new Error('kaboom'))
@@ -33,6 +34,7 @@ test('custom 500', t => {
   t.plan(6)
 
   const fastify = Fastify()
+  t.teardown(fastify.close.bind(fastify))
 
   fastify.get('/', function (req, reply) {
     reply.send(new Error('kaboom'))
@@ -62,6 +64,7 @@ test('encapsulated 500', t => {
   t.plan(10)
 
   const fastify = Fastify()
+  t.teardown(fastify.close.bind(fastify))
 
   fastify.get('/', function (req, reply) {
     reply.send(new Error('kaboom'))
@@ -113,6 +116,7 @@ test('custom 500 with hooks', t => {
   t.plan(7)
 
   const fastify = Fastify()
+  t.teardown(fastify.close.bind(fastify))
 
   fastify.get('/', function (req, reply) {
     reply.send(new Error('kaboom'))