tabshift/payload
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: passing versions e2e (#5343)

Browse Source
This commit is contained in:
Jarrod Flesch
2024-03-15 17:09:32 -04:00
committed by GitHub
parent b329e3c43c
commit eef06425a3
83 changed files with 363 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/helpers.ts
View File

@@ -89,8 +89,9 @@ export async function changeLocale(page: Page, newLocale: string) {
})
.first()
.click()
const regexPattern = new RegExp(`locale=${newLocale}`)
await expect(page).toHaveURL(regexPattern)
await wait(500)
expect(page.url()).toContain(`locale=${newLocale}`)
}
export function exactText(text: string) {

101
test/versions/e2e.spec.ts
View File

@@ -38,6 +38,7 @@ import {
exactText,
findTableCell,
initPageConsoleErrorCatch,
saveDocAndAssert,
selectTableRow,
} from '../helpers.js'
import { AdminUrlUtil } from '../helpers/adminUrlUtil.js'
@@ -98,7 +99,7 @@ describe('versions', () => {
const rows = page.locator(`tr`)
const rowToDelete = rows.filter({ hasText: titleToDelete })
await rowToDelete.locator('.cell-_select input').click()
await rowToDelete.locator('.cell-_select input').check()
await page.locator('.delete-documents__toggle').click()
await page.locator('#confirm-delete').click()
@@ -198,12 +199,14 @@ describe('versions', () => {
test('collection - has versions tab', async () => {
await page.goto(url.list)
await page.locator('tbody tr .cell-title a').first().click()
const docURL = page.url()
const pathname = new URL(docURL).pathname
const versionsTab = page.locator('.doc-tab', {
hasText: 'Versions',
})
await versionsTab.waitFor({ state: 'visible' })
const docURL = page.url()
const pathname = new URL(docURL).pathname
expect(versionsTab).toBeTruthy()
const href = await versionsTab.locator('a').first().getAttribute('href')
@@ -225,6 +228,7 @@ describe('versions', () => {
const versionsTab = page.locator('.doc-tab', {
hasText: 'Versions',
})
await versionsTab.waitFor({ state: 'visible' })
const versionCount = await versionsTab.locator('.doc-tab__count').first().textContent()
expect(versionCount).toBe('11')
@@ -233,6 +237,9 @@ describe('versions', () => {
test('collection - has versions route', async () => {
await page.goto(url.list)
await page.locator('tbody tr .cell-title a').first().click()
await page.waitForSelector('.doc-header__title', { state: 'visible' })
await page.goto(`${page.url()}/versions`)
expect(page.url()).toMatch(/\/versions$/)
})
@@ -240,6 +247,13 @@ describe('versions', () => {
test('should show collection versions view level action in collection versions view', async () => {
await page.goto(url.list)
await page.locator('tbody tr .cell-title a').first().click()
// Wait for the document to load
const versionsTab = page.locator('.doc-tab', {
hasText: 'Versions',
})
await versionsTab.waitFor({ state: 'visible' })
await page.goto(`${page.url()}/versions`)
await expect(page.locator('.app-header .collection-versions-button')).toHaveCount(1)
})
@@ -262,6 +276,7 @@ describe('versions', () => {
const versionsTab = page.locator('.doc-tab', {
hasText: 'Versions',
})
await versionsTab.waitFor({ state: 'visible' })
expect(versionsTab).toBeTruthy()
const href = await versionsTab.locator('a').first().getAttribute('href')
@@ -275,13 +290,21 @@ describe('versions', () => {
expect(page.url()).toMatch(/\/versions$/)
})
// TODO: This test is flaky and fails sometimes
test('global - should autosave', async () => {
const url = new AdminUrlUtil(serverURL, autoSaveGlobalSlug)
// fill out global title and wait for autosave
await page.goto(url.global(autoSaveGlobalSlug))
await page.locator('#field-title').fill('global title')
await wait(1000)
await wait(500)
const titleField = page.locator('#field-title')
await expect(titleField).toBeVisible()
await titleField.fill('global title')
await wait(500)
await expect(page.locator('.autosave:has-text("Saving...")')).toBeVisible()
await expect(
page.locator('.autosave:has-text("Last saved less than a minute ago")'),
).toBeVisible()
expect(await titleField.inputValue()).toBe('global title')
// refresh the page and ensure value autosaved
await page.goto(url.global(autoSaveGlobalSlug))
@@ -289,60 +312,77 @@ describe('versions', () => {
})
test('should retain localized data during autosave', async () => {
const locale = 'en'
const spanishLocale = 'es'
const en = 'en'
const es = 'es'
const title = 'english title'
const spanishTitle = 'spanish title'
const description = 'description'
const newDescription = 'new description'
await page.goto(autosaveURL.create)
await page.locator('#field-title').fill(title)
await page.locator('#field-description').fill(description)
await wait(500) // wait for autosave
await expect(page.locator('.id-label')).toBeVisible()
await wait(500)
const titleField = page.locator('#field-title')
const descriptionField = page.locator('#field-description')
await changeLocale(page, spanishLocale)
await page.locator('#field-title').fill(spanishTitle)
await wait(500) // wait for autosave
// fill out en doc
await titleField.fill(title)
await descriptionField.fill(description)
await wait(500)
await changeLocale(page, locale)
await page.locator('#field-description').fill(newDescription)
await wait(500) // wait for autosave
// change locale to spanish
await changeLocale(page, es)
// set localized title field
await titleField.fill(spanishTitle)
await wait(500)
await changeLocale(page, spanishLocale)
await wait(500) // wait for autosave
// change locale back to en
await changeLocale(page, en)
// verify en loads its own title
expect(await titleField.inputValue()).toEqual(title)
// change non-localized description field
await descriptionField.fill(newDescription)
await wait(500)
// change locale to spanish
await changeLocale(page, es)
await wait(500)
// reload page in spanish
// title should not be english title
// description should be new description
await page.reload()
await expect(page.locator('#field-title')).toHaveValue(spanishTitle)
await expect(page.locator('#field-description')).toHaveValue(newDescription)
expect(await titleField.inputValue()).toEqual(spanishTitle)
expect(await descriptionField.inputValue()).toEqual(newDescription)
})
test('should restore localized docs correctly', async () => {
const spanishLocale = 'es'
const es = 'es'
const spanishTitle = 'spanish title'
const englishTitle = 'english title'
await page.goto(url.create)
await wait(500)
// fill out doc in english
await page.locator('#field-title').fill(englishTitle)
await page.locator('#field-description').fill('unchanged description')
await page.locator('#action-save').click()
await saveDocAndAssert(page)
// change locale to spanish
await changeLocale(page, spanishLocale)
await changeLocale(page, es)
// fill out doc in spanish
await page.locator('#field-title').fill(spanishTitle)
await page.locator('#action-save').click()
await saveDocAndAssert(page)
// fill out draft content in spanish
await page.locator('#field-title').fill(`${spanishTitle}--draft`)
await page.locator('#action-save-draft').click()
await saveDocAndAssert(page, '#action-save-draft')
// revert to last published version
await page.locator('#action-revert-to-published').click()
await page.locator('#action-revert-to-published-confirm').click()
await saveDocAndAssert(page, '#action-revert-to-published-confirm')
// verify that spanish content is reverted correctly
await expect(page.locator('#field-title')).toHaveValue(spanishTitle)
@@ -351,12 +391,14 @@ describe('versions', () => {
test('collection - autosave should only update the current document', async () => {
// create and save first doc
await page.goto(autosaveURL.create)
await wait(500)
await page.locator('#field-title').fill('first post title')
await page.locator('#field-description').fill('first post description')
await page.locator('#action-save').click()
// create and save second doc
await page.goto(autosaveURL.create)
await wait(500)
await page.locator('#field-title').fill('second post title')
await page.locator('#field-description').fill('second post description')
await page.locator('#action-save').click()
@@ -364,7 +406,7 @@ describe('versions', () => {
// update second doc and wait for autosave
await page.locator('#field-title').fill('updated second post title')
await page.locator('#field-description').fill('updated second post description')
await wait(1000)
await wait(500)
// verify that the first doc is unchanged
await page.goto(autosaveURL.list)
@@ -375,9 +417,10 @@ describe('versions', () => {
test('should save versions with custom IDs', async () => {
await page.goto(customIDURL.create)
await wait(500)
await page.locator('#field-id').fill('custom')
await page.locator('#field-title').fill('title')
await page.locator('#action-save').click()
await saveDocAndAssert(page)
await page.goto(customIDURL.list)
await page.locator('tbody tr .cell-id a').click()

22
test/versions/globals/Autosave.ts
View File

@@ -4,16 +4,6 @@ import { autoSaveGlobalSlug } from '../slugs.js'
const AutosaveGlobal: GlobalConfig = {
slug: autoSaveGlobalSlug,
label: 'Autosave Global',
admin: {
preview: () => 'https://payloadcms.com',
},
versions: {
max: 20,
drafts: {
autosave: true,
},
},
access: {
read: ({ req: { user } }) => {
if (user) {
@@ -36,14 +26,24 @@ const AutosaveGlobal: GlobalConfig = {
}
},
},
admin: {
preview: () => 'https://payloadcms.com',
},
fields: [
{
name: 'title',
type: 'text',
required: true,
localized: true,
required: true,
},
],
label: 'Autosave Global',
versions: {
drafts: {
autosave: true,
},
max: 20,
},
}
export default AutosaveGlobal