Skip to content

Commit afb465d

Browse files
committed
fix syntax
1 parent b57dc7c commit afb465d

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.github/workflows/node.js.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
DEBUG: 'none'
4545

4646
- name: Run E2E tests against the container app
47-
run: REPLAY=bloody URL=https://localhost:3183 npm run test:deprecated || echo 'Test run failed when trying to use the deployed auth app'
47+
run: npm run test:deprecated:e2e || echo 'Test run failed when trying to use the deployed auth app'
4848
env:
4949
SOURCE_URL: ${{ secrets.SOURCE_URL }}
5050
DEBUG: 'none'
@@ -69,7 +69,7 @@ jobs:
6969
- name: Run Integration tests
7070
run: DEBUG=replay* npm run coverage || echo 'Test run failed replay no longer is working with latest nano which uses node fetch'
7171
- name: Run integration tests using the app with local couchdb
72-
run: REPLAY=bloody npm run test:deprecated
72+
run: npm run test:deprecated:coverage
7373
env:
7474
SOURCE_URL: ${{ secrets.SOURCE_URL }}
7575
DEBUG: 'none'
@@ -92,7 +92,7 @@ jobs:
9292
steps:
9393
- uses: actions/checkout@v6
9494
with:
95-
sparse-checkout:: |
95+
sparse-checkout: |
9696
package.json
9797
- name: Use Node.js 24.x
9898
uses: actions/setup-node@v6
@@ -104,7 +104,7 @@ jobs:
104104
timeout-minutes: 5
105105
env:
106106
BASE_URL: https://localhost:6984
107-
BASE_PATH: /prototype/_design/prototype
107+
BASE_PATH: /prototypedev/_design/prototype
108108

109109
- name: Upload Playwright report and traces for trace.playwright.dev
110110
uses: actions/upload-artifact@v5

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RUN ls -alt; \
1010
ls config/local.js || echo " config/local.js is required to be able to run the tests against deployed couchdb"
1111

1212
ENV DEBUG="*,-express*"
13-
ENV NODE_ENV=localhost
13+
ENV NODE_ENV=local
1414

1515
EXPOSE 3183
1616

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,17 @@
6262
},
6363
"scripts": {
6464
"docker:build": "docker build -t fielddb-auth .",
65-
"test:e2e": "echo 'module.exports = { usersDbConnection: { url: \"http://couchdb:5984\" } };' > config/local.js && docker compose up -d && sleep 3 && docker compose logs && npm run setup && npm run test:deprecated",
66-
"docker:test:no-cache": "echo 'module.exports = { usersDbConnection: { url: \"http://couchdb:5984\" } };' > config/local.js && docker compose build --no-cache && docker compose up -d && sleep 15 && docker compose logs && npm run setup && npm run test:deprecated",
65+
"test:docker": "echo 'module.exports = { usersDbConnection: { url: \"http://couchdb:5984\" } };' > config/local.js && docker compose up -d && sleep 3 && docker compose logs && npm run setup && npm run test:deprecated:e2e",
66+
"test:docker:no-cache": "echo 'module.exports = { usersDbConnection: { url: \"http://couchdb:5984\" } };' > config/local.js && docker compose build --no-cache && docker compose up -d && sleep 15 && docker compose logs && npm run setup && npm run test:deprecated:e2e",
6767
"coverage": "NODE_ENV=test BUNYAN_LOG_LEVEL=FATAL nyc npm test",
6868
"lint": "eslint ",
6969
"lint:ci": "eslint .",
7070
"setup": "REPLAY=bloody NODE_TLS_REJECT_UNAUTHORIZED=0 SOURCE_URL=${SOURCE_URL:-https://public:none@corpusdev.example.org} mocha --timeout 20000 test/integration/install.js",
7171
"start": "node ./bin/www.js",
7272
"test": "SOURCE_URL=${SOURCE_URL:-https://public:none@corpusdev.example.org} NODE_ENV=test NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --timeout 100000 --recursive test",
7373
"test:debug": "node-debug _mocha test/integration/oauth.js",
74-
"test:deprecated": "DEBUG=${DEBUG:-lib:user} REPLAY=bloody NODE_TLS_REJECT_UNAUTHORIZED=0 nyc mocha --timeout 25000 test/routes/deprecated-spec.js",
74+
"test:deprecated:e2e": "DEBUG=${DEBUG:-lib:user} REPLAY=bloody NODE_TLS_REJECT_UNAUTHORIZED=0 URL=https://localhost:3183 nyc mocha --timeout 25000 test/routes/deprecated-spec.js",
75+
"test:deprecated:coverage": "DEBUG=${DEBUG:-lib:user} REPLAY=bloody NODE_TLS_REJECT_UNAUTHORIZED=0 nyc mocha --timeout 25000 test/routes/deprecated-spec.js",
7576
"test:fielddb": "NODE_ENV=localhost jasmine-node node_modules/fielddb/tests",
7677
"test:production": "ls config/production.js",
7778
"test:ui": "git clone --filter=blob:none --no-checkout https://github.com/FieldDB/FieldDB.git; cd FieldDB; git sparse-checkout set test-e2e; git checkout HEAD; cd test-e2e && npm install && npx playwright install chromium && BASE_URL=${BASE_URL:-https://localhost:6984} BASE_PATH=${BASE_PATH:-/prototypedev/_design/prototype} DEBUG=${DEBUG:-none} npm run test -- --retries=0 --project=Chromium register",

0 commit comments

Comments
 (0)