Merged with main, moved package.json to the root.

Signed-off-by: dblock <[email protected]>
opensearch-project · May 13, 2024 · ee0fcd3 · ee0fcd3
1 parent 7971664
commit ee0fcd3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,12 +21,11 @@ jobs:
           node-version: '20'
 
       - name: Build
-        working-directory: ./tools
         run: |-
           mkdir -p ../build
           npm install
-          npm run merge -- --source ../spec --output ../build/opensearch-openapi.yaml
-          npm run merge -- --source ../spec --output ../build/opensearch-openapi-tested.yaml --x-include=x-tested
+          npm run merge -- --source ./spec --output ./build/opensearch-openapi.yaml
+          npm run merge -- --source ./spec --output ./build/opensearch-openapi-tested.yaml --x-include=x-tested
 
       - name: Build and Run Docker Container
         run: |
@@ -39,9 +38,8 @@ jobs:
           curl -ks -u "admin:$OPENSEARCH_INITIAL_ADMIN_PASSWORD" https://localhost:9200/ | jq
 
       - name: Test
-        working-directory: ./tools
         run: |-
-          npm run dredd -- --user "admin:$OPENSEARCH_INITIAL_ADMIN_PASSWORD" ../build/opensearch-openapi-tested.yaml https://localhost:9200
+          npm run dredd -- --user "admin:$OPENSEARCH_INITIAL_ADMIN_PASSWORD" ./build/opensearch-openapi-tested.yaml https://localhost:9200
 
       - name: Gather Test Coverage
         id: test-coverage

diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "lint:spec": "ts-node tools/src/linter/lint.ts",
     "lint": "eslint .",
     "test": "jest",
-    "dredd": "dredd --hookfiles=../tests/**/*.js"
+    "dredd": "dredd --hookfiles=./tests/**/*.js"
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",

diff --git a/tests/README.md b/tests/README.md
@@ -16,8 +16,8 @@ docker run -d -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" -e "OPEN
 Generate the spec and run `dredd` from inside [tools](../tools).
 
 ```
-npm run merge -- --source ../spec --output ../build/opensearch-openapi-tested.yaml --x-include=x-tested
-npm run dredd -- --user "admin:BobgG7YrtsdKf9M" ../build/opensearch-openapi-tested.yaml https://localhost:9200
+npm run merge -- --source ./spec --output ../build/opensearch-openapi-tested.yaml --x-include=x-tested
+npm run dredd -- --user "admin:BobgG7YrtsdKf9M" ./build/opensearch-openapi-tested.yaml https://localhost:9200
 ```
 
 ## Writing Tests