From 31d8767e2a69578c0f65282c2c53560590d01dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20D=C4=9Bdi=C4=8D?= <developer@dedic.eu>
Date: Sun, 22 Oct 2023 19:43:39 +0200
Subject: [PATCH] Moved frontend test job to playwright

---
 .github/workflows/CI.yml | 37 ++++++-------------------------------
 package.json             |  5 +----
 2 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 5e912e2e..d8a8763e 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -94,36 +94,6 @@ jobs:
   frontend-test:
     name: "Frontend test"
     runs-on: ubuntu-latest
-    steps:
-      - name: "Checkout"
-        uses: actions/checkout@v4.1.0
-
-      - name: "Cache NPM dependencies"
-        uses: actions/cache@v3.3.2
-        with:
-          path: "~/.npm"
-          key: npm-dependencies-${{ runner.os }}-${{ env.cache-version }}-${{ hashFiles('package.json') }}
-          restore-keys: |
-            npm-dependencies-${{ runner.os }}-${{ env.cache-version }}-${{ hashFiles('package.json') }}
-            npm-dependencies-${{ runner.os }}-${{ env.cache-version }}-
-            npm-dependencies-${{ runner.os }}-
-
-      - name: "Install NPM dependencies"
-        run: |
-          npm ci
-
-      - name: "Run tests"
-        run: |
-          npm run test:frontend
-
-      - name: "Upload coverage results"
-        uses: codecov/codecov-action@v3.1.4
-        with:
-          flags: frontend
-
-  frontend-test-playwright:
-    name: "Frontend test playwright"
-    runs-on: ubuntu-latest
     steps:
       - name: "Checkout"
         uses: actions/checkout@v4.1.0
@@ -167,7 +137,12 @@ jobs:
 
       - name: "Run tests"
         run: |
-          npm run _test:frontend-playwright
+          npm run test:frontend
+
+      - name: "Upload coverage results"
+        uses: codecov/codecov-action@v3.1.4
+        with:
+          flags: frontend
 
       - uses: actions/upload-artifact@v3
         if: always()
diff --git a/package.json b/package.json
index 0ba2a988..718142d5 100644
--- a/package.json
+++ b/package.json
@@ -84,10 +84,7 @@
     "lint": "run-s -c lint:*",
     "start": "webpack serve -c test.frontend.webpack.config.js --mode development --no-client-overlay",
     "test:backend": "jest",
-    "test:frontend:serve": "npm run start",
-    "test:frontend:cypress": "cypress run",
-    "test:frontend": "start-server-and-test test:frontend:serve http-get://localhost:8080 test:frontend:cypress",
-    "_test:frontend-playwright": "playwright test",
+    "test:frontend": "playwright test",
     "test": "run-p -c test:*"
   }
 }