From 39c2bf77c2afcafd7e84791cd0801715dab74006 Mon Sep 17 00:00:00 2001 From: pit Date: Thu, 12 Oct 2023 12:19:23 +0300 Subject: [PATCH] chore: implement feedback --- .github/workflows/e2e-tests.yml | 2 +- package-lock.json | 54 +++++++++++-------- packages/{web-tests => app-tests}/.gitignore | 0 .../e2e/test-auth-flow.spec.ts | 2 +- .../{web-tests => app-tests}/package.json | 0 .../playwright.config.ts | 0 packages/lib/server-only/user/delete-user.ts | 8 +-- 7 files changed, 38 insertions(+), 28 deletions(-) rename packages/{web-tests => app-tests}/.gitignore (100%) rename packages/{web-tests => app-tests}/e2e/test-auth-flow.spec.ts (98%) rename packages/{web-tests => app-tests}/package.json (100%) rename packages/{web-tests => app-tests}/playwright.config.ts (100%) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index f39e842d3..be4d611da 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -29,7 +29,7 @@ jobs: - name: Install dependencies run: npm ci - name: Copy env - run: cp .env.example .env + run: cp .env.example .env.local - name: Install Playwright Browsers run: npx playwright install --with-deps - name: Generate Prisma Client diff --git a/package-lock.json b/package-lock.json index 232176b22..82044e919 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1849,6 +1849,10 @@ "@jridgewell/sourcemap-codec": "^1.4.10" } }, + "node_modules/@documenso/app-tests": { + "resolved": "packages/app-tests", + "link": true + }, "node_modules/@documenso/ee": { "resolved": "packages/ee", "link": true @@ -19638,6 +19642,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/undici-types": { + "version": "5.25.3", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz", + "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==", + "dev": true + }, "node_modules/unified": { "version": "10.1.2", "resolved": "https://registry.npmjs.org/unified/-/unified-10.1.2.tgz", @@ -20090,10 +20100,6 @@ "node": ">= 8" } }, - "node_modules/web-tests": { - "resolved": "packages/web-tests", - "link": true - }, "node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", @@ -20326,6 +20332,28 @@ "url": "https://github.com/sponsors/wooorm" } }, + "packages/app-tests": { + "name": "@documenso/app-tests", + "version": "1.0.0", + "license": "to-update", + "dependencies": { + "start-server-and-test": "^2.0.1" + }, + "devDependencies": { + "@documenso/web": "*", + "@playwright/test": "^1.18.1", + "@types/node": "^20.8.2" + } + }, + "packages/app-tests/node_modules/@types/node": { + "version": "20.8.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.4.tgz", + "integrity": "sha512-ZVPnqU58giiCjSxjVUESDtdPk4QR5WQhhINbc9UBrKLU68MX5BF6kbQzTrkwbolyr0X8ChBpXfavr5mZFKZQ5A==", + "dev": true, + "dependencies": { + "undici-types": "~5.25.1" + } + }, "packages/ee": { "name": "@documenso/ee", "version": "1.0.0", @@ -20546,24 +20574,6 @@ "react": "18.2.0", "typescript": "^5.1.6" } - }, - "packages/web-tests": { - "version": "1.0.0", - "license": "ISC", - "dependencies": { - "start-server-and-test": "^2.0.1" - }, - "devDependencies": { - "@documenso/web": "*", - "@playwright/test": "^1.18.1", - "@types/node": "^20.8.2" - } - }, - "packages/web-tests/node_modules/@types/node": { - "version": "20.8.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.2.tgz", - "integrity": "sha512-Vvycsc9FQdwhxE3y3DzeIxuEJbWGDsnrxvMADzTDF/lcdR9/K+AQIeAghTQsHtotg/q0j3WEOYS/jQgSdWue3w==", - "dev": true } } } diff --git a/packages/web-tests/.gitignore b/packages/app-tests/.gitignore similarity index 100% rename from packages/web-tests/.gitignore rename to packages/app-tests/.gitignore diff --git a/packages/web-tests/e2e/test-auth-flow.spec.ts b/packages/app-tests/e2e/test-auth-flow.spec.ts similarity index 98% rename from packages/web-tests/e2e/test-auth-flow.spec.ts rename to packages/app-tests/e2e/test-auth-flow.spec.ts index 01f923c35..e486b2bd5 100644 --- a/packages/web-tests/e2e/test-auth-flow.spec.ts +++ b/packages/app-tests/e2e/test-auth-flow.spec.ts @@ -48,7 +48,7 @@ test('user can login with user and password', async ({ page }: { page: Page }) = test.afterAll('Teardown', async () => { try { - await deleteUser(username); + await deleteUser(email); } catch (e) { throw new Error(`Error deleting user: ${e}`); } diff --git a/packages/web-tests/package.json b/packages/app-tests/package.json similarity index 100% rename from packages/web-tests/package.json rename to packages/app-tests/package.json diff --git a/packages/web-tests/playwright.config.ts b/packages/app-tests/playwright.config.ts similarity index 100% rename from packages/web-tests/playwright.config.ts rename to packages/app-tests/playwright.config.ts diff --git a/packages/lib/server-only/user/delete-user.ts b/packages/lib/server-only/user/delete-user.ts index 901a8a3d7..c2a7089b5 100644 --- a/packages/lib/server-only/user/delete-user.ts +++ b/packages/lib/server-only/user/delete-user.ts @@ -1,16 +1,16 @@ import { prisma } from '@documenso/prisma'; -export const deleteUser = async (name: string) => { +export const deleteUser = async (email: string) => { const user = await prisma.user.findFirst({ where: { - name: { - contains: name, + email: { + contains: email, }, }, }); if (!user) { - throw new Error(`User with name ${name} not found`); + throw new Error(`User with email ${email} not found`); } return await prisma.user.delete({