From afc55ef6936729e89617ce8c04b2ecf0e0501c06 Mon Sep 17 00:00:00 2001
From: Matteo Vitali <matteo@20tab.com>
Date: Tue, 16 Jan 2024 10:33:34 +0100
Subject: [PATCH] Fix Continous Integration (#78)

---
 .../components/commons/Button.test.tsx        |  2 +-
 .../__tests__/pact/contracts/health.test.ts   | 10 +++---
 .../__tests__/setupTests.ts                   |  2 +-
 .../docker-compose.yaml                       |  2 +-
 .../docker-compose/common.yaml                |  2 +-
 .../docker/cypress.Dockerfile                 |  6 ++--
 .../docker/test.Dockerfile                    | 34 ++++++++++++++-----
 7 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/{{cookiecutter.project_dirname}}/__tests__/components/commons/Button.test.tsx b/{{cookiecutter.project_dirname}}/__tests__/components/commons/Button.test.tsx
index 1500531..a10fea3 100644
--- a/{{cookiecutter.project_dirname}}/__tests__/components/commons/Button.test.tsx
+++ b/{{cookiecutter.project_dirname}}/__tests__/components/commons/Button.test.tsx
@@ -10,6 +10,6 @@ const solidSetup = () => renderWithWrappers(<Button />)
 test('Solid button renders correctly', () => {
   solidSetup()
   const button = window.getComputedStyle(screen.getByRole('button'))
-  expect(button.backgroundColor).toBe('rgb(49, 108, 244)')
+  expect(button.backgroundColor).toBe('rgb(0, 122, 255)')
   expect(button.color).toBe('rgb(241, 249, 255)')
 })
diff --git a/{{cookiecutter.project_dirname}}/__tests__/pact/contracts/health.test.ts b/{{cookiecutter.project_dirname}}/__tests__/pact/contracts/health.test.ts
index d24cbf6..2fe7033 100644
--- a/{{cookiecutter.project_dirname}}/__tests__/pact/contracts/health.test.ts
+++ b/{{cookiecutter.project_dirname}}/__tests__/pact/contracts/health.test.ts
@@ -22,18 +22,16 @@ pactWith(pactConfig, interaction => {
         })
         .willRespondWith({
           contentType: 'application/json; charset=utf-8',
-          status: 200,
-          body: {
-            status: 'ok'
-          }
+          status: 204,
+          body: ''
         })
     })
     execute(interactionName, async mockServer => {
       const { data, status } = await healthCheck({
         baseUrl: mockServer.url
       })
-      expect(status).toBe(200)
-      expect(data).toEqual({ status: 'ok' })
+      expect(status).toBe(204)
+      expect(data).toEqual('')
     })
   })
 })
diff --git a/{{cookiecutter.project_dirname}}/__tests__/setupTests.ts b/{{cookiecutter.project_dirname}}/__tests__/setupTests.ts
index 264828a..2c9b6f7 100644
--- a/{{cookiecutter.project_dirname}}/__tests__/setupTests.ts
+++ b/{{cookiecutter.project_dirname}}/__tests__/setupTests.ts
@@ -1 +1 @@
-import '@testing-library/jest-dom/extend-expect'
+import '@testing-library/jest-dom/jest-globals'
diff --git a/{{cookiecutter.project_dirname}}/docker-compose.yaml b/{{cookiecutter.project_dirname}}/docker-compose.yaml
index 9601048..7c46c56 100644
--- a/{{cookiecutter.project_dirname}}/docker-compose.yaml
+++ b/{{cookiecutter.project_dirname}}/docker-compose.yaml
@@ -7,7 +7,7 @@ services:
       - NEXT_PUBLIC_PROJECT_URL=${NEXT_PUBLIC_PROJECT_URL:-https://localhost:8443}
       - REACT_ENVIRONMENT=${REACT_ENVIRONMENT:-development}
     healthcheck:
-      test: wget -O- -q http://localhost:3000/api/health/ || exit 1
+      test: wget -O- -q http://consumer:3000/api/health/ || exit 1
 
   provider:
     command: -p 8000 -d pacts -o --insecure-tls
diff --git a/{{cookiecutter.project_dirname}}/docker-compose/common.yaml b/{{cookiecutter.project_dirname}}/docker-compose/common.yaml
index ca98992..59f27c7 100644
--- a/{{cookiecutter.project_dirname}}/docker-compose/common.yaml
+++ b/{{cookiecutter.project_dirname}}/docker-compose/common.yaml
@@ -5,7 +5,7 @@ services:
   proxy:
     command:
       - "--configFile=/traefik/conf/static.yaml"
-    image: traefik:v2.6
+    image: traefik:v2.10
     networks:
       default:
         aliases:
diff --git a/{{cookiecutter.project_dirname}}/docker/cypress.Dockerfile b/{{cookiecutter.project_dirname}}/docker/cypress.Dockerfile
index 5e0d0c9..456e105 100644
--- a/{{cookiecutter.project_dirname}}/docker/cypress.Dockerfile
+++ b/{{cookiecutter.project_dirname}}/docker/cypress.Dockerfile
@@ -1,10 +1,8 @@
 # syntax=docker/dockerfile:1
 
-FROM cypress/base:18.16.1
+FROM cypress/base:18.6.0
 ARG USER=appuser
-ENV APPUSER=$USER \
-    CYPRESS_CACHE_FOLDER="/home/$USER/.cache/Cypress" \
-    PATH="$PATH:./node_modules/.bin"
+ENV APPUSER=$USER PATH="$PATH:./node_modules/.bin"
 WORKDIR /app
 RUN useradd --skel /dev/null --create-home $APPUSER
 RUN chown $APPUSER:$APPUSER /app
diff --git a/{{cookiecutter.project_dirname}}/docker/test.Dockerfile b/{{cookiecutter.project_dirname}}/docker/test.Dockerfile
index b870e5b..f51f381 100644
--- a/{{cookiecutter.project_dirname}}/docker/test.Dockerfile
+++ b/{{cookiecutter.project_dirname}}/docker/test.Dockerfile
@@ -1,8 +1,16 @@
 # syntax=docker/dockerfile:1
 
-FROM node:18-bookworm-slim
-ARG DEBIAN_FRONTEND=noninteractive USER=appuser
-ENV APPUSER=$USER LANG=C.UTF-8 LC_ALL=C.UTF-8 NEXT_TELEMETRY_DISABLED=1 NODE_ENV="development" PATH="$PATH:./node_modules/.bin" TZ='Europe/Rome' WORKDIR=/app
+FROM node:18-bullseye-slim
+ARG DEBIAN_FRONTEND=noninteractive GROUP_ID=1001 USER=appuser
+ENV APPUSER=$USER \
+    CYPRESS_CACHE_FOLDER="/tmp/.cache/Cypress" \
+    LANG=C.UTF-8 \
+    LC_ALL=C.UTF-8 \
+    NEXT_TELEMETRY_DISABLED=1 \
+    NODE_ENV="development" \
+    PATH="$PATH:./node_modules/.bin" \
+    TZ='Europe/Rome' \
+    WORKDIR=/app
 RUN apt-get update \
     && apt-get install --assume-yes --no-install-recommends \
         g++ \
@@ -10,11 +18,21 @@ RUN apt-get update \
         python3 \
     && rm -rf /var/lib/apt/lists/*
 WORKDIR $WORKDIR
-RUN addgroup --system --gid 1001 $APPUSER
-RUN adduser --system --uid 1001 $APPUSER
-RUN chown $APPUSER:$APPUSER $WORKDIR
-USER $APPUSER
-COPY --chown=$APPUSER ./scripts/test.sh jest.config.js middleware.ts next.config.js package.json tsconfig.json yarn.lock ./
+RUN addgroup --system --gid $GROUP_ID $APPUSER
+RUN adduser --system --uid $GROUP_ID $APPUSER
+RUN chown $GROUP_ID:$APPUSER $WORKDIR
+USER $GROUP_ID:$USER_ID
+COPY --chown=$APPUSER \
+    ./scripts/test.sh \
+    .eslintrc.json \
+    .prettierrc.json \
+    jest.config.js \
+    middleware.ts \
+    next.config.js \
+    package.json \
+    tsconfig.json \
+    yarn.lock \
+    ./
 ENTRYPOINT ["./test.sh"]
 CMD yarn ci:contract-test && yarn ci:unit-test
 LABEL company="20tab" project="{{ cookiecutter.project_slug }}" service="frontend" stage="test"