minimise differences with "parent" branch

getodk · Sep 20, 2024 · 059fc10 · 059fc10
1 parent 1605888
commit 059fc10
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/test-nginx.yml b/.github/workflows/test-nginx.yml
@@ -13,5 +13,5 @@ jobs:
     - uses: actions/setup-node@v4
       with:
         node-version: 20
-    - run: cd test/test && npm i
+    - run: cd test && npm i
     - run: cd test && ./run-tests.sh
diff --git a/test/test/package-lock.json → test/package-lock.json b/test/test/package-lock.json → test/package-lock.json
diff --git a/test/test/package.json → test/package.json b/test/test/package.json → test/package.json
diff --git a/test/run-tests.sh b/test/run-tests.sh
@@ -43,6 +43,6 @@ wait_for_http_response  5 localhost:33333/health 200
 log "Waiting for nginx..."
 wait_for_http_response 90 localhost:9000 301
 
-(cd test && npm run test:nginx)
+npm run test:nginx
 
 log "Completed OK."
diff --git a/test/test/test-nginx.js → test/test-nginx.js b/test/test/test-nginx.js → test/test-nginx.js
diff --git a/test/test/.gitignore b/test/test/.gitignore