From 95137dbe5f34b101bbeb8bcf7c439d212460ce88 Mon Sep 17 00:00:00 2001
From: Ricardo Arturo Cabral Mejia <me@ricardocabral.io>
Date: Fri, 28 Oct 2022 21:47:43 -0400
Subject: [PATCH] fix(ci): coverage reporting

---
 .dockerignore                |  1 -
 .github/workflows/checks.yml |  1 +
 Dockerfile.test              |  2 +-
 cucumber.js                  |  1 +
 package.json                 | 15 +++++++--------
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 9f71eb5..8275fc5 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,7 +7,6 @@ seeds
 test
 !test/integration
 .eslint*
-.mocha*
 .nvmrc
 .nyc_output
 docker-compose.yml
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 368227c..3126d30 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -57,6 +57,7 @@ jobs:
   test-integrations-and-cover:
     name: Integration Tests and Coverage
     runs-on: ubuntu-latest
+    environment: test
     needs:
       - lint
       - build-check
diff --git a/Dockerfile.test b/Dockerfile.test
index f9f48b6..3fa9a30 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -10,7 +10,7 @@ ENV DB_MAX_POOL_SIZE=2
 
 WORKDIR /code
 
-COPY ["package.json", "package-lock.json", "cucumber.js", "tsconfig.json", "knexfile.js", "./"]
+COPY ["package.json", "package-lock.json", ".nycrc.json", ".mocharc.js", "cucumber.js", "tsconfig.json", "knexfile.js", "./"]
 
 RUN npm install --quiet
 
diff --git a/cucumber.js b/cucumber.js
index e1fa469..2008e25 100644
--- a/cucumber.js
+++ b/cucumber.js
@@ -3,6 +3,7 @@ const base = [
   '--require-module ts-node/register',
   '--require test/integration/features/**/*.ts',
   '--require test/integration/features/*.ts',
+  '--publish-quiet',
 ].join(' ')
 
 const config = [
diff --git a/package.json b/package.json
index 0d21a4e..a4dcffe 100644
--- a/package.json
+++ b/package.json
@@ -30,21 +30,20 @@
     "pretest:unit": "mkdir -p .test-reports/unit",
     "test:unit": "mocha 'test/**/*.spec.ts'",
     "test:unit:watch": "npm run test:unit -- --min --watch --watch-files src/**/*,test/**/*",
-    "cover:unit": "nyc --report-dir .coverage/unit npm run --ignore-scripts test:unit",
+    "cover:unit": "nyc --report-dir .coverage/unit npm run test:unit",
     "docker:build": "docker build -t nostr-ts-relay .",
     "pretest:integration": "mkdir -p .test-reports/integration",
     "test:integration": "cucumber-js",
-    "cover:integration": "nyc --report-dir .coverage/integration npm run --ignore-scripts test:integration",
+    "cover:integration": "nyc --report-dir .coverage/integration npm run test:integration -- -p cover",
     "predocker:compose:up": "[ -d \"$HOME/.nostr\" ] || mkdir -p $HOME/.nostr",
     "docker:compose:start": "docker compose up --build",
     "docker:compose:stop": "docker compose down",
     "docker:compose:clean": "docker compose rm",
-    "predocker:test:integration": "docker compose -f ./test/integration/docker-compose.yml up -d --quiet-pull --build",
-    "docker:test:integration": "docker compose -f ./test/integration/docker-compose.yml run tests npm run test:integration",
-    "postdocker:test:integration": "docker compose -f ./test/integration/docker-compose.yml down",
-    "predocker:cover:integration": "docker compose -f ./test/integration/docker-compose.yml up -d --quiet-pull --build",
-    "docker:cover:integration": "docker compose -f ./test/integration/docker-compose.yml run tests npm run cover:integration",
-    "postdocker:cover:integration": "docker compose -f ./test/integration/docker-compose.yml down"
+    "predocker:integration:run": "docker compose -f ./test/integration/docker-compose.yml up -d --quiet-pull --build",
+    "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:cover:integration": "npm run docker:integration:run -- npm run cover:integration"
   },
   "repository": {
     "type": "git",