From ab8c5f69b99209941581d5c9aa0394bdc041f65e Mon Sep 17 00:00:00 2001 From: Dominic Pelini Date: Mon, 21 Oct 2024 01:55:35 -0600 Subject: [PATCH] test fix --- .github/workflows/build-bindings.yml | 2 +- .github/workflows/tests.yml | 6 +++--- package.json | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-bindings.yml b/.github/workflows/build-bindings.yml index 5e5c5c0f..41d43a35 100644 --- a/.github/workflows/build-bindings.yml +++ b/.github/workflows/build-bindings.yml @@ -160,7 +160,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run ts-test -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV + npm run test dist/ -- --h 127.0.0.1 --port 3000" >> $GITHUB_ENV # - name: Disable tests (only run basic import test) # if: ${{ !inputs.run_tests }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ab0dd352..285da653 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -229,7 +229,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run ts-test dist/ + npm run test dist/ test-lowest-supported-server: runs-on: ubuntu-latest @@ -275,7 +275,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run ts-test dist/ -- --t 20000 + npm run test dist/ -- --t 20000 test-ee: runs-on: ubuntu-latest @@ -332,7 +332,7 @@ jobs: npm install typescript --save-dev; npx tsc; cd ..; - npm run ts-test dist/admin.js -- --h localhost --U admin --P admin --t 40000 + npm run test dist/admin.js -- --h localhost --U admin --P admin --t 40000 test-valgrind: runs-on: ubuntu-latest diff --git a/package.json b/package.json index caaba78c..167278f7 100644 --- a/package.json +++ b/package.json @@ -41,15 +41,14 @@ "preinstall": "npm install @mapbox/node-pre-gyp", "install": "npm run build", "build": "node-pre-gyp install --fallback-to-build", - "test": "mocha test", - "ts-test": "rm -rf ts-test/dist; cd ts-test; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha", + "test": "rm -rf ts-test/dist; cd ts-test; npx tsc ; cp tests/udf.lua dist/udf.lua ; mocha", "test-dry-run": "mocha --dry-run", "test-noserver": "GLOBAL_CLIENT=false mocha -g '#noserver'", "lint": "standard", "posttest": "npm run lint", "coverage": "nyc npm test && nyc --reporter=lcov report", "codecov": "codecov", - "prepush": "npm test", + "prepush": "npm run test dist", "apidocs": "jsdoc -c jsdoc.json", "build-docs": "npx typedoc --plugin typedoc-plugin-rename-defaults --entryPointStrategy expand typings/index.d.ts", "cppcheck": "cppcheck --quiet --enable=warning,style -I src/include src/main/",