highperfocused/nostream
1
0
Fork 0
mirror of https://github.com/Cameri/nostream.git synced 2025-08-03 11:12:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: integration tests failing

Browse Source
This commit is contained in:
Ricardo Arturo Cabral Mejía
2022-11-11 20:24:16 -05:00
parent cc6ffe9120
commit 90d8b94194
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docker-compose.yml
View File

@@ -11,7 +11,7 @@ services:
DB_MIN_POOL_SIZE: 1 DB_MIN_POOL_SIZE: 1
DB_MAX_POOL_SIZE: 2 DB_MAX_POOL_SIZE: 2
NOSTR_CONFIG_DIR: /home/node/ NOSTR_CONFIG_DIR: /home/node/
SERVER_PORT: 8008 PORT: 8008
DEBUG: worker:event-message-handler,worker:web-socket-server-adapter DEBUG: worker:event-message-handler,worker:web-socket-server-adapter
user: node:node user: node:node
volumes: volumes:
@@ -56,9 +56,8 @@ services:
entrypoint: entrypoint:
- sh - sh
- -c - -c
- 'cd code && npm install -g knex@2.3.0 && npm install knex --quiet && npm run db:migrate' - 'cd code && npm install --no-save --quiet knex@2.3.0 pg@8.8.0 && npx knex migrate:latest'
volumes: volumes:
- ./package.json:/code/package.json
- ./migrations:/code/migrations - ./migrations:/code/migrations
- ./knexfile.js:/code/knexfile.js - ./knexfile.js:/code/knexfile.js
depends_on: depends_on:

9
package.json
View File

@@ -44,11 +44,10 @@
"tor:docker:compose:start": "docker compose -f docker-compose.yml -f docker-compose.tor.yml up --build --remove-orphans", "tor:docker:compose:start": "docker compose -f docker-compose.yml -f docker-compose.tor.yml up --build --remove-orphans",
"tor:hostname": "cat $HOME/.nostr/tor/data/nostr-ts-relay/hostname", "tor:hostname": "cat $HOME/.nostr/tor/data/nostr-ts-relay/hostname",
"tor:docker:compose:stop": "docker compose -f docker-compose.yml -f docker-compose.tor.yml down", "tor:docker:compose:stop": "docker compose -f docker-compose.yml -f docker-compose.tor.yml down",
"predocker:integration:run": "docker compose -f ./test/integration/docker-compose.yml up -d --quiet-pull --build --remove-orphans", "docker:integration:run": "docker compose -f ./test/integration/docker-compose.yml run --rm tests",
"docker:integration:run": "docker compose -f ./test/integration/docker-compose.yml run tests",
"postdocker:integration:run": "docker compose -f ./test/integration/docker-compose.yml down",
"docker:test:integration": "npm run docker:integration:run -- npm run test:integration", "docker:test:integration": "npm run docker:integration:run -- npm run test:integration",
"docker:cover:integration": "npm run docker:integration:run -- npm run cover:integration" "docker:cover:integration": "npm run docker:integration:run -- npm run cover:integration",
"postdocker:integration:run": "docker compose -f ./test/integration/docker-compose.yml down"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@@ -105,7 +104,7 @@
"@noble/secp256k1": "1.7.0", "@noble/secp256k1": "1.7.0",
"debug": "4.3.4", "debug": "4.3.4",
"joi": "17.6.1", "joi": "17.6.1",
"knex": "2.3.0", "knex": "^2.3.0",
"pg": "8.8.0", "pg": "8.8.0",
"pg-query-stream": "4.2.3", "pg-query-stream": "4.2.3",
"ramda": "0.28.0", "ramda": "0.28.0",

3
test/integration/docker-compose.yml
View File

@@ -51,9 +51,8 @@ services:
entrypoint: entrypoint:
- sh - sh
- -c - -c
- 'cd code && npm install -g knex@2.3.0 && npm install knex --quiet && npm run db:migrate' - 'cd code && npm install --no-save --quiet knex@2.3.0 pg@8.8.0 && npx knex migrate:latest'
volumes: volumes:
- ../../package.json:/code/package.json
- ../../migrations:/code/migrations - ../../migrations:/code/migrations
- ../../knexfile.js:/code/knexfile.js - ../../knexfile.js:/code/knexfile.js
depends_on: depends_on:

2
test/integration/features/shared.ts
View File

@@ -22,7 +22,7 @@ let worker: AppWorker
let dbClient: DatabaseClient let dbClient: DatabaseClient
BeforeAll({ timeout: 6000 }, async function () { BeforeAll({ timeout: 6000 }, async function () {
process.env.SERVER_PORT = '18808' process.env.PORT = '18808'
dbClient = getDbClient() dbClient = getDbClient()
await dbClient.raw('SELECT 1=1') await dbClient.raw('SELECT 1=1')