From d5b6a9edbb90f2015bafb2cb033b8092a2d05b00 Mon Sep 17 00:00:00 2001 From: Jigar Wala Date: Tue, 12 Sep 2023 21:07:44 +0530 Subject: [PATCH] remove defaults, perform validation only when token passed --- packages/config/src/validate.js | 5 +++-- packages/core/src/config.js | 5 ----- packages/core/src/utils.js | 8 ++++---- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/packages/config/src/validate.js b/packages/config/src/validate.js index 2a58da0b0..add0b2f96 100644 --- a/packages/config/src/validate.js +++ b/packages/config/src/validate.js @@ -21,11 +21,12 @@ const ajv = new AJV({ keywords: [{ keyword: 'onlyAutomate', error: { - message: 'Only valid for Automate type projects' + message: 'property only valid with Automate integration.' }, code: cxt => { let isAutomateProjectToken = (process.env.PERCY_TOKEN || '').split('_')[0] === 'auto'; - if (!isAutomateProjectToken) { + // we do validation only when token is passed + if (!!process.env.PERCY_TOKEN && !isAutomateProjectToken) { cxt.error(); } } diff --git a/packages/core/src/config.js b/packages/core/src/config.js index 71da5dd17..8b2024d4f 100644 --- a/packages/core/src/config.js +++ b/packages/core/src/config.js @@ -52,7 +52,6 @@ export const configSchema = { }, freezeAnimation: { type: 'boolean', - default: false, onlyAutomate: true }, ignoreRegions: { @@ -62,14 +61,12 @@ export const configSchema = { properties: { ignoreRegionSelectors: { type: 'array', - default: [], items: { type: 'string' } }, ignoreRegionXpaths: { type: 'array', - default: [], items: { type: 'string' } @@ -83,14 +80,12 @@ export const configSchema = { properties: { considerRegionSelectors: { type: 'array', - default: [], items: { type: 'string' } }, considerRegionXPaths: { type: 'array', - default: [], items: { type: 'string' } diff --git a/packages/core/src/utils.js b/packages/core/src/utils.js index 7c5ce2fad..647c4e3f8 100644 --- a/packages/core/src/utils.js +++ b/packages/core/src/utils.js @@ -42,10 +42,10 @@ export function percyAutomateRequestHandler(req, percy) { req.body.options = merge([{ percyCSS: percy.config.snapshot.percyCSS, freezeAnimation: percy.config.snapshot.freezeAnimation, - ignoreRegionSelectors: percy.config.snapshot.ignoreRegions.ignoreRegionSelectors, - ignoreRegionXpaths: percy.config.snapshot.ignoreRegions.ignoreRegionXpaths, - considerRegionSelectors: percy.config.snapshot.considerRegions.considerRegionSelectors, - considerRegionXPaths: percy.config.snapshot.considerRegions.considerRegionXPaths + ignoreRegionSelectors: percy.config.snapshot.ignoreRegions?.ignoreRegionSelectors, + ignoreRegionXpaths: percy.config.snapshot.ignoreRegions?.ignoreRegionXpaths, + considerRegionSelectors: percy.config.snapshot.considerRegions?.considerRegionSelectors, + considerRegionXPaths: percy.config.snapshot.considerRegions?.considerRegionXPaths, }, camelCasedOptions ], (path, prev, next) => {