From 63c2c4acf4627b62f2157cd7c51a849f9111d5b7 Mon Sep 17 00:00:00 2001 From: pit Date: Wed, 27 Sep 2023 09:51:30 +0100 Subject: [PATCH] chore: implemented feedback --- .env.example | 14 +++ .github/workflows/e2e-tests.yml | 4 +- apps/web/.env.example | 45 --------- apps/web/package.json | 4 +- apps/web/src/tests/e2e/auth.setup.ts | 4 +- .../test-auth-flow.unauthenticated.spec.ts | 4 +- .../test-documents-page.authenticated.spec.ts | 2 +- package-lock.json | 97 +++++++------------ package.json | 4 +- turbo.json | 2 +- 10 files changed, 60 insertions(+), 120 deletions(-) delete mode 100644 apps/web/.env.example diff --git a/.env.example b/.env.example index 3dc0985cb..076ead4b2 100644 --- a/.env.example +++ b/.env.example @@ -15,6 +15,20 @@ NEXT_PRIVATE_DATABASE_URL="postgres://documenso:password@127.0.0.1:54320/documen # Defines the URL to use for the database when running migrations and other commands that won't work with a connection pool. NEXT_PRIVATE_DIRECT_DATABASE_URL="postgres://documenso:password@127.0.0.1:54320/documenso" +# [[E2E Tests]] +E2E_TEST_SIGNER_NAME="Test Signer" +E2E_TEST_SIGNER_EMAIL="testsigner@mail.com" +E2E_TEST_SIGNING_SUBJECT="Test subject" +E2E_TEST_SIGNING_MESSAGE="Test message" +# User for the "auth.setup.ts" file and the authenticated tests +E2E_TEST_AUTHENTICATE_USERNAME="New user" +E2E_TEST_AUTHENTICATE_USER_EMAIL="mytestnewuser@mail.com" +E2E_TEST_AUTHENTICATE_USER_PASSWORD="new_test_password" +# User for the *.unauthenticated.ts files +E2E_TEST_USERNAME="Test" +E2E_TEST_USER_EMAIL="mytestuser@mail.com" +E2E_TEST_USER_PASSWORD="test_password" + # [[STORAGE]] # OPTIONAL: Defines the storage transport to use. Available options: database (default) | s3 NEXT_PUBLIC_UPLOAD_TRANSPORT="database" diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 3157937c6..0bb02f897 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -13,10 +13,12 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 18 + - name: Generate package-lock.json + run: npm install - name: Install dependencies run: npm ci - name: Copy env - run: cp ./apps/web/.env.example .env + run: cp .env.example .env - name: Build run: npm run build - name: Install Playwright Browsers diff --git a/apps/web/.env.example b/apps/web/.env.example deleted file mode 100644 index 633e85a88..000000000 --- a/apps/web/.env.example +++ /dev/null @@ -1,45 +0,0 @@ -# [[E2E Tests]] -E2E_TEST_SIGNER_NAME="Test Signer" -E2E_TEST_SIGNER_EMAIL="testsigner@mail.com" -E2E_TEST_SIGNING_SUBJECT="Test subject" -E2E_TEST_SIGNING_MESSAGE="Test message" -# User for the "auth.setup.ts" file and the authenticated tests -E2E_TEST_AUTHENTICATE_USERNAME="New user" -E2E_TEST_AUTHENTICATE_USER_EMAIL="mytestnewuser@mail.com" -E2E_TEST_AUTHENTICATE_USER_PASSWORD="new_test_password" -# User for the *.unauthenticated.ts files -E2E_TEST_USERNAME="Test" -E2E_TEST_USER_EMAIL="mytestuser@mail.com" -E2E_TEST_USER_PASSWORD="test_password" - -# [[SMTP]] -# OPTIONAL: Defines the transport to use for sending emails. Available options: smtp-auth (default) | smtp-api | mailchannels -NEXT_PRIVATE_SMTP_TRANSPORT="smtp-auth" -# OPTIONAL: Defines the host to use for sending emails. -NEXT_PRIVATE_SMTP_HOST="127.0.0.1" -# OPTIONAL: Defines the port to use for sending emails. -NEXT_PRIVATE_SMTP_PORT=2500 -# OPTIONAL: Defines the username to use with the SMTP server. -NEXT_PRIVATE_SMTP_USERNAME="documenso" -# OPTIONAL: Defines the password to use with the SMTP server. -NEXT_PRIVATE_SMTP_PASSWORD="password" -# OPTIONAL: Defines the API key user to use with the SMTP server. -NEXT_PRIVATE_SMTP_APIKEY_USER= -# OPTIONAL: Defines the API key to use with the SMTP server. -NEXT_PRIVATE_SMTP_APIKEY= -# OPTIONAL: Defines whether to force the use of TLS. -NEXT_PRIVATE_SMTP_SECURE= -# REQUIRED: Defines the sender name to use for the from address. -NEXT_PRIVATE_SMTP_FROM_NAME="No Reply @ Documenso" -# REQUIRED: Defines the email address to use as the from address. -NEXT_PRIVATE_SMTP_FROM_ADDRESS="noreply@documenso.com" -# OPTIONAL: The API key to use for the MailChannels proxy endpoint. -NEXT_PRIVATE_MAILCHANNELS_API_KEY= -# OPTIONAL: The endpoint to use for the MailChannels API if using a proxy. -NEXT_PRIVATE_MAILCHANNELS_ENDPOINT= -# OPTIONAL: The domain to use for DKIM signing. -NEXT_PRIVATE_MAILCHANNELS_DKIM_DOMAIN= -# OPTIONAL: The selector to use for DKIM signing. -NEXT_PRIVATE_MAILCHANNELS_DKIM_SELECTOR= -# OPTIONAL: The private key to use for DKIM signing. -NEXT_PRIVATE_MAILCHANNELS_DKIM_PRIVATE_KEY= diff --git a/apps/web/package.json b/apps/web/package.json index 0e68a2759..2828b60f0 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -8,8 +8,8 @@ "build": "next build", "start": "next start", "lint": "next lint", - "dev:test": "playwright test", - "e2e:test": "start-server-and-test \"npm run start\" http://localhost:3000 \"playwright test\"", + "test:dev": "playwright test", + "test:e2e": "start-server-and-test \"npm run start\" http://localhost:3000 \"playwright test\"", "clean": "rimraf .next && rimraf node_modules", "copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs" }, diff --git a/apps/web/src/tests/e2e/auth.setup.ts b/apps/web/src/tests/e2e/auth.setup.ts index 1a3d3b1c8..c3848a227 100644 --- a/apps/web/src/tests/e2e/auth.setup.ts +++ b/apps/web/src/tests/e2e/auth.setup.ts @@ -10,7 +10,7 @@ setup('authenticate', async ({ page }: { page: Page }) => { await page.goto('/signup'); await page.getByLabel('Name').fill(username); await page.getByLabel('Email').fill(email); - await page.getByLabel('Password').fill(password); + await page.getByLabel('Password', { exact: true }).fill(password); const canvas = page.locator('canvas'); const box = await canvas.boundingBox(); @@ -26,7 +26,7 @@ setup('authenticate', async ({ page }: { page: Page }) => { await page.goto('/'); await page.getByLabel('Email').fill(email); - await page.getByLabel('Password').fill(password); + await page.getByLabel('Password', { exact: true }).fill(password); await page.getByRole('button', { name: 'Sign In' }).click(); await expect(page).toHaveURL('/documents'); diff --git a/apps/web/src/tests/e2e/test-auth-flow.unauthenticated.spec.ts b/apps/web/src/tests/e2e/test-auth-flow.unauthenticated.spec.ts index 5c22e595f..22bf76bca 100644 --- a/apps/web/src/tests/e2e/test-auth-flow.unauthenticated.spec.ts +++ b/apps/web/src/tests/e2e/test-auth-flow.unauthenticated.spec.ts @@ -16,7 +16,7 @@ test('user can sign up with email and password', async ({ page }: { page: Page } await page.goto('/signup'); await page.getByLabel('Name').fill(username); await page.getByLabel('Email').fill(email); - await page.getByLabel('Password').fill(password); + await page.getByLabel('Password', { exact: true }).fill(password); const canvas = page.locator('canvas'); const box = await canvas.boundingBox(); @@ -37,7 +37,7 @@ test('user can sign up with email and password', async ({ page }: { page: Page } test('user can login with user and password', async ({ page }: { page: Page }) => { await page.goto('/signin'); await page.getByLabel('Email').fill(email); - await page.getByLabel('Password').fill(password); + await page.getByLabel('Password', { exact: true }).fill(password); await page.getByRole('button', { name: 'Sign In' }).click(); await page.waitForURL('/documents'); diff --git a/apps/web/src/tests/e2e/test-documents-page.authenticated.spec.ts b/apps/web/src/tests/e2e/test-documents-page.authenticated.spec.ts index 0aec3ae9d..13aa0991c 100644 --- a/apps/web/src/tests/e2e/test-documents-page.authenticated.spec.ts +++ b/apps/web/src/tests/e2e/test-documents-page.authenticated.spec.ts @@ -22,7 +22,7 @@ test.describe('Document upload test', () => { }); test('user can upload a document succesfully', async ({ page }) => { - await expect(page.locator('canvas')).toBeVisible(); + await expect(page.getByText('Drag & drop your document here.')).toBeVisible(); }); test('user can send the document for signing succesfully', async ({ documentsPage, page }) => { diff --git a/package-lock.json b/package-lock.json index f40687ca2..786561e6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -98,6 +98,7 @@ "react-icons": "^4.8.0", "react-rnd": "^10.4.1", "sharp": "0.32.5", + "start-server-and-test": "^2.0.1", "ts-pattern": "^5.0.5", "typescript": "5.1.6", "zod": "^3.21.4" @@ -108,8 +109,7 @@ "@types/luxon": "^3.3.1", "@types/node": "20.1.0", "@types/react": "18.2.18", - "@types/react-dom": "18.2.7", - "start-server-and-test": "^2.0.1" + "@types/react-dom": "18.2.7" } }, "apps/web/node_modules/ts-pattern": { @@ -2455,14 +2455,12 @@ "node_modules/@hapi/hoek": { "version": "9.3.0", "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", - "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==", - "dev": true + "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" }, "node_modules/@hapi/topo": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", - "dev": true, "dependencies": { "@hapi/hoek": "^9.0.0" } @@ -3804,12 +3802,12 @@ } }, "node_modules/@playwright/test": { - "version": "1.38.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.38.0.tgz", - "integrity": "sha512-xis/RXXsLxwThKnlIXouxmIvvT3zvQj1JE39GsNieMUrMpb3/GySHDh2j8itCG22qKVD4MYLBp7xB73cUW/UUw==", + "version": "1.38.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.38.1.tgz", + "integrity": "sha512-NqRp8XMwj3AK+zKLbZShl0r/9wKgzqI/527bkptKXomtuo+dOjU9NdMASQ8DNC9z9zLOMbG53T4eihYr3XR+BQ==", "dev": true, "dependencies": { - "playwright": "1.38.0" + "playwright": "1.38.1" }, "bin": { "playwright": "cli.js" @@ -5471,7 +5469,6 @@ "version": "4.1.4", "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz", "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==", - "dev": true, "dependencies": { "@hapi/hoek": "^9.0.0" } @@ -5479,14 +5476,12 @@ "node_modules/@sideway/formula": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz", - "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==", - "dev": true + "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==" }, "node_modules/@sideway/pinpoint": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", - "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==", - "dev": true + "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" }, "node_modules/@sindresorhus/slugify": { "version": "2.2.1", @@ -7323,16 +7318,9 @@ } }, "node_modules/bluebird": { -<<<<<<< HEAD - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", - "dev": true -======= "version": "3.4.7", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz", "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==" ->>>>>>> feat/refresh }, "node_modules/bowser": { "version": "2.11.0", @@ -7683,7 +7671,6 @@ "version": "2.24.0", "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz", "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==", - "dev": true, "engines": { "node": ">= 0.8.0" } @@ -9193,13 +9180,11 @@ "node": ">=12" } }, -<<<<<<< HEAD "node_modules/duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", - "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", - "dev": true -======= + "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==" + }, "node_modules/duplexer2": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", @@ -9239,7 +9224,6 @@ "dependencies": { "safe-buffer": "~5.1.0" } ->>>>>>> feat/refresh }, "node_modules/duplexify": { "version": "3.7.1", @@ -10409,7 +10393,6 @@ "version": "3.3.4", "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==", - "dev": true, "dependencies": { "duplexer": "~0.1.1", "from": "~0", @@ -10822,8 +10805,7 @@ "node_modules/from": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", - "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==", - "dev": true + "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==" }, "node_modules/fs-constants": { "version": "1.0.0", @@ -12258,22 +12240,22 @@ "jiti": "bin/jiti.js" } }, + "node_modules/jju": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", + "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==" + }, "node_modules/joi": { "version": "17.10.2", "resolved": "https://registry.npmjs.org/joi/-/joi-17.10.2.tgz", "integrity": "sha512-hcVhjBxRNW/is3nNLdGLIjkgXetkeGc2wyhydhz8KumG23Aerk4HPjU5zaPAMRqXQFc0xNqXTC7+zQjxr0GlKA==", - "dev": true, "dependencies": { "@hapi/hoek": "^9.0.0", "@hapi/topo": "^5.0.0", "@sideway/address": "^4.1.3", "@sideway/formula": "^3.0.1", "@sideway/pinpoint": "^2.0.0" - }, - "node_modules/jju": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/jju/-/jju-1.4.0.tgz", - "integrity": "sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==" + } }, "node_modules/jose": { "version": "4.14.4", @@ -12513,7 +12495,6 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz", "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==", - "dev": true, "engines": { "node": "> 0.8" } @@ -13068,8 +13049,7 @@ "node_modules/map-stream": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", - "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==", - "dev": true + "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==" }, "node_modules/markdown-extensions": { "version": "1.1.1", @@ -15128,7 +15108,6 @@ "version": "0.0.11", "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==", - "dev": true, "dependencies": { "through": "~2.3" } @@ -15232,12 +15211,12 @@ } }, "node_modules/playwright": { - "version": "1.38.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.38.0.tgz", - "integrity": "sha512-fJGw+HO0YY+fU/F1N57DMO+TmXHTrmr905J05zwAQE9xkuwP/QLDk63rVhmyxh03dYnEhnRbsdbH9B0UVVRB3A==", + "version": "1.38.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.38.1.tgz", + "integrity": "sha512-oRMSJmZrOu1FP5iu3UrCx8JEFRIMxLDM0c/3o4bpzU5Tz97BypefWf7TuTNPWeCe279TPal5RtPPZ+9lW/Qkow==", "dev": true, "dependencies": { - "playwright-core": "1.38.0" + "playwright-core": "1.38.1" }, "bin": { "playwright": "cli.js" @@ -15250,9 +15229,9 @@ } }, "node_modules/playwright-core": { - "version": "1.38.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.0.tgz", - "integrity": "sha512-f8z1y8J9zvmHoEhKgspmCvOExF2XdcxMW8jNRuX4vkQFrzV4MlZ55iwb5QeyiFQgOFCUolXiRHgpjSEnqvO48g==", + "version": "1.38.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.1.tgz", + "integrity": "sha512-tQqNFUKa3OfMf4b2jQ7aGLB8o9bS3bOY0yMEtldtC2+spf8QXG9zvXLTXUeRsoNuxEYMgLYR+NXfAa1rjKRcrg==", "dev": true, "bin": { "playwright-core": "cli.js" @@ -15815,7 +15794,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz", "integrity": "sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==", - "dev": true, "dependencies": { "event-stream": "=3.3.4" }, @@ -17450,7 +17428,6 @@ "version": "7.8.1", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", - "dev": true, "dependencies": { "tslib": "^2.1.0" } @@ -17834,7 +17811,6 @@ "version": "0.3.3", "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==", - "dev": true, "dependencies": { "through": "2" }, @@ -17877,7 +17853,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-2.0.1.tgz", "integrity": "sha512-8PFo4DLLLCDMuS51/BEEtE1m9CAXw1LNVtZSS1PzkYQh6Qf9JUwM4huYeSoUumaaoAyuwYBwCa9OsrcpMqcOdQ==", - "dev": true, "dependencies": { "arg": "^5.0.2", "bluebird": "3.7.2", @@ -17900,14 +17875,17 @@ "node_modules/start-server-and-test/node_modules/arg": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", - "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", - "dev": true + "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==" + }, + "node_modules/start-server-and-test/node_modules/bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" }, "node_modules/start-server-and-test/node_modules/execa": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", - "dev": true, "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", @@ -17930,7 +17908,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", - "dev": true, "engines": { "node": ">=10.17.0" } @@ -17939,7 +17916,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true, "engines": { "node": ">=8" }, @@ -17951,7 +17927,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true, "engines": { "node": ">=6" } @@ -17960,7 +17935,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, "dependencies": { "path-key": "^3.0.0" }, @@ -17972,7 +17946,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, "dependencies": { "mimic-fn": "^2.1.0" }, @@ -17987,7 +17960,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true, "engines": { "node": ">=6" } @@ -18004,7 +17976,6 @@ "version": "0.0.4", "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==", - "dev": true, "dependencies": { "duplexer": "~0.1.1" } @@ -18554,8 +18525,7 @@ "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==" }, "node_modules/through2": { "version": "4.0.2", @@ -19820,7 +19790,6 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-7.0.1.tgz", "integrity": "sha512-9AnJE9qTjRQOlTZIldAaf/da2eW0eSRSgcqq85mXQja/DW3MriHxkpODDSUEg+Gri/rKEcXUZHe+cevvYItaog==", - "dev": true, "dependencies": { "axios": "^0.27.2", "joi": "^17.7.0", diff --git a/package.json b/package.json index 3c000a244..62bfc8fc7 100644 --- a/package.json +++ b/package.json @@ -4,12 +4,12 @@ "build": "turbo run build", "dev": "turbo run dev --filter=@documenso/web --filter=@documenso/marketing", "start": "cd apps && cd web && next start", - "test": "cd apps && cd web && npm run test", + "test": "cd apps && cd web && npm run test:e2e", "lint": "turbo run lint", "format": "prettier --write \"**/*.{js,jsx,cjs,mjs,ts,tsx,cts,mts,mdx}\"", "prepare": "husky install", "commitlint": "commitlint --edit", - "ci": "turbo run build e2e:test lint", + "ci": "turbo run build test:e2e lint", "clean": "turbo run clean && rimraf node_modules" }, "engines": { diff --git a/turbo.json b/turbo.json index 7d2159972..39a67a363 100644 --- a/turbo.json +++ b/turbo.json @@ -13,7 +13,7 @@ "cache": false, "persistent": true }, - "e2e:test": { + "test:e2e": { "dependsOn": ["^build"] } },