Feature/bruno playwright containerized

cms/package.json

@@ -5,8 +5,6 @@
   "description": "A Strapi application",
   "scripts": {
     "build": "strapi build",
-    "bru-local": "cd tests/bruno-cms-collection/ && bru run --env local-environment",
-    "bru-prod": "cd tests/bruno-cms-collection/ && bru run --env prod-environment",
     "deploy": "strapi deploy",
     "develop": "strapi develop",
     "develop:watch": "npm run develop -- --watch-admin",
@@ -21,7 +19,6 @@
     "@strapi/plugin-graphql": "^5.8.1",
     "@strapi/plugin-users-permissions": "5.1.0",
     "@strapi/strapi": "5.1.0",
-    "@usebruno/cli": "^1.36.3",
     "cheerio": "^1.0.0",
     "fs-extra": "^10.1.0",
     "mime": "^2.6.0",
@@ -33,7 +30,6 @@
     "styled-components": "^6.0.0"
   },
   "devDependencies": {
-    "@playwright/test": "^1.49.1",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^20",
     "@types/react": "^18",

dev-config/Dockerfile.cms

@@ -24,4 +24,4 @@ RUN echo "ls -la"
 RUN ls -la /usr/app
 
 RUN bash -c "chmod 777 run.sh;"
-CMD bash -c "./run-tests.sh docker & ./run.sh"
+CMD bash -c "./run.sh"

dev-config/Dockerfile.frontend.dev

@@ -7,11 +7,10 @@ FROM node:18-alpine
 WORKDIR /app
 
 # Install bash and curl
-RUN apk add --no-cache bash curl
+RUN apk add --no-cache bash
 
 # Install dependencies based on the preferred package manager
 COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* .npmrc* ./
-RUN npm install -g @usebruno/cli@1.38.1
 
 RUN npm ci --include=optional sharp
 
@@ -23,9 +22,7 @@ COPY src ./src
 COPY public ./public
 COPY next.config.ts .
 COPY tsconfig.json .
-COPY tests ./tests
 COPY run.sh ./
-COPY run-tests.sh ./
 
 # Next.js collects completely anonymous telemetry data about general usage. Learn more here: https://nextjs.org/telemetry
 # Uncomment the following line to disable telemetry at run time
@@ -36,7 +33,11 @@ COPY run-tests.sh ./
 # Start Next.js in development mode based on the preferred package manager
 
 RUN chmod +x ./run.sh
-RUN chmod +x ./run-tests.sh
 
 # Start Next.js in development mode after running tests
-CMD bash -c "./run-tests.sh docker & ./run.sh"
+CMD \
+  if [ -f yarn.lock ]; then yarn dev; \
+  elif [ -f package-lock.json ]; then npm run dev; \
+  elif [ -f pnpm-lock.yaml ]; then pnpm dev; \
+  else npm run dev; \
+  fi

dev-config/Dockerfile.frontend.prod

@@ -37,8 +37,7 @@ RUN npm run build
 # Production image, copy all the files and run next
 FROM base AS runner
 WORKDIR /app
-RUN apk add --no-cache bash curl
-RUN npm install -g @usebruno/cli@1.38.1
+RUN apk add --no-cache bash
 
 # Uncomment the following line in case you want to disable telemetry during runtime.
 # ENV NEXT_TELEMETRY_DISABLED=1
@@ -53,15 +52,12 @@ COPY --from=builder /app/public ./public
 COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
 
-COPY tests ./tests
 COPY run.sh ./
-COPY run-tests.sh ./
 
 RUN chmod +x ./run.sh
-RUN chmod +x ./run-tests.sh
 
 USER nextjs
 
 RUN ls -la /app
 
-CMD bash -c "./run-tests.sh docker & ./run.sh"
+CMD ["node", "server.js"]

dev-config/Dockerfile.tests

@@ -0,0 +1,31 @@
+FROM node:18
+
+WORKDIR /tests
+
+# For temp files e.g. test-reports
+RUN mkdir -p /tests/tmp
+
+COPY package*.json ./
+
+RUN echo "ls -la"
+RUN ls -la /tests
+RUN echo "COPY . ."
+COPY . .
+
+# Add a step to remove node_modules if it was accidentally copied
+RUN echo "rm -rf node_*****modules"
+RUN rm -rf node_modules
+
+RUN echo "ls -la"
+RUN ls -la /tests
+RUN npm ci
+
+RUN npm install -g @usebruno/cli@1.38.3
+# install only chrome for now to reduce image size
+RUN npx npx playwright install --only-shell --with-deps chromium
+
+RUN echo "ls -la"
+RUN ls -la /tests
+
+RUN bash -c "chmod +x run-tests.sh;"
+CMD bash -c "./run-tests.sh docker"

dev-config/docker-compose.yml

@@ -80,7 +80,18 @@ services:
       - db:/var/lib/postgresql/data
     networks:
       - strapi
-
+  tests:
+    tty: true
+    build:
+      context: ../tests
+      dockerfile: ../dev-config/Dockerfile.tests
+    environment:
+      NODE_ENV: ${NODE_ENV}
+      PROD_FRONT_URL: ${PROD_FRONT_URL}
+      PROD_STRAPI_URL: ${PROD_STRAPI_URL}
+    networks:
+      - strapi
+
 networks:
   strapi:
 volumes:

frontend/package.json

@@ -8,8 +8,6 @@
     "start": "next start",
     "lint": "next lint",
     "lint:fix": "next lint --fix",
-    "bru-local": "cd tests/bruno-frontend-collection/ && bru run --env local-environment",
-    "bru-prod": "cd tests/bruno-frontend-collection/ && bru run --env prod-environment",
     "gen:be-types": "graphql-codegen"
   },
   "dependencies": {
@@ -27,7 +25,6 @@
     "@graphql-codegen/cli": "^5.0.3",
     "@graphql-codegen/typescript": "^4.1.2",
     "@graphql-codegen/typescript-resolvers": "^4.4.1",
-    "@playwright/test": "^1.49.1",
     "@strapi/types": "^5.8.0",
     "@strapi/utils": "^5.8.1",
     "@svgr/webpack": "^8.1.0",
@@ -39,4 +36,4 @@
     "eslint-config-next": "15.1.3",
     "typescript": "^5"
   }
-}
+}