diff --git a/.github/workflows/encryption-tests.yml b/.github/workflows/encryption-tests.yml index e605778920..263ebaedc1 100644 --- a/.github/workflows/encryption-tests.yml +++ b/.github/workflows/encryption-tests.yml @@ -33,15 +33,5 @@ jobs: run: npm install - name: Install mongodb-client-encryption run: npm install mongodb-client-encryption - - name: Set up cluster - id: setup-cluster - uses: mongodb-labs/drivers-evergreen-tools@master - with: - version: 8.0.0 - topology: sharded_cluster - auth: auth - name: Run Tests run: npm run test-encryption - env: - MONGOOSE_TEST_URI: ${{ steps.setup-cluster.outputs.cluster-uri }} - CRYPT_SHARED_LIB_PATH: ${{ steps.setup-cluster.outputs.crypt-shared-lib-path }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a94baf554b..06073758d9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -46,7 +46,7 @@ If you have a question about Mongoose (not a bug report) please post it to eithe * execute `npm run test-tsd` to run the typescript tests * execute `npm run ts-benchmark` to run the typescript benchmark "performance test" for a single time. * execute `npm run ts-benchmark-watch` to run the typescript benchmark "performance test" while watching changes on types folder. Note: Make sure to commit all changes before executing this command. -* in order to run tests that require an cluster with encryption locally, run `npm run test-encryption-local`. Alternatively, you can start an encrypted cluster using the `scripts/start-cluster-with-encryption.sh` file. +* in order to run tests that require an cluster with encryption locally, run `npm run test-encryption`. Alternatively, you can start an encrypted cluster using the `scripts/configure-cluster-with-encryption.sh` file. ## Documentation diff --git a/package.json b/package.json index 5c726e144c..39d4451eeb 100644 --- a/package.json +++ b/package.json @@ -104,8 +104,7 @@ "test-deno": "deno run --allow-env --allow-read --allow-net --allow-run --allow-sys --allow-write ./test/deno.js", "test-rs": "START_REPLICA_SET=1 mocha --timeout 30000 --exit ./test/*.test.js", "test-tsd": "node ./test/types/check-types-filename && tsd", - "test-encryption": "mocha --exit ./test/encryption/*.test.js", - "test-encryption-local": "bash scripts/run-encryption-tests-local.sh", + "test-encryption": "bash scripts/run-encryption-tests.sh", "tdd": "mocha ./test/*.test.js --inspect --watch --recursive --watch-files ./**/*.{js,ts}", "test-coverage": "nyc --reporter=html --reporter=text npm test", "ts-benchmark": "cd ./benchmarks/typescript/simple && npm install && npm run benchmark | node ../../../scripts/tsc-diagnostics-check" diff --git a/scripts/run-encryption-tests-local.sh b/scripts/run-encryption-tests.sh similarity index 95% rename from scripts/run-encryption-tests-local.sh rename to scripts/run-encryption-tests.sh index 244c125459..61f4806352 100755 --- a/scripts/run-encryption-tests-local.sh +++ b/scripts/run-encryption-tests.sh @@ -35,4 +35,5 @@ source expansions.sh export MONGOOSE_TEST_URI=$MONGODB_URI # run encryption tests -npm run test-encryption +cd .. +npx mocha --exit ./test/encryption/*.test.js \ No newline at end of file