From 788c285322df324996681731cbaed5c4feb3c494 Mon Sep 17 00:00:00 2001
From: Bryan English <bryan.english@datadoghq.com>
Date: Sun, 11 Jun 2023 13:56:41 -0400
Subject: [PATCH] remove windows-specific test, add macos to matrix

---
 .github/workflows/ci.yml | 19 +------------------
 package.json             | 10 ++++------
 test/runtest.bat         |  1 -
 3 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 test/runtest.bat

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 23c9769..71d3bfc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,6 +11,7 @@ jobs:
     strategy:
       matrix:
         node-version: [12.x, 14.x, 16.10.0, 16.16.0, 16.17.0, 16.x, 17.x, 18.5.0, 18.x, 20.x]
+        os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
       - uses: actions/checkout@v2
@@ -22,21 +23,3 @@ jobs:
       - run: npm test
       - run: npm run test:ts
         if: (matrix.node-version != '12.x' && matrix.node-version != '14.x' && matrix.node-version != '16.10.0')
-
-  build-win:
-      runs-on: windows-latest
-
-      strategy:
-        matrix:
-          node-version: [12.x, 14.x, 16.10.0, 16.16.0, 16.17.0, 16.x, 18.5.0, 18.x, 20.x]
-
-      steps:
-        - uses: actions/checkout@v2
-        - name: Use Node.js ${{ matrix.node-version }}
-          uses: actions/setup-node@v2
-          with:
-            node-version: ${{ matrix.node-version }}
-        - run: npm install
-        - run: npm run test-win
-        - run: npm run test-win:ts
-          if: (matrix.node-version != '12.x' && matrix.node-version != '14.x' && matrix.node-version != '16.10.0')
diff --git a/package.json b/package.json
index 8fc2713..73d594b 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,9 @@
   "description": "Intercept imports in Node.js",
   "main": "index.js",
   "scripts": {
-    "test": "c8 --check-coverage --lines 85 imhotap --runner test/runtest --files test/{hook,low-level,other,get-esm-exports}/*",
-    "test-win": "c8 --check-coverage --lines 85 imhotap --runner test\\runtest.bat --files test/{hook,low-level,other,get-esm-exports}/*",
-    "test:ts": "c8 imhotap --runner test/runtest --files test/typescript/*.test.mts",
-    "test-win:ts": "c8 imhotap --runner test\\runtest.bat --files test/typescript/*.test.mts",
-    "coverage": "c8 --reporter html imhotap --runner test/runtest --files test/{hook,low-level,other,get-esm-exports}/* && echo '\nNow open coverage/index.html\n'"
+    "test": "c8 --check-coverage --lines 85 imhotap --runner 'node test/runtest' --files test/{hook,low-level,other,get-esm-exports}/*",
+    "test:ts": "c8 imhotap --runner 'node test/runtest' --files test/typescript/*.test.mts",
+    "coverage": "c8 --reporter html imhotap --runner 'node test/runtest' --files test/{hook,low-level,other,get-esm-exports}/* && echo '\nNow open coverage/index.html\n'"
   },
   "repository": {
     "type": "git",
@@ -31,7 +29,7 @@
   "devDependencies": {
     "@types/node": "^18.0.6",
     "c8": "^7.8.0",
-    "imhotap": "^2.0.0",
+    "imhotap": "^2.1.0",
     "ts-node": "^10.9.1",
     "typescript": "^4.7.4"
   },
diff --git a/test/runtest.bat b/test/runtest.bat
deleted file mode 100644
index e362185..0000000
--- a/test/runtest.bat
+++ /dev/null
@@ -1 +0,0 @@
-node test/runtest %*