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

chore: fix upload test suite dirname referencing

Browse Source
This commit is contained in:
Jarrod Flesch
2024-02-29 14:15:38 -05:00
parent bbdc137f64
commit 6f021049ab
4 changed files with 39 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/uploads/collections/Upload1/index.ts
View File

@@ -5,7 +5,7 @@ import type { CollectionConfig } from '../../../../packages/payload/src/collecti
export const Uploads1: CollectionConfig = { export const Uploads1: CollectionConfig = {
slug: 'uploads-1', slug: 'uploads-1',
upload: { upload: {
staticDir: path.resolve(__dirname, './uploads'), staticDir: path.resolve(process.cwd(), 'test/uploads/collections/Upload1/uploads'),
}, },
fields: [ fields: [
{ {

2
test/uploads/collections/Upload2/index.ts
View File

@@ -5,7 +5,7 @@ import type { CollectionConfig } from '../../../../packages/payload/src/collecti
export const Uploads2: CollectionConfig = { export const Uploads2: CollectionConfig = {
slug: 'uploads-2', slug: 'uploads-2',
upload: { upload: {
staticDir: path.resolve(__dirname, './uploads'), staticDir: path.resolve(process.cwd(), 'test/uploads/collections/Upload2/uploads'),
}, },
admin: { admin: {
enableRichTextRelationship: false, enableRichTextRelationship: false,

20
test/uploads/collections/admin-thumbnail/index.ts
View File

@@ -20,16 +20,16 @@ export const adminThumbnailSrc = '/media/image-640x480.png'
export const AdminThumbnailCol: CollectionConfig = { export const AdminThumbnailCol: CollectionConfig = {
slug: 'admin-thumbnail', slug: 'admin-thumbnail',
upload: { upload: {
staticDir: path.resolve(__dirname, '../../media'), staticDir: path.resolve(process.cwd(), 'test/uploads/media'),
adminThumbnail: ({ doc }) => { // adminThumbnail: ({ doc }) => {
if (docHasFilename(doc)) { // if (docHasFilename(doc)) {
if (doc.mimeType.startsWith('image/')) { // if (doc.mimeType.startsWith('image/')) {
return null // Fallback to default admin thumbnail if image // return null // Fallback to default admin thumbnail if image
} // }
return adminThumbnailSrc // Use custom thumbnail if not image // return adminThumbnailSrc // Use custom thumbnail if not image
} // }
return null // return null
}, // },
}, },
fields: [], fields: [],
} }

98
test/uploads/config.ts
View File

@@ -55,7 +55,7 @@ export default buildConfigWithDefaults({
fields: [], fields: [],
upload: { upload: {
staticURL: '/media-gif', staticURL: '/media-gif',
staticDir: path.resolve(__dirname, './media-gif'), staticDir: path.resolve(process.cwd(), 'test/uploads/media-gif'),
mimeTypes: ['image/gif'], mimeTypes: ['image/gif'],
resizeOptions: { resizeOptions: {
position: 'center', position: 'center',
@@ -79,14 +79,6 @@ export default buildConfigWithDefaults({
width: 1000, width: 1000,
}, },
], ],
mimeTypes: ['image/gif'],
resizeOptions: {
height: 200,
position: 'center',
width: 200,
},
staticDir: './media-gif',
staticURL: '/media-gif',
}, },
}, },
{ {
@@ -94,15 +86,13 @@ export default buildConfigWithDefaults({
fields: [], fields: [],
upload: { upload: {
staticURL: '/no-image-sizes', staticURL: '/no-image-sizes',
staticDir: path.resolve(__dirname, './no-image-sizes'), staticDir: path.resolve(process.cwd(), 'test/uploads/no-image-sizes'),
mimeTypes: ['image/png', 'image/jpg', 'image/jpeg'], mimeTypes: ['image/png', 'image/jpg', 'image/jpeg'],
resizeOptions: { resizeOptions: {
height: 200, height: 200,
position: 'center', position: 'center',
width: 200, width: 200,
}, },
staticDir: './no-image-sizes',
staticURL: '/no-image-sizes',
}, },
}, },
{ {
@@ -110,7 +100,7 @@ export default buildConfigWithDefaults({
fields: [], fields: [],
upload: { upload: {
staticURL: '/object-fit', staticURL: '/object-fit',
staticDir: path.resolve(__dirname, './object-fit'), staticDir: path.resolve(process.cwd(), 'test/uploads/object-fit'),
mimeTypes: ['image/png', 'image/jpg', 'image/jpeg'], mimeTypes: ['image/png', 'image/jpg', 'image/jpeg'],
imageSizes: [ imageSizes: [
{ {
@@ -138,9 +128,6 @@ export default buildConfigWithDefaults({
width: 900, width: 900,
}, },
], ],
mimeTypes: ['image/png', 'image/jpg', 'image/jpeg'],
staticDir: './object-fit',
staticURL: '/object-fit',
}, },
}, },
{ {
@@ -149,7 +136,7 @@ export default buildConfigWithDefaults({
upload: { upload: {
focalPoint: false, focalPoint: false,
staticURL: '/crop-only', staticURL: '/crop-only',
staticDir: path.resolve(__dirname, './crop-only'), staticDir: path.resolve(process.cwd(), 'test/uploads/crop-only'),
mimeTypes: ['image/png', 'image/jpg', 'image/jpeg'], mimeTypes: ['image/png', 'image/jpg', 'image/jpeg'],
imageSizes: [ imageSizes: [
{ {
@@ -168,9 +155,6 @@ export default buildConfigWithDefaults({
width: 900, width: 900,
}, },
], ],
mimeTypes: ['image/png', 'image/jpg', 'image/jpeg'],
staticDir: './crop-only',
staticURL: '/crop-only',
}, },
}, },
{ {
@@ -179,7 +163,7 @@ export default buildConfigWithDefaults({
upload: { upload: {
crop: false, crop: false,
staticURL: '/focal-only', staticURL: '/focal-only',
staticDir: path.resolve(__dirname, './focal-only'), staticDir: path.resolve(process.cwd(), 'test/uploads/focal-only'),
mimeTypes: ['image/png', 'image/jpg', 'image/jpeg'], mimeTypes: ['image/png', 'image/jpg', 'image/jpeg'],
imageSizes: [ imageSizes: [
{ {
@@ -198,17 +182,14 @@ export default buildConfigWithDefaults({
width: 900, width: 900,
}, },
], ],
mimeTypes: ['image/png', 'image/jpg', 'image/jpeg'],
staticDir: './focal-only',
staticURL: '/focal-only',
}, },
}, },
{ {
slug: mediaSlug, slug: mediaSlug,
fields: [], fields: [],
upload: { upload: {
staticDir: './media', staticDir: path.resolve(process.cwd(), 'test/uploads/media'),
staticURL: path.resolve(__dirname, '/media'), staticURL: '/test/uploads/media',
// crop: false, // crop: false,
// focalPoint: false, // focalPoint: false,
formatOptions: { formatOptions: {
@@ -300,13 +281,13 @@ export default buildConfigWithDefaults({
}, },
], ],
}, },
fields: [],
}, },
{ {
slug: enlargeSlug, slug: enlargeSlug,
fields: [],
upload: { upload: {
staticURL: '/enlarge', staticURL: '/enlarge',
staticDir: path.resolve(__dirname, './media/enlarge'), staticDir: path.resolve(process.cwd(), 'test/uploads/media/enlarge'),
mimeTypes: [ mimeTypes: [
'image/png', 'image/png',
'image/jpg', 'image/jpg',
@@ -315,12 +296,6 @@ export default buildConfigWithDefaults({
'image/svg+xml', 'image/svg+xml',
'audio/mpeg', 'audio/mpeg',
], ],
},
},
{
slug: enlargeSlug,
fields: [],
upload: {
imageSizes: [ imageSizes: [
{ {
name: 'accidentalSameSize', name: 'accidentalSameSize',
@@ -354,29 +329,13 @@ export default buildConfigWithDefaults({
}, },
], ],
}, },
fields: [],
}, },
{ {
slug: reduceSlug, slug: reduceSlug,
fields: [],
upload: { upload: {
staticURL: '/reduce', staticURL: '/reduce',
staticDir: path.resolve(__dirname, './media/reduce'), staticDir: path.resolve(process.cwd(), 'test/uploads/media/reduce'),
mimeTypes: [
'image/png',
'image/jpg',
'image/jpeg',
'image/gif',
'image/svg+xml',
'audio/mpeg',
],
staticDir: './media/enlarge',
staticURL: '/enlarge',
},
},
{
slug: reduceSlug,
fields: [],
upload: {
imageSizes: [ imageSizes: [
{ {
name: 'accidentalSameSize', name: 'accidentalSameSize',
@@ -411,8 +370,6 @@ export default buildConfigWithDefaults({
'image/svg+xml', 'image/svg+xml',
'audio/mpeg', 'audio/mpeg',
], ],
staticDir: './media/reduce',
staticURL: '/reduce',
}, },
}, },
{ {
@@ -420,20 +377,26 @@ export default buildConfigWithDefaults({
fields: [], fields: [],
upload: { upload: {
staticURL: '/media-trim', staticURL: '/media-trim',
staticDir: path.resolve(__dirname, './media-trim'), staticDir: path.resolve(process.cwd(), 'test/uploads/media-trim'),
mimeTypes: ['image/png', 'image/jpg', 'image/jpeg'], mimeTypes: ['image/png', 'image/jpg', 'image/jpeg'],
trimOptions: 0, trimOptions: {
threshold: 0,
},
imageSizes: [ imageSizes: [
{ {
name: 'trimNumber', name: 'trimNumber',
height: undefined, height: undefined,
trimOptions: 0, trimOptions: {
threshold: 0,
},
width: 1024, width: 1024,
}, },
{ {
name: 'trimString', name: 'trimString',
height: undefined, height: undefined,
trimOptions: 0, trimOptions: {
threshold: 0,
},
width: 1024, width: 1024,
}, },
{ {
@@ -446,10 +409,6 @@ export default buildConfigWithDefaults({
width: 1024, width: 1024,
}, },
], ],
mimeTypes: ['image/png', 'image/jpg', 'image/jpeg'],
staticDir: './media-trim',
staticURL: '/media-trim',
trimOptions: 0,
}, },
}, },
{ {
@@ -465,9 +424,8 @@ export default buildConfigWithDefaults({
fields: [], fields: [],
upload: { upload: {
// Either use another web server like `npx serve -l 4000` (http://localhost:4000) or use the static server from the previous collection to serve the media folder (http://localhost:3000/media) // Either use another web server like `npx serve -l 4000` (http://localhost:4000) or use the static server from the previous collection to serve the media folder (http://localhost:3000/media)
staticDir: './media',
staticURL: 'http://localhost:3000/media', staticURL: 'http://localhost:3000/media',
staticDir: path.resolve(__dirname, './media'), staticDir: path.resolve(process.cwd(), 'test/uploads/media'),
}, },
}, },
Uploads1, Uploads1,
@@ -478,7 +436,7 @@ export default buildConfigWithDefaults({
fields: [], fields: [],
upload: { upload: {
filesRequiredOnCreate: false, filesRequiredOnCreate: false,
staticDir: path.resolve(__dirname, './optional'), staticDir: path.resolve(process.cwd(), 'test/uploads/optional'),
staticURL: '/optional', staticURL: '/optional',
}, },
}, },
@@ -487,10 +445,8 @@ export default buildConfigWithDefaults({
fields: [], fields: [],
upload: { upload: {
staticURL: '/required', staticURL: '/required',
staticDir: path.resolve(__dirname, './required'), staticDir: path.resolve(process.cwd(), 'test/uploads/required'),
filesRequiredOnCreate: true, filesRequiredOnCreate: true,
staticDir: './required',
staticURL: '/required',
}, },
}, },
{ {
@@ -508,7 +464,7 @@ export default buildConfigWithDefaults({
}, },
], ],
onInit: async (payload) => { onInit: async (payload) => {
const uploadsDir = path.resolve(__dirname, './media') const uploadsDir = path.resolve(process.cwd(), 'test/uploads/media')
removeFiles(path.normalize(uploadsDir)) removeFiles(path.normalize(uploadsDir))
await payload.create({ await payload.create({
@@ -520,7 +476,7 @@ export default buildConfigWithDefaults({
}) })
// Create image // Create image
const imageFilePath = path.resolve(__dirname, './image.png') const imageFilePath = path.resolve(process.cwd(), 'test/uploads/image.png')
const imageFile = await getFileByPath(imageFilePath) const imageFile = await getFileByPath(imageFilePath)
const { id: uploadedImage } = await payload.create({ const { id: uploadedImage } = await payload.create({
@@ -547,7 +503,7 @@ export default buildConfigWithDefaults({
}) })
// Create audio // Create audio
const audioFilePath = path.resolve(__dirname, './audio.mp3') const audioFilePath = path.resolve(process.cwd(), 'test/uploads/audio.mp3')
const audioFile = await getFileByPath(audioFilePath) const audioFile = await getFileByPath(audioFilePath)
const file = await payload.create({ const file = await payload.create({