chore: deflakes e2e tests (#3970)

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)

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)

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<void> => {
-  await goToDoc(page)
-  await page.goto(`${page.url()}/preview`)
-}
-
-const goToGlobalPreview = async (page: Page, slug: string): Promise<void> => {
-  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<void> => {
+    await goToDoc(page)
+    await page.goto(`${page.url()}/preview`)
+  }
+
+  const goToGlobalPreview = async (page: Page, slug: string): Promise<void> => {
+    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)

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