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

test: fix odd behavior

Browse Source
This commit is contained in:
Elliot DeNolf
2022-07-18 15:27:20 -07:00
parent 9021d5352d
commit 2a7651eb9c
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@@ -36,11 +36,11 @@
"dev:generate-types": "node ./test/generateTypes.js", "dev:generate-types": "node ./test/generateTypes.js",
"pretest": "yarn build", "pretest": "yarn build",
"test": "yarn test:int && yarn test:components", "test": "yarn test:int && yarn test:components",
"test:int": "cross-env NODE_ENV=test DISABLE_LOGGING=true jest --forceExit --detectOpenHandles", "test:int": "cross-env DISABLE_LOGGING=true jest --forceExit --detectOpenHandles",
"test:e2e": "cross-env NODE_ENV=test DISABLE_LOGGING=true playwright test", "test:e2e": "cross-env DISABLE_LOGGING=true playwright test",
"test:e2e:headed": "cross-env NODE_ENV=test DISABLE_LOGGING=true playwright test --headed", "test:e2e:headed": "cross-env DISABLE_LOGGING=true playwright test --headed",
"test:e2e:debug": "cross-env PWDEBUG=1 NODE_ENV=test DISABLE_LOGGING=true playwright test", "test:e2e:debug": "cross-env PWDEBUG=1 DISABLE_LOGGING=true playwright test",
"test:components": "cross-env NODE_ENV=test jest --config=jest.components.config.js", "test:components": "cross-env jest --config=jest.components.config.js",
"clean": "rimraf dist", "clean": "rimraf dist",
"release": "release-it", "release": "release-it",
"release:patch": "release-it patch", "release:patch": "release-it patch",

6
test/buildConfig.ts
View File

@@ -6,6 +6,7 @@ const baseConfig: Config = {
typescript: { typescript: {
outputFile: process.env.PAYLOAD_TS_OUTPUT_PATH, outputFile: process.env.PAYLOAD_TS_OUTPUT_PATH,
}, },
telemetry: false,
}; };
export function buildConfig(overrides?: Partial<Config>): SanitizedConfig { export function buildConfig(overrides?: Partial<Config>): SanitizedConfig {
@@ -13,8 +14,9 @@ export function buildConfig(overrides?: Partial<Config>): SanitizedConfig {
baseConfig.admin = { baseConfig.admin = {
...(baseConfig.admin || {}), ...(baseConfig.admin || {}),
webpack: (config) => { webpack: (config) => {
const existingConfig = const existingConfig = typeof overrides?.admin?.webpack === 'function'
typeof overrides?.admin?.webpack === 'function' ? overrides.admin.webpack(config) : config; ? overrides.admin.webpack(config)
: config;
return { return {
...existingConfig, ...existingConfig,
cache: { cache: {

2
test/helpers/configHelpers.ts
View File

@@ -28,7 +28,7 @@ export async function initPayloadTest(options: Options): Promise<{ serverURL: st
...(options.init || {}), ...(options.init || {}),
}; };
process.env.PAYLOAD_DISABLE_ADMIN = 'true'; process.env.NODE_ENV = 'test';
process.env.PAYLOAD_CONFIG_PATH = path.resolve(options.__dirname, './config.ts'); process.env.PAYLOAD_CONFIG_PATH = path.resolve(options.__dirname, './config.ts');
const port = await getPort(); const port = await getPort();