diff --git a/test/_community/e2e.spec.ts b/test/_community/e2e.spec.ts index affdf4b962..3834f912af 100644 --- a/test/_community/e2e.spec.ts +++ b/test/_community/e2e.spec.ts @@ -6,10 +6,10 @@ import { AdminUrlUtil } from '../helpers/adminUrlUtil' import { initPayloadE2E } from '../helpers/configHelpers' const { beforeAll, describe } = test -let url: AdminUrlUtil describe('Admin Panel', () => { let page: Page + let url: AdminUrlUtil beforeAll(async ({ browser }) => { const { serverURL } = await initPayloadE2E(__dirname) diff --git a/test/auth/e2e.spec.ts b/test/auth/e2e.spec.ts index 49e5a015b8..e338c1e9ad 100644 --- a/test/auth/e2e.spec.ts +++ b/test/auth/e2e.spec.ts @@ -16,10 +16,10 @@ import { slug } from './shared' */ const { beforeAll, describe } = test -let url: AdminUrlUtil describe('auth', () => { let page: Page + let url: AdminUrlUtil beforeAll(async ({ browser }) => { const { serverURL } = await initPayloadE2E(__dirname) diff --git a/test/live-preview/e2e.spec.ts b/test/live-preview/e2e.spec.ts index 7f1cfe3386..28f17fcaac 100644 --- a/test/live-preview/e2e.spec.ts +++ b/test/live-preview/e2e.spec.ts @@ -9,29 +9,29 @@ import { mobileBreakpoint } from './config' import { startLivePreviewDemo } from './startLivePreviewDemo' const { beforeAll, describe } = test -let url: AdminUrlUtil -let serverURL: string - -const goToDoc = async (page: Page) => { - await page.goto(url.list) - const linkToDoc = page.locator('tbody tr:first-child .cell-id a').first() - expect(linkToDoc).toBeTruthy() - await linkToDoc.click() -} - -const goToCollectionPreview = async (page: Page): Promise => { - await goToDoc(page) - await page.goto(`${page.url()}/preview`) -} - -const goToGlobalPreview = async (page: Page, slug: string): Promise => { - const global = new AdminUrlUtil(serverURL, slug) - const previewURL = `${global.global(slug)}/preview` - await page.goto(previewURL) -} describe('Live Preview', () => { let page: Page + let serverURL: string + let url: AdminUrlUtil + + const goToDoc = async (page: Page) => { + await page.goto(url.list) + const linkToDoc = page.locator('tbody tr:first-child .cell-id a').first() + expect(linkToDoc).toBeTruthy() + await linkToDoc.click() + } + + const goToCollectionPreview = async (page: Page): Promise => { + await goToDoc(page) + await page.goto(`${page.url()}/preview`) + } + + const goToGlobalPreview = async (page: Page, slug: string): Promise => { + const global = new AdminUrlUtil(serverURL, slug) + const previewURL = `${global.global(slug)}/preview` + await page.goto(previewURL) + } beforeAll(async ({ browser }) => { const { serverURL: incomingServerURL, payload } = await initPayloadE2E(__dirname) diff --git a/test/versions/e2e.spec.ts b/test/versions/e2e.spec.ts index 2072313138..6d3298af08 100644 --- a/test/versions/e2e.spec.ts +++ b/test/versions/e2e.spec.ts @@ -36,11 +36,11 @@ import { autosaveSlug, draftGlobalSlug, draftSlug, titleToDelete } from './share const { beforeAll, describe } = test -let page: Page -let url: AdminUrlUtil -let serverURL: string - describe('versions', () => { + let page: Page + let url: AdminUrlUtil + let serverURL: string + beforeAll(async ({ browser }) => { const config = await initPayloadE2E(__dirname) serverURL = config.serverURL