test(hapi): consolidate how hapi ignores old node versions in test (#…

…1041)
open-telemetry · Jun 10, 2022 · 23d98b1 · 23d98b1
1 parent 29a3c56
commit 23d98b1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/.github/workflows/test-all-versions.yml b/.github/workflows/test-all-versions.yml
@@ -25,12 +25,14 @@ jobs:
               --ignore @opentelemetry/instrumentation-amqplib
               --ignore @opentelemetry/instrumentation-mongodb
               --ignore @opentelemetry/instrumentation-redis-4
+              --ignore @opentelemetry/instrumentation-hapi
           - node: "10"
             lerna-extra-args: >-
               --ignore @opentelemetry/instrumentation-aws-sdk
               --ignore @opentelemetry/instrumentation-pino
               --ignore @opentelemetry/instrumentation-mongodb
               --ignore @opentelemetry/instrumentation-redis-4
+              --ignore @opentelemetry/instrumentation-hapi
     runs-on: ubuntu-latest
     services:
       memcached:

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -18,11 +18,13 @@ jobs:
               --ignore @opentelemetry/instrumentation-tedious
               --ignore @opentelemetry/instrumentation-amqplib
               --ignore @opentelemetry/instrumentation-redis-4
+              --ignore @opentelemetry/instrumentation-hapi
           - node: "10"
             lerna-extra-args: >-
               --ignore @opentelemetry/instrumentation-aws-sdk
               --ignore @opentelemetry/instrumentation-pino
               --ignore @opentelemetry/instrumentation-redis-4
+              --ignore @opentelemetry/instrumentation-hapi
           - node: "12"
             lerna-extra-args: >-
               --ignore @opentelemetry/instrumentation-redis-4

diff --git a/plugins/node/opentelemetry-instrumentation-hapi/.mocharc.js b/plugins/node/opentelemetry-instrumentation-hapi/.mocharc.js
diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json
@@ -6,7 +6,7 @@
   "types": "build/src/index.d.ts",
   "repository": "open-telemetry/opentelemetry-js-contrib",
   "scripts": {
-    "test": "nyc ts-mocha -p tsconfig.json --config .mocharc.js",
+    "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'",
     "tdd": "yarn test -- --watch-extensions ts --watch",
     "clean": "rimraf build/*",
     "lint": "eslint . --ext .ts",
@@ -56,7 +56,6 @@
     "mocha": "7.2.0",
     "nyc": "15.1.0",
     "rimraf": "3.0.2",
-    "semver": "7.3.5",
     "ts-mocha": "8.0.0",
     "typescript": "4.3.5"
   },