diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e6f5f420b..c8ad95f9b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -515,7 +515,7 @@ jobs: if: steps.playwright-cache.outputs.cache-hit == 'true' run: npx playwright install-deps - - run: yarn nx run @tryghost/admin-x-settings:test:e2e + - run: yarn nx run @tryghost/admin-x-settings:test:acceptance - name: Upload test results if: always() diff --git a/apps/admin-x-settings/package.json b/apps/admin-x-settings/package.json index 3549ca0631..608a249c9e 100644 --- a/apps/admin-x-settings/package.json +++ b/apps/admin-x-settings/package.json @@ -31,9 +31,9 @@ "lint": "yarn run lint:js", "lint:js": "eslint --ext .js,.ts,.cjs,.tsx --cache src test", "test:unit": "yarn build && vitest run", - "test:e2e": "NODE_OPTIONS='--experimental-specifier-resolution=node --no-warnings' VITE_TEST=true playwright test", - "test:slowmo": "TIMEOUT=100000 PLAYWRIGHT_SLOWMO=100 yarn test:e2e --headed", - "test:e2e:full": "ALL_BROWSERS=1 yarn test:e2e", + "test:acceptance": "NODE_OPTIONS='--experimental-specifier-resolution=node --no-warnings' VITE_TEST=true playwright test", + "test:slowmo": "TIMEOUT=100000 PLAYWRIGHT_SLOWMO=100 yarn test:acceptance --headed", + "test:acceptance:full": "ALL_BROWSERS=1 yarn test:acceptance", "preview": "vite preview", "storybook": "storybook dev -p 6006", "build-storybook": "storybook build" diff --git a/apps/admin-x-settings/playwright.config.ts b/apps/admin-x-settings/playwright.config.ts index c25994f1fc..510f2ac1b5 100644 --- a/apps/admin-x-settings/playwright.config.ts +++ b/apps/admin-x-settings/playwright.config.ts @@ -6,7 +6,7 @@ export const E2E_PORT = 5173; * See https://playwright.dev/docs/test-configuration. */ export default defineConfig({ - testDir: './test/e2e', + testDir: './test/acceptance', /* Run tests in files in parallel */ fullyParallel: true, /* Fail the build on CI if you accidentally left test.only in the source code. */ diff --git a/apps/admin-x-settings/test/e2e/advanced/codeInjection.test.ts b/apps/admin-x-settings/test/acceptance/advanced/codeInjection.test.ts similarity index 99% rename from apps/admin-x-settings/test/e2e/advanced/codeInjection.test.ts rename to apps/admin-x-settings/test/acceptance/advanced/codeInjection.test.ts index b95679e056..bd544a9193 100644 --- a/apps/admin-x-settings/test/e2e/advanced/codeInjection.test.ts +++ b/apps/admin-x-settings/test/acceptance/advanced/codeInjection.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/e2e'; +import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/acceptance'; // CodeMirror takes some time to load in Playwright meaning the first few characters typed don't always // show up in the input. Since that lag is not consistent, this workaround ensures we type enough diff --git a/apps/admin-x-settings/test/e2e/advanced/history.test.ts b/apps/admin-x-settings/test/acceptance/advanced/history.test.ts similarity index 98% rename from apps/admin-x-settings/test/e2e/advanced/history.test.ts rename to apps/admin-x-settings/test/acceptance/advanced/history.test.ts index 61aeb62d02..d327d620a6 100644 --- a/apps/admin-x-settings/test/e2e/advanced/history.test.ts +++ b/apps/admin-x-settings/test/acceptance/advanced/history.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, responseFixtures} from '../../utils/e2e'; +import {globalDataRequests, mockApi, responseFixtures} from '../../utils/acceptance'; test.describe('History', async () => { test('Browsing history', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/advanced/integrations/amp.test.ts b/apps/admin-x-settings/test/acceptance/advanced/integrations/amp.test.ts similarity index 97% rename from apps/admin-x-settings/test/e2e/advanced/integrations/amp.test.ts rename to apps/admin-x-settings/test/acceptance/advanced/integrations/amp.test.ts index b1af72e65a..8b0d728fd2 100644 --- a/apps/admin-x-settings/test/e2e/advanced/integrations/amp.test.ts +++ b/apps/admin-x-settings/test/acceptance/advanced/integrations/amp.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../../utils/e2e'; +import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../../utils/acceptance'; test.describe('AMP integration', async () => { test('Supports toggling and filling in AMP integration', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/advanced/integrations/custom.test.ts b/apps/admin-x-settings/test/acceptance/advanced/integrations/custom.test.ts similarity index 99% rename from apps/admin-x-settings/test/e2e/advanced/integrations/custom.test.ts rename to apps/admin-x-settings/test/acceptance/advanced/integrations/custom.test.ts index 56ed9d75f6..6e988eb092 100644 --- a/apps/admin-x-settings/test/e2e/advanced/integrations/custom.test.ts +++ b/apps/admin-x-settings/test/acceptance/advanced/integrations/custom.test.ts @@ -1,6 +1,6 @@ import {Integration, IntegrationsResponseType} from '../../../../src/api/integrations'; import {Webhook, WebhooksResponseType} from '../../../../src/api/webhooks'; -import {chooseOptionInSelect, globalDataRequests, limitRequests, mockApi, responseFixtures} from '../../../utils/e2e'; +import {chooseOptionInSelect, globalDataRequests, limitRequests, mockApi, responseFixtures} from '../../../utils/acceptance'; import {expect, test} from '@playwright/test'; test.describe('Custom integrations', async () => { diff --git a/apps/admin-x-settings/test/e2e/advanced/integrations/firstPromoter.test.ts b/apps/admin-x-settings/test/acceptance/advanced/integrations/firstPromoter.test.ts similarity index 97% rename from apps/admin-x-settings/test/e2e/advanced/integrations/firstPromoter.test.ts rename to apps/admin-x-settings/test/acceptance/advanced/integrations/firstPromoter.test.ts index c2c5d546b4..8e1c2a9fbf 100644 --- a/apps/admin-x-settings/test/e2e/advanced/integrations/firstPromoter.test.ts +++ b/apps/admin-x-settings/test/acceptance/advanced/integrations/firstPromoter.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../../utils/e2e'; +import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../../utils/acceptance'; test.describe('First Promoter integration', async () => { test('Supports toggling and filling in First Promoter integration', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/advanced/integrations/pintura.test.ts b/apps/admin-x-settings/test/acceptance/advanced/integrations/pintura.test.ts similarity index 99% rename from apps/admin-x-settings/test/e2e/advanced/integrations/pintura.test.ts rename to apps/admin-x-settings/test/acceptance/advanced/integrations/pintura.test.ts index 58a92d2fdc..d797698778 100644 --- a/apps/admin-x-settings/test/e2e/advanced/integrations/pintura.test.ts +++ b/apps/admin-x-settings/test/acceptance/advanced/integrations/pintura.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../../utils/e2e'; +import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../../utils/acceptance'; test.describe('Pintura integration', async () => { test('Can toggle Pintura', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/advanced/integrations/slack.test.ts b/apps/admin-x-settings/test/acceptance/advanced/integrations/slack.test.ts similarity index 99% rename from apps/admin-x-settings/test/e2e/advanced/integrations/slack.test.ts rename to apps/admin-x-settings/test/acceptance/advanced/integrations/slack.test.ts index 399e65148b..6b3be91b86 100644 --- a/apps/admin-x-settings/test/e2e/advanced/integrations/slack.test.ts +++ b/apps/admin-x-settings/test/acceptance/advanced/integrations/slack.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../../utils/e2e'; +import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../../utils/acceptance'; test.describe('Slack integration', async () => { test('Supports updating Slack settings', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/advanced/integrations/unsplash.test.ts b/apps/admin-x-settings/test/acceptance/advanced/integrations/unsplash.test.ts similarity index 97% rename from apps/admin-x-settings/test/e2e/advanced/integrations/unsplash.test.ts rename to apps/admin-x-settings/test/acceptance/advanced/integrations/unsplash.test.ts index c39713e0f2..5405354255 100644 --- a/apps/admin-x-settings/test/e2e/advanced/integrations/unsplash.test.ts +++ b/apps/admin-x-settings/test/acceptance/advanced/integrations/unsplash.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../../utils/e2e'; +import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../../utils/acceptance'; test.describe('Unsplash integration', async () => { test('Supports toggling unsplash integration', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/advanced/integrations/zapier.test.ts b/apps/admin-x-settings/test/acceptance/advanced/integrations/zapier.test.ts similarity index 99% rename from apps/admin-x-settings/test/e2e/advanced/integrations/zapier.test.ts rename to apps/admin-x-settings/test/acceptance/advanced/integrations/zapier.test.ts index 94650a4e86..5185b558f2 100644 --- a/apps/admin-x-settings/test/e2e/advanced/integrations/zapier.test.ts +++ b/apps/admin-x-settings/test/acceptance/advanced/integrations/zapier.test.ts @@ -1,6 +1,6 @@ import {Integration, IntegrationsResponseType} from '../../../../src/api/integrations'; import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, responseFixtures} from '../../../utils/e2e'; +import {globalDataRequests, mockApi, responseFixtures} from '../../../utils/acceptance'; test.describe('Zapier integration settings', async () => { test('Showing and regenerating API keys', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/email/defaultRecipients.test.ts b/apps/admin-x-settings/test/acceptance/email/defaultRecipients.test.ts similarity index 98% rename from apps/admin-x-settings/test/e2e/email/defaultRecipients.test.ts rename to apps/admin-x-settings/test/acceptance/email/defaultRecipients.test.ts index e32c3b2412..fbdabdab0d 100644 --- a/apps/admin-x-settings/test/e2e/email/defaultRecipients.test.ts +++ b/apps/admin-x-settings/test/acceptance/email/defaultRecipients.test.ts @@ -1,4 +1,4 @@ -import {chooseOptionInSelect, globalDataRequests, mockApi, responseFixtures, updatedSettingsResponse} from '../../utils/e2e'; +import {chooseOptionInSelect, globalDataRequests, mockApi, responseFixtures, updatedSettingsResponse} from '../../utils/acceptance'; import {expect, test} from '@playwright/test'; test.describe('Default recipient settings', async () => { diff --git a/apps/admin-x-settings/test/e2e/email/mailgun.test.ts b/apps/admin-x-settings/test/acceptance/email/mailgun.test.ts similarity index 97% rename from apps/admin-x-settings/test/e2e/email/mailgun.test.ts rename to apps/admin-x-settings/test/acceptance/email/mailgun.test.ts index d5c267e8dd..a58cf55fb0 100644 --- a/apps/admin-x-settings/test/e2e/email/mailgun.test.ts +++ b/apps/admin-x-settings/test/acceptance/email/mailgun.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/e2e'; +import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/acceptance'; test.describe('Mailgun settings', async () => { test('Supports setting up mailgun', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/email/newsletters.test.ts b/apps/admin-x-settings/test/acceptance/email/newsletters.test.ts similarity index 99% rename from apps/admin-x-settings/test/e2e/email/newsletters.test.ts rename to apps/admin-x-settings/test/acceptance/email/newsletters.test.ts index ecf83ca129..9446e6dbfa 100644 --- a/apps/admin-x-settings/test/e2e/email/newsletters.test.ts +++ b/apps/admin-x-settings/test/acceptance/email/newsletters.test.ts @@ -1,4 +1,4 @@ -import {chooseOptionInSelect, globalDataRequests, limitRequests, mockApi, responseFixtures} from '../../utils/e2e'; +import {chooseOptionInSelect, globalDataRequests, limitRequests, mockApi, responseFixtures} from '../../utils/acceptance'; import {expect, test} from '@playwright/test'; test.describe('Newsletter settings', async () => { diff --git a/apps/admin-x-settings/test/e2e/general/facebook.test.ts b/apps/admin-x-settings/test/acceptance/general/facebook.test.ts similarity index 98% rename from apps/admin-x-settings/test/e2e/general/facebook.test.ts rename to apps/admin-x-settings/test/acceptance/general/facebook.test.ts index 75fceb39c3..0d4f5bdc53 100644 --- a/apps/admin-x-settings/test/e2e/general/facebook.test.ts +++ b/apps/admin-x-settings/test/acceptance/general/facebook.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, responseFixtures} from '../../utils/e2e'; +import {globalDataRequests, mockApi, responseFixtures} from '../../utils/acceptance'; test.describe('Facebook settings', async () => { test('Supports editing the facebook card', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/general/lockSite.test.ts b/apps/admin-x-settings/test/acceptance/general/lockSite.test.ts similarity index 98% rename from apps/admin-x-settings/test/e2e/general/lockSite.test.ts rename to apps/admin-x-settings/test/acceptance/general/lockSite.test.ts index c7183e74f2..c198bf6532 100644 --- a/apps/admin-x-settings/test/e2e/general/lockSite.test.ts +++ b/apps/admin-x-settings/test/acceptance/general/lockSite.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/e2e'; +import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/acceptance'; test.describe('Site password settings', async () => { test('Supports locking and unlocking the site', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/general/metadata.test.ts b/apps/admin-x-settings/test/acceptance/general/metadata.test.ts similarity index 97% rename from apps/admin-x-settings/test/e2e/general/metadata.test.ts rename to apps/admin-x-settings/test/acceptance/general/metadata.test.ts index a70f0265d1..9307c7c269 100644 --- a/apps/admin-x-settings/test/e2e/general/metadata.test.ts +++ b/apps/admin-x-settings/test/acceptance/general/metadata.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/e2e'; +import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/acceptance'; test.describe('Metadata settings', async () => { test('Supports editing metadata', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/general/publicationLanguage.test.ts b/apps/admin-x-settings/test/acceptance/general/publicationLanguage.test.ts similarity index 97% rename from apps/admin-x-settings/test/e2e/general/publicationLanguage.test.ts rename to apps/admin-x-settings/test/acceptance/general/publicationLanguage.test.ts index cc93bfd759..bdea09f147 100644 --- a/apps/admin-x-settings/test/e2e/general/publicationLanguage.test.ts +++ b/apps/admin-x-settings/test/acceptance/general/publicationLanguage.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/e2e'; +import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/acceptance'; test.describe('Publication language settings', async () => { test('Supports editing the locale', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/general/socialAccounts.test.ts b/apps/admin-x-settings/test/acceptance/general/socialAccounts.test.ts similarity index 98% rename from apps/admin-x-settings/test/e2e/general/socialAccounts.test.ts rename to apps/admin-x-settings/test/acceptance/general/socialAccounts.test.ts index 7651a47aec..831d8986bd 100644 --- a/apps/admin-x-settings/test/e2e/general/socialAccounts.test.ts +++ b/apps/admin-x-settings/test/acceptance/general/socialAccounts.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/e2e'; +import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/acceptance'; test.describe('Social account settings', async () => { test('Supports editing social URLs', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/general/timeZone.test.ts b/apps/admin-x-settings/test/acceptance/general/timeZone.test.ts similarity index 96% rename from apps/admin-x-settings/test/e2e/general/timeZone.test.ts rename to apps/admin-x-settings/test/acceptance/general/timeZone.test.ts index fe1599f3e9..f5686ed8b0 100644 --- a/apps/admin-x-settings/test/e2e/general/timeZone.test.ts +++ b/apps/admin-x-settings/test/acceptance/general/timeZone.test.ts @@ -1,4 +1,4 @@ -import {chooseOptionInSelect, globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/e2e'; +import {chooseOptionInSelect, globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/acceptance'; import {expect, test} from '@playwright/test'; test.describe('Time zone settings', async () => { diff --git a/apps/admin-x-settings/test/e2e/general/titleAndDescription.test.ts b/apps/admin-x-settings/test/acceptance/general/titleAndDescription.test.ts similarity index 98% rename from apps/admin-x-settings/test/e2e/general/titleAndDescription.test.ts rename to apps/admin-x-settings/test/acceptance/general/titleAndDescription.test.ts index 7123ed2997..c07a7bf1b2 100644 --- a/apps/admin-x-settings/test/e2e/general/titleAndDescription.test.ts +++ b/apps/admin-x-settings/test/acceptance/general/titleAndDescription.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/e2e'; +import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/acceptance'; test.describe('Title and description settings', async () => { test('Supports editing the title and description', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/general/twitter.test.ts b/apps/admin-x-settings/test/acceptance/general/twitter.test.ts similarity index 98% rename from apps/admin-x-settings/test/e2e/general/twitter.test.ts rename to apps/admin-x-settings/test/acceptance/general/twitter.test.ts index 1be657ef7b..804d20eebb 100644 --- a/apps/admin-x-settings/test/e2e/general/twitter.test.ts +++ b/apps/admin-x-settings/test/acceptance/general/twitter.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, responseFixtures} from '../../utils/e2e'; +import {globalDataRequests, mockApi, responseFixtures} from '../../utils/acceptance'; test.describe('Twitter settings', async () => { test('Supports editing the twitter card', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/general/users/actions.test.ts b/apps/admin-x-settings/test/acceptance/general/users/actions.test.ts similarity index 99% rename from apps/admin-x-settings/test/e2e/general/users/actions.test.ts rename to apps/admin-x-settings/test/acceptance/general/users/actions.test.ts index 9bda6eae49..933df5a927 100644 --- a/apps/admin-x-settings/test/e2e/general/users/actions.test.ts +++ b/apps/admin-x-settings/test/acceptance/general/users/actions.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, limitRequests, mockApi, responseFixtures} from '../../../utils/e2e'; +import {globalDataRequests, limitRequests, mockApi, responseFixtures} from '../../../utils/acceptance'; test.describe('User actions', async () => { test('Supports suspending a user', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/general/users/invite.test.ts b/apps/admin-x-settings/test/acceptance/general/users/invite.test.ts similarity index 99% rename from apps/admin-x-settings/test/e2e/general/users/invite.test.ts rename to apps/admin-x-settings/test/acceptance/general/users/invite.test.ts index eca7fbe81d..250de05a83 100644 --- a/apps/admin-x-settings/test/e2e/general/users/invite.test.ts +++ b/apps/admin-x-settings/test/acceptance/general/users/invite.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, limitRequests, mockApi, responseFixtures} from '../../../utils/e2e'; +import {globalDataRequests, limitRequests, mockApi, responseFixtures} from '../../../utils/acceptance'; test.describe('User invitations', async () => { test('Supports inviting a user', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/general/users/profile.test.ts b/apps/admin-x-settings/test/acceptance/general/users/profile.test.ts similarity index 99% rename from apps/admin-x-settings/test/e2e/general/users/profile.test.ts rename to apps/admin-x-settings/test/acceptance/general/users/profile.test.ts index dcc3cadb9d..46b0bfa1b9 100644 --- a/apps/admin-x-settings/test/e2e/general/users/profile.test.ts +++ b/apps/admin-x-settings/test/acceptance/general/users/profile.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, responseFixtures} from '../../../utils/e2e'; +import {globalDataRequests, mockApi, responseFixtures} from '../../../utils/acceptance'; test.describe('User profile', async () => { test('Supports editing user profiles', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/general/users/roles.test.ts b/apps/admin-x-settings/test/acceptance/general/users/roles.test.ts similarity index 99% rename from apps/admin-x-settings/test/e2e/general/users/roles.test.ts rename to apps/admin-x-settings/test/acceptance/general/users/roles.test.ts index 9ca08bb5e1..4b711daef5 100644 --- a/apps/admin-x-settings/test/e2e/general/users/roles.test.ts +++ b/apps/admin-x-settings/test/acceptance/general/users/roles.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, responseFixtures} from '../../../utils/e2e'; +import {globalDataRequests, mockApi, responseFixtures} from '../../../utils/acceptance'; test.describe('User roles', async () => { test('Shows users under their role', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/membership/access.test.ts b/apps/admin-x-settings/test/acceptance/membership/access.test.ts similarity index 98% rename from apps/admin-x-settings/test/e2e/membership/access.test.ts rename to apps/admin-x-settings/test/acceptance/membership/access.test.ts index e2e3c7aee2..20b7644560 100644 --- a/apps/admin-x-settings/test/e2e/membership/access.test.ts +++ b/apps/admin-x-settings/test/acceptance/membership/access.test.ts @@ -1,4 +1,4 @@ -import {chooseOptionInSelect, globalDataRequests, mockApi, responseFixtures, updatedSettingsResponse} from '../../utils/e2e'; +import {chooseOptionInSelect, globalDataRequests, mockApi, responseFixtures, updatedSettingsResponse} from '../../utils/acceptance'; import {expect, test} from '@playwright/test'; test.describe('Access settings', async () => { diff --git a/apps/admin-x-settings/test/e2e/membership/analytics.test.ts b/apps/admin-x-settings/test/acceptance/membership/analytics.test.ts similarity index 98% rename from apps/admin-x-settings/test/e2e/membership/analytics.test.ts rename to apps/admin-x-settings/test/acceptance/membership/analytics.test.ts index f254167d51..29c6e38abf 100644 --- a/apps/admin-x-settings/test/e2e/membership/analytics.test.ts +++ b/apps/admin-x-settings/test/acceptance/membership/analytics.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/e2e'; +import {globalDataRequests, mockApi, updatedSettingsResponse} from '../../utils/acceptance'; test.describe('Analytics settings', async () => { test('Supports toggling analytics settings', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/membership/signupEmbed.test.ts b/apps/admin-x-settings/test/acceptance/membership/signupEmbed.test.ts similarity index 100% rename from apps/admin-x-settings/test/e2e/membership/signupEmbed.test.ts rename to apps/admin-x-settings/test/acceptance/membership/signupEmbed.test.ts diff --git a/apps/admin-x-settings/test/e2e/membership/stripe.test.ts b/apps/admin-x-settings/test/acceptance/membership/stripe.test.ts similarity index 98% rename from apps/admin-x-settings/test/e2e/membership/stripe.test.ts rename to apps/admin-x-settings/test/acceptance/membership/stripe.test.ts index 8254e86b62..1dc98186d9 100644 --- a/apps/admin-x-settings/test/e2e/membership/stripe.test.ts +++ b/apps/admin-x-settings/test/acceptance/membership/stripe.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, responseFixtures, updatedSettingsResponse} from '../../utils/e2e'; +import {globalDataRequests, mockApi, responseFixtures, updatedSettingsResponse} from '../../utils/acceptance'; test.describe('Stripe settings', async () => { test('Supports the Stripe Connect flow', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/membership/tiers.test.ts b/apps/admin-x-settings/test/acceptance/membership/tiers.test.ts similarity index 99% rename from apps/admin-x-settings/test/e2e/membership/tiers.test.ts rename to apps/admin-x-settings/test/acceptance/membership/tiers.test.ts index d6ed7357d6..ba19686603 100644 --- a/apps/admin-x-settings/test/e2e/membership/tiers.test.ts +++ b/apps/admin-x-settings/test/acceptance/membership/tiers.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, responseFixtures, updatedSettingsResponse} from '../../utils/e2e'; +import {globalDataRequests, mockApi, responseFixtures, updatedSettingsResponse} from '../../utils/acceptance'; const settingsWithStripe = updatedSettingsResponse([ {key: 'stripe_connect_publishable_key', value: 'pk_test_123'}, diff --git a/apps/admin-x-settings/test/e2e/search.test.ts b/apps/admin-x-settings/test/acceptance/search.test.ts similarity index 91% rename from apps/admin-x-settings/test/e2e/search.test.ts rename to apps/admin-x-settings/test/acceptance/search.test.ts index 7e5899c4a7..fbb7239421 100644 --- a/apps/admin-x-settings/test/e2e/search.test.ts +++ b/apps/admin-x-settings/test/acceptance/search.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi} from '../utils/e2e'; +import {globalDataRequests, mockApi} from '../utils/acceptance'; test.describe('Search', async () => { test('Hiding and showing groups based on the search term', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/site/announcementbar.test.ts b/apps/admin-x-settings/test/acceptance/site/announcementbar.test.ts similarity index 99% rename from apps/admin-x-settings/test/e2e/site/announcementbar.test.ts rename to apps/admin-x-settings/test/acceptance/site/announcementbar.test.ts index 348345afd7..1f62140fe8 100644 --- a/apps/admin-x-settings/test/e2e/site/announcementbar.test.ts +++ b/apps/admin-x-settings/test/acceptance/site/announcementbar.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, mockSitePreview, responseFixtures} from '../../utils/e2e'; +import {globalDataRequests, mockApi, mockSitePreview, responseFixtures} from '../../utils/acceptance'; test.describe('Announcement Bar', async () => { test('Working with the announcement bar preview', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/site/design.test.ts b/apps/admin-x-settings/test/acceptance/site/design.test.ts similarity index 99% rename from apps/admin-x-settings/test/e2e/site/design.test.ts rename to apps/admin-x-settings/test/acceptance/site/design.test.ts index 673d5f22a8..63d7ee733e 100644 --- a/apps/admin-x-settings/test/e2e/site/design.test.ts +++ b/apps/admin-x-settings/test/acceptance/site/design.test.ts @@ -1,4 +1,4 @@ -import {chooseOptionInSelect, globalDataRequests, mockApi, mockSitePreview, responseFixtures} from '../../utils/e2e'; +import {chooseOptionInSelect, globalDataRequests, mockApi, mockSitePreview, responseFixtures} from '../../utils/acceptance'; import {expect, test} from '@playwright/test'; test.describe('Design settings', async () => { diff --git a/apps/admin-x-settings/test/e2e/site/navigation.test.ts b/apps/admin-x-settings/test/acceptance/site/navigation.test.ts similarity index 99% rename from apps/admin-x-settings/test/e2e/site/navigation.test.ts rename to apps/admin-x-settings/test/acceptance/site/navigation.test.ts index a1cea44d73..de9e39ec94 100644 --- a/apps/admin-x-settings/test/e2e/site/navigation.test.ts +++ b/apps/admin-x-settings/test/acceptance/site/navigation.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, mockApi, responseFixtures} from '../../utils/e2e'; +import {globalDataRequests, mockApi, responseFixtures} from '../../utils/acceptance'; test.describe('Navigation settings', async () => { test('Editing primary and secondary navigation', async ({page}) => { diff --git a/apps/admin-x-settings/test/e2e/site/theme.test.ts b/apps/admin-x-settings/test/acceptance/site/theme.test.ts similarity index 99% rename from apps/admin-x-settings/test/e2e/site/theme.test.ts rename to apps/admin-x-settings/test/acceptance/site/theme.test.ts index 9eae9335f0..92b93533d7 100644 --- a/apps/admin-x-settings/test/e2e/site/theme.test.ts +++ b/apps/admin-x-settings/test/acceptance/site/theme.test.ts @@ -1,5 +1,5 @@ import {expect, test} from '@playwright/test'; -import {globalDataRequests, limitRequests, mockApi, responseFixtures} from '../../utils/e2e'; +import {globalDataRequests, limitRequests, mockApi, responseFixtures} from '../../utils/acceptance'; test.describe('Theme settings', async () => { test('Browsing and installing default themes', async ({page}) => { diff --git a/apps/admin-x-settings/test/utils/e2e.ts b/apps/admin-x-settings/test/utils/acceptance.ts similarity index 100% rename from apps/admin-x-settings/test/utils/e2e.ts rename to apps/admin-x-settings/test/utils/acceptance.ts