export prisma client from server

.github/workflows/e2e-tests.yml

@@ -41,19 +41,14 @@ jobs:
           cd app
           cp .env.server.example .env.server
 
-      - name: Install Playwright tests
-        run: |
-          cd app
-          npm install @playwright/test
-
       - name: Set up Playwright
         run: |
-          cd app
+          cd ../e2e-tests
           npx playwright install --with-deps
 
       - name: Run Playwright tests
         env:
           OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
         run: |
           cd app
-          DEBUG=pw:webserver npx playwright test e2e-tests
+          DEBUG=pw:webserver npx playwright test

app/package.json

@@ -1,8 +1,6 @@
 {
   "name": "opensaas",
-  "scripts": {
-
-  },
+  "scripts": {},
   "dependencies": {
     "@aws-sdk/client-s3": "^3.523.0",
     "@aws-sdk/s3-request-presigner": "^3.523.0",
@@ -29,7 +27,6 @@
     "zod": "3.22.4"
   },
   "devDependencies": {
-    "@playwright/test": "^1.42.0",
     "@types/express": "^4.17.13",
     "@types/node": "^18.0.0",
     "@types/react": "^18.0.37",
@@ -38,4 +35,4 @@
     "typescript": "^5.1.0",
     "vite": "^4.3.9"
   }
-}
+}

app/src/server/utils.ts

@@ -0,0 +1,3 @@
+import { PrismaClient } from '@prisma/client';
+
+export const prisma = new PrismaClient();

e2e-tests/package.json

@@ -0,0 +1,21 @@
+{
+  "name": "e2e-tests",
+  "version": "1.0.0",
+  "description": "e2e-tests for opensaas.sh",
+  "main": "ci-start-app.js",
+  "directories": {
+    "test": "tests"
+  },
+  "scripts": {
+    "test": "npx playwright test"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@playwright/test": "^1.42.1"
+  },
+  "devDependencies": {
+    "@types/node": "^18.0.0",
+    "prisma": "^5.11.0"
+  }
+}

e2e-tests/playwright.config.ts

@@ -10,11 +10,8 @@ import { defineConfig, devices } from '@playwright/test';
  * See https://playwright.dev/docs/test-configuration.
  */
 export default defineConfig({
-  testDir: './playwright/tests',
-  outputDir: './playwright/test-results',
-  // put playwright-report in the playwright folder
-  reporter: [['html', { outputFolder: 'playwright/reports' }]],
-  // reporter: [['html', { outputFolder: 'playwright/reports' }]],
+  testDir: './tests',
+  outputDir: './test-results',
   /* Run tests in files in parallel */
   fullyParallel: true,
   /* Fail the build on CI if you accidentally left test.only in the source code. */

e2e-tests/tests/paidUserTests.spec.ts

@@ -30,15 +30,17 @@ test('Demo App: add tasks & generate schedule', async ({ loggedInPage }) => {
   expect(generateScheduleButton).toBeTruthy();
 
   await Promise.all([
-    loggedInPage.waitForRequest(
-      (req) => req.url().includes('operations/generate-gpt-response') && req.method() === 'POST'
-    ),
-    loggedInPage.waitForResponse((response) => {
-      if (response.url().includes('/operations/generate-gpt-response') && response.status() === 200) {
-        return true;
-      }
-      return false;
-    }),
+    loggedInPage
+      .waitForRequest((req) => req.url().includes('operations/generate-gpt-response') && req.method() === 'POST')
+      .catch((err) => console.error(err.message)),
+    loggedInPage
+      .waitForResponse((response) => {
+        if (response.url().includes('/operations/generate-gpt-response') && response.status() === 200) {
+          return true;
+        }
+        return false;
+      })
+      .catch((err) => console.error(err.message)),
     // We already started waiting before we perform the click that triggers the API calls. So now we just perform the click
     generateScheduleButton.click(),
   ]);

e2e-tests/tests/utils.ts

@@ -1,9 +1,7 @@
 import { test as base, type Page } from '@playwright/test';
-import { PrismaClient } from '@prisma/client';
+import { prisma } from '../../app/src/server/utils';
 import { randomUUID } from 'crypto';
 
-export const prisma = new PrismaClient();
-
 export type User = {
   id?: number;
   username: string;