fix: integration tests failing

Author: cameri

docker-compose.yml

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

package.json

@@ -44,11 +44,10 @@
     "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: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 tests",
-    "postdocker:integration:run": "docker compose -f ./test/integration/docker-compose.yml down",
+    "docker:integration:run": "docker compose -f ./test/integration/docker-compose.yml run --rm tests",
     "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": {
     "type": "git",
@@ -105,7 +104,7 @@
     "@noble/secp256k1": "1.7.0",
     "debug": "4.3.4",
     "joi": "17.6.1",
-    "knex": "2.3.0",
+    "knex": "^2.3.0",
     "pg": "8.8.0",
     "pg-query-stream": "4.2.3",
     "ramda": "0.28.0",

test/integration/docker-compose.yml

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

test/integration/features/shared.ts

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