From 4e43ac2d123fcff1cc32d9335d8063f75f69e1c2 Mon Sep 17 00:00:00 2001
From: Serkan Calis <serkancalis@gmail.com>
Date: Sun, 15 Sep 2024 03:56:23 +0300
Subject: [PATCH] move e2e-tests to pipeline

---
 .github/workflows/pipeline.yml   | 10 ++++++++++
 .github/workflows/playwright.yml | 28 ----------------------------
 app.js                           |  2 +-
 3 files changed, 11 insertions(+), 29 deletions(-)
 delete mode 100644 .github/workflows/playwright.yml

diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 3b220c2116..758ef8b26b 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -27,6 +27,16 @@ jobs:
         run: npm run build
       - name: Test
         run: npm run test
+      - name: Install Playwright Browsers
+        run: npx playwright install --with-deps
+      - name: Run Playwright tests
+        run: npx playwright test
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: playwright-report
+          path: playwright-report/
+          retention-days: 30
       - name: Deploy app
         if: ${{ env.SHOULD_DEPLOY == 'true' }}
         run: flyctl deploy --remote-only
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
deleted file mode 100644
index cab9070839..0000000000
--- a/.github/workflows/playwright.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Playwright Tests
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-    types: [opened, synchronize]
-jobs:
-  test:
-    timeout-minutes: 60
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: '20'
-    - name: Install dependencies
-      run: npm ci
-    - name: Install Playwright Browsers
-      run: npx playwright install --with-deps
-    - name: Run Playwright tests
-      run: npx playwright test
-    - uses: actions/upload-artifact@v4
-      if: always()
-      with:
-        name: playwright-report
-        path: playwright-report/
-        retention-days: 30
diff --git a/app.js b/app.js
index bb23249f74..671dcfda36 100644
--- a/app.js
+++ b/app.js
@@ -5,7 +5,7 @@ const app = express()
 const PORT = process.env.PORT || 5001
 
 app.get('/version', (req, res) => {
-  res.send('14')
+  res.send('21')
 })
 
 app.get('/health', (req, res) => {