From e2df74bbff3cb7791d4cd77a9d94ace137f9ec7d Mon Sep 17 00:00:00 2001 From: Alessio Gravili Date: Thu, 7 Sep 2023 22:53:28 +0200 Subject: [PATCH] chore: fix e2e tests by not importing from ./config --- test/access-control/config.ts | 27 +++++++++++++-------------- test/access-control/e2e.spec.ts | 2 +- test/access-control/shared.ts | 14 ++++++++++++++ test/auth/config.ts | 7 +------ test/auth/e2e.spec.ts | 2 +- test/auth/shared.ts | 5 +++++ test/localization/config.ts | 9 ++++----- test/localization/e2e.spec.ts | 3 +-- test/localization/shared.ts | 6 ++++++ test/uploads/config.ts | 13 +------------ test/uploads/e2e.spec.ts | 2 +- test/uploads/shared.ts | 11 +++++++++++ 12 files changed, 59 insertions(+), 42 deletions(-) create mode 100644 test/auth/shared.ts create mode 100644 test/uploads/shared.ts diff --git a/test/access-control/config.ts b/test/access-control/config.ts index b26221ac0..6d89064af 100644 --- a/test/access-control/config.ts +++ b/test/access-control/config.ts @@ -3,20 +3,19 @@ import type { FieldAccess } from '../../packages/payload/src/fields/config/types import { buildConfigWithDefaults } from '../buildConfigWithDefaults' import { devUser } from '../credentials' import { firstArrayText, secondArrayText } from './shared' - -export const slug = 'posts' -export const unrestrictedSlug = 'unrestricted' -export const readOnlySlug = 'read-only-collection' - -export const userRestrictedSlug = 'user-restricted' -export const restrictedSlug = 'restricted' -export const restrictedVersionsSlug = 'restricted-versions' -export const siblingDataSlug = 'sibling-data' -export const relyOnRequestHeadersSlug = 'rely-on-request-headers' -export const docLevelAccessSlug = 'doc-level-access' -export const hiddenFieldsSlug = 'hidden-fields' - -export const hiddenAccessSlug = 'hidden-access' +import { + docLevelAccessSlug, + hiddenAccessSlug, + hiddenFieldsSlug, + readOnlySlug, + relyOnRequestHeadersSlug, + restrictedSlug, + restrictedVersionsSlug, + siblingDataSlug, + slug, + unrestrictedSlug, + userRestrictedSlug, +} from './shared' const openAccess = { create: () => true, diff --git a/test/access-control/e2e.spec.ts b/test/access-control/e2e.spec.ts index 329d073bf..926bf8c00 100644 --- a/test/access-control/e2e.spec.ts +++ b/test/access-control/e2e.spec.ts @@ -15,7 +15,7 @@ import { restrictedVersionsSlug, slug, unrestrictedSlug, -} from './config' +} from './shared' /** * TODO: Access Control diff --git a/test/access-control/shared.ts b/test/access-control/shared.ts index 6f388d505..ef1ed5eaa 100644 --- a/test/access-control/shared.ts +++ b/test/access-control/shared.ts @@ -1,2 +1,16 @@ export const firstArrayText = 'first-array-text' export const secondArrayText = 'second-array-text' + +export const slug = 'posts' +export const unrestrictedSlug = 'unrestricted' +export const readOnlySlug = 'read-only-collection' + +export const userRestrictedSlug = 'user-restricted' +export const restrictedSlug = 'restricted' +export const restrictedVersionsSlug = 'restricted-versions' +export const siblingDataSlug = 'sibling-data' +export const relyOnRequestHeadersSlug = 'rely-on-request-headers' +export const docLevelAccessSlug = 'doc-level-access' +export const hiddenFieldsSlug = 'hidden-fields' + +export const hiddenAccessSlug = 'hidden-access' diff --git a/test/auth/config.ts b/test/auth/config.ts index 9603e28d1..88237f82b 100644 --- a/test/auth/config.ts +++ b/test/auth/config.ts @@ -4,12 +4,7 @@ import { mapAsync } from '../../packages/payload/src/utilities/mapAsync' import { buildConfigWithDefaults } from '../buildConfigWithDefaults' import { devUser } from '../credentials' import { AuthDebug } from './AuthDebug' - -export const slug = 'users' - -export const namedSaveToJWTValue = 'namedSaveToJWT value' - -export const saveToJWTKey = 'x-custom-jwt-property-name' +import { namedSaveToJWTValue, saveToJWTKey, slug } from './shared' export default buildConfigWithDefaults({ admin: { diff --git a/test/auth/e2e.spec.ts b/test/auth/e2e.spec.ts index 4fca1878a..49e5a015b 100644 --- a/test/auth/e2e.spec.ts +++ b/test/auth/e2e.spec.ts @@ -5,7 +5,7 @@ import { expect, test } from '@playwright/test' import { login, saveDocAndAssert } from '../helpers' import { AdminUrlUtil } from '../helpers/adminUrlUtil' import { initPayloadE2E } from '../helpers/configHelpers' -import { slug } from './config' +import { slug } from './shared' /** * TODO: Auth diff --git a/test/auth/shared.ts b/test/auth/shared.ts new file mode 100644 index 000000000..16f78f26f --- /dev/null +++ b/test/auth/shared.ts @@ -0,0 +1,5 @@ +export const slug = 'users' + +export const namedSaveToJWTValue = 'namedSaveToJWT value' + +export const saveToJWTKey = 'x-custom-jwt-property-name' diff --git a/test/localization/config.ts b/test/localization/config.ts index 9c4f77281..aab0f2750 100644 --- a/test/localization/config.ts +++ b/test/localization/config.ts @@ -6,12 +6,16 @@ import { ArrayCollection } from './collections/Array' import { defaultLocale, englishTitle, + localizedPostsSlug, relationEnglishTitle, relationEnglishTitle2, relationSpanishTitle, relationSpanishTitle2, + relationshipLocalizedSlug, spanishLocale, spanishTitle, + withLocalizedRelSlug, + withRequiredLocalizedFields, } from './shared' export type LocalizedPostAllLocale = LocalizedPost & { @@ -21,11 +25,6 @@ export type LocalizedPostAllLocale = LocalizedPost & { } } -export const localizedPostsSlug = 'localized-posts' -export const withLocalizedRelSlug = 'with-localized-relationship' -export const relationshipLocalizedSlug = 'relationship-localized' -export const withRequiredLocalizedFields = 'localized-required' - const openAccess = { read: () => true, create: () => true, diff --git a/test/localization/e2e.spec.ts b/test/localization/e2e.spec.ts index ed7ea87b3..96b76d26b 100644 --- a/test/localization/e2e.spec.ts +++ b/test/localization/e2e.spec.ts @@ -8,8 +8,7 @@ import payload from '../../packages/payload/src' import { saveDocAndAssert } from '../helpers' import { AdminUrlUtil } from '../helpers/adminUrlUtil' import { initPayloadTest } from '../helpers/configHelpers' -import { localizedPostsSlug } from './config' -import { englishTitle, spanishLocale } from './shared' +import { englishTitle, localizedPostsSlug, spanishLocale } from './shared' /** * TODO: Localization diff --git a/test/localization/shared.ts b/test/localization/shared.ts index 27c83d060..3b71fb68d 100644 --- a/test/localization/shared.ts +++ b/test/localization/shared.ts @@ -7,3 +7,9 @@ export const relationSpanishTitle2 = `${relationSpanishTitle}2` export const defaultLocale = 'en' export const spanishLocale = 'es' + +// Slugs +export const localizedPostsSlug = 'localized-posts' +export const withLocalizedRelSlug = 'with-localized-relationship' +export const relationshipLocalizedSlug = 'relationship-localized' +export const withRequiredLocalizedFields = 'localized-required' diff --git a/test/uploads/config.ts b/test/uploads/config.ts index 76632f13d..5c826fa80 100644 --- a/test/uploads/config.ts +++ b/test/uploads/config.ts @@ -7,18 +7,7 @@ import removeFiles from '../helpers/removeFiles' import { Uploads1 } from './collections/Upload1' import Uploads2 from './collections/Upload2' import AdminThumbnailCol from './collections/admin-thumbnail' - -export const mediaSlug = 'media' - -export const relationSlug = 'relation' - -export const audioSlug = 'audio' - -export const enlargeSlug = 'enlarge' - -export const reduceSlug = 'reduce' - -export const adminThumbnailSlug = 'admin-thumbnail' +import { audioSlug, enlargeSlug, mediaSlug, reduceSlug, relationSlug } from './shared' const mockModulePath = path.resolve(__dirname, './mocks/mockFSModule.js') diff --git a/test/uploads/e2e.spec.ts b/test/uploads/e2e.spec.ts index 08043a64b..93d3a7f93 100644 --- a/test/uploads/e2e.spec.ts +++ b/test/uploads/e2e.spec.ts @@ -11,7 +11,7 @@ import { saveDocAndAssert } from '../helpers' import { AdminUrlUtil } from '../helpers/adminUrlUtil' import { initPayloadE2E } from '../helpers/configHelpers' import { adminThumbnailSrc } from './collections/admin-thumbnail' -import { adminThumbnailSlug, audioSlug, mediaSlug, relationSlug } from './config' +import { adminThumbnailSlug, audioSlug, mediaSlug, relationSlug } from './shared' const { beforeAll, describe } = test diff --git a/test/uploads/shared.ts b/test/uploads/shared.ts new file mode 100644 index 000000000..e32e27cb7 --- /dev/null +++ b/test/uploads/shared.ts @@ -0,0 +1,11 @@ +export const mediaSlug = 'media' + +export const relationSlug = 'relation' + +export const audioSlug = 'audio' + +export const enlargeSlug = 'enlarge' + +export const reduceSlug = 'reduce' + +export const adminThumbnailSlug = 'admin-thumbnail'