From fba65e7afe481aad1156c0073a8bc906461a4cbe Mon Sep 17 00:00:00 2001
From: Phillip9587 <barta.phillip@gmail.com>
Date: Wed, 23 Oct 2024 13:48:30 +0200
Subject: [PATCH] replace `mocha` and `nyc` with native node test runner and
 `c8`

---
 .github/workflows/ci.yml |  8 +-------
 package.json             | 12 +++++-------
 test/charset.js          | 11 ++++++++---
 test/encoding.js         | 11 ++++++++---
 test/language.js         | 11 ++++++++---
 test/mediaType.js        | 11 ++++++++---
 6 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 66b63a8..effe011 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -70,12 +70,7 @@ jobs:
 
     - name: Run tests
       shell: bash
-      run: |
-        if npm -ps ls nyc | grep -q nyc; then
-          npm run test-ci
-        else
-          npm test
-        fi
+      run: npm run test-ci
 
     - name: Lint code
       if: steps.list_env.outputs.eslint != ''
@@ -83,7 +78,6 @@ jobs:
 
     - name: Collect code coverage
       uses: coverallsapp/github-action@master
-      if: steps.list_env.outputs.nyc != ''
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         flag-name: run-${{ matrix.test_number }}
diff --git a/package.json b/package.json
index d665024..77b41c2 100644
--- a/package.json
+++ b/package.json
@@ -18,10 +18,9 @@
   ],
   "repository": "jshttp/negotiator",
   "devDependencies": {
+    "c8": "^10.1.2",
     "eslint": "7.32.0",
-    "eslint-plugin-markdown": "2.2.1",
-    "mocha": "9.1.3",
-    "nyc": "15.1.0"
+    "eslint-plugin-markdown": "2.2.1"
   },
   "files": [
     "lib/",
@@ -35,9 +34,8 @@
   },
   "scripts": {
     "lint": "eslint .",
-    "test": "mocha --reporter spec --check-leaks --bail test/",
-    "test:debug": "mocha --reporter spec --check-leaks --inspect --inspect-brk test/",
-    "test-ci": "nyc --reporter=lcov --reporter=text npm test",
-    "test-cov": "nyc --reporter=html --reporter=text npm test"
+    "test": "node --test --test-reporter spec",
+    "test-ci": "c8 --reporter=lcovonly --reporter=text npm test",
+    "test-cov": "c8 --reporter=html --reporter=text npm test"
   }
 }
diff --git a/test/charset.js b/test/charset.js
index e994abf..4dfb2d0 100644
--- a/test/charset.js
+++ b/test/charset.js
@@ -1,4 +1,7 @@
-
+var nodeTest = require('node:test')
+var describe = nodeTest.describe
+var it = nodeTest.it
+var before = nodeTest.before
 var assert = require('assert')
 var Negotiator = require('..')
 
@@ -326,10 +329,12 @@ function whenAcceptCharset(acceptCharset, func) {
     : 'when Accept-Charset: ' + acceptCharset
 
   describe(description, function () {
+    var thisArg = {}
+
     before(function () {
-      this.negotiator = new Negotiator(createRequest({'Accept-Charset': acceptCharset}))
+      thisArg.negotiator = new Negotiator(createRequest({'Accept-Charset': acceptCharset}))
     })
 
-    func()
+    func.bind(thisArg)
   })
 }
diff --git a/test/encoding.js b/test/encoding.js
index 29801d4..9f087cd 100644
--- a/test/encoding.js
+++ b/test/encoding.js
@@ -1,4 +1,7 @@
-
+var nodeTest = require('node:test')
+var describe = nodeTest.describe
+var it = nodeTest.it
+var before = nodeTest.before
 var assert = require('assert')
 var Negotiator = require('..')
 
@@ -467,10 +470,12 @@ function whenAcceptEncoding(acceptEncoding, func) {
     : 'when Accept-Encoding: ' + acceptEncoding
 
   describe(description, function () {
+    var thisArg = {}
+
     before(function () {
-      this.negotiator = new Negotiator(createRequest({'Accept-Encoding': acceptEncoding}))
+      thisArg.negotiator = new Negotiator(createRequest({'Accept-Encoding': acceptEncoding}))
     })
 
-    func()
+    func.bind(thisArg)
   })
 }
diff --git a/test/language.js b/test/language.js
index fb33776..cd9e5b8 100644
--- a/test/language.js
+++ b/test/language.js
@@ -1,4 +1,7 @@
-
+var nodeTest = require('node:test')
+var describe = nodeTest.describe
+var it = nodeTest.it
+var before = nodeTest.before
 var assert = require('assert')
 var Negotiator = require('..')
 
@@ -422,10 +425,12 @@ function whenAcceptLanguage(acceptLanguage, func) {
     : 'when Accept-Language: ' + acceptLanguage
 
   describe(description, function () {
+    var thisArg = {}
+
     before(function () {
-      this.negotiator = new Negotiator(createRequest({'Accept-Language': acceptLanguage}))
+      thisArg.negotiator = new Negotiator(createRequest({'Accept-Language': acceptLanguage}))
     })
 
-    func()
+    func.bind(thisArg)
   })
 }
diff --git a/test/mediaType.js b/test/mediaType.js
index 8365be7..414024e 100644
--- a/test/mediaType.js
+++ b/test/mediaType.js
@@ -1,4 +1,7 @@
-
+var nodeTest = require('node:test')
+var describe = nodeTest.describe
+var it = nodeTest.it
+var before = nodeTest.before
 var assert = require('assert')
 var Negotiator = require('..')
 
@@ -490,10 +493,12 @@ function whenAccept(accept, func) {
     : 'when Accept: ' + accept
 
   describe(description, function () {
+    var thisArg = {}
+
     before(function () {
-      this.negotiator = Negotiator(createRequest({'Accept': accept}))
+      thisArg.negotiator = Negotiator(createRequest({ 'Accept': accept }))
     })
 
-    func()
+    func.bind(thisArg)
   })
 }