ktl-744 chore: rework e2e tests env due to networking problems

Author: nikpachoo

docker-compose.yml

@@ -12,16 +12,3 @@ services:
       - ./:/var/www
     environment:
       - PYTHONUNBUFFERED=1
-  e2e-tests:
-    build:
-      dockerfile: dockerfiles/e2e-tests/Dockerfile
-      context: .
-    volumes:
-      - ./:/var/www
-    working_dir: /var/www
-    environment:
-      - BASE_URL=http://app:8080
-      - ipc=host
-    depends_on:
-      - app
-

dockerfiles/e2e-tests/Dockerfile

@@ -1,12 +1,23 @@
 FROM mcr.microsoft.com/playwright:v1.22.2-focal
 
+RUN apt-get update
+RUN apt-get -y install python3.8 python3-pip git ruby-dev
+
+RUN gem install kramdown -v 1.14.0
+
 WORKDIR /var/www
 
-COPY package.json yarn.lock ./
+COPY requirements.txt ./
+RUN pip install -r requirements.txt
 
+COPY package.json yarn.lock ./
 RUN yarn install --frozen-lockfile
 
 COPY playwright.config.js .
-COPY test test
+COPY . .
+
+RUN yarn build
+
+EXPOSE 8080
 
-ENTRYPOINT ["tail", "-f", "/dev/null"]
+ENTRYPOINT ["python3.8", "kotlin-website.py"]

playwright.config.js

@@ -8,6 +8,7 @@ const config = {
     use: {
         baseURL: process.env.BASE_URL || 'http://localhost:9000',
         trace: 'off',
+        ignoreHTTPSErrors: true,
     },
     projects: [
         {
@@ -16,12 +17,6 @@ const config = {
                 ...devices['Desktop Chrome'],
             },
         },
-        {
-            name: 'webkit',
-            use: {
-                ...devices['iPhone SE'],
-            },
-        }
     ],
 };
 

scripts/test/run-e2e.sh

@@ -8,6 +8,4 @@ echo "Waiting for the $BASE_URL response"
 
 ./scripts/test/wait-for-endpoint.sh "$BASE_URL"
 
-echo "The connection established"
-
 yarn run test:e2e:ci

scripts/test/run.sh

@@ -2,9 +2,10 @@
 set -e
 set +x
 set -o pipefail
+set -u
 
 cd "$(pwd)" || exit 1
 
-APP_CONTAINER_NAME="$(docker ps --format "{{.Names}}" --filter="name=_e2e-tests_")"
+APP_CONTAINER_NAME="kotlin-web-site_test-app"
 
 docker exec -i "$APP_CONTAINER_NAME" /bin/bash -c "./scripts/test/run-e2e.sh"

scripts/test/stop.sh

@@ -2,5 +2,9 @@
 set -e
 set +x
 set -o pipefail
+set -u
 
-docker-compose stop
+APP_CONTAINER_NAME="kotlin-web-site_test-app"
+
+docker stop "$APP_CONTAINER_NAME"
+docker rm "$APP_CONTAINER_NAME"

scripts/test/up.sh

@@ -1,6 +1,13 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 set +x
 set -o pipefail
+set -u
 
-docker-compose up -d --build
+cd "$(pwd)" || exit 1
+
+APP_CONTAINER_NAME="kotlin-web-site_test-app"
+
+docker build -t "$APP_CONTAINER_NAME" -f ./dockerfiles/e2e-tests/Dockerfile .
+
+docker run -d -p 8080:8080 -e BASE_URL=http://localhost:8080 -e ipc=host --name "$APP_CONTAINER_NAME" "$APP_CONTAINER_NAME"

scripts/test/wait-for-endpoint.sh

@@ -3,7 +3,6 @@
 # Waits until request to given URI returns 200 or timeout threshold is reached.
 # Can be given a command to run when done waiting.
 #
-
 SCRIPT_NAME=${0##*/}
 
 echoerr() { if [[ $QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }