From f520fbe5e46cbe22f0571ac200a7d0f8a7af7e27 Mon Sep 17 00:00:00 2001 From: Jigar Wala Date: Mon, 25 Sep 2023 14:49:36 +0530 Subject: [PATCH] :bug: fix casing issue for PoA configs --- packages/config/src/utils/normalize.js | 3 +-- packages/config/test/index.test.js | 6 +++--- packages/core/src/config.js | 2 +- packages/core/src/utils.js | 2 +- packages/core/test/api.test.js | 6 +++--- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/config/src/utils/normalize.js b/packages/config/src/utils/normalize.js index 844fc4de3..1b07c4c42 100644 --- a/packages/config/src/utils/normalize.js +++ b/packages/config/src/utils/normalize.js @@ -5,8 +5,7 @@ import { getSchema } from '../validate.js'; const CAMELCASE_MAP = new Map([ ['css', 'CSS'], ['javascript', 'JavaScript'], - ['dom', 'DOM'], - ['xpaths', 'XPaths'] + ['dom', 'DOM'] ]); // Regular expression that matches words from boundaries or consecutive casing diff --git a/packages/config/test/index.test.js b/packages/config/test/index.test.js index 5e81e6da5..32faae3da 100644 --- a/packages/config/test/index.test.js +++ b/packages/config/test/index.test.js @@ -1211,7 +1211,7 @@ describe('PercyConfig', () => { enableJavaScript: false, disableShadowDOM: true, cliEnableJavaScript: true, - ignoreRegionXPaths: [''] + ignoreRegionXpaths: [''] }); }); @@ -1224,7 +1224,7 @@ describe('PercyConfig', () => { enableJavaScript: false, disableShadowDOM: true, cliEnableJavaScript: true, - ignoreRegionXPaths: [''] + ignoreRegionXpaths: [''] }, { kebab: true })).toEqual({ 'foo-bar': 'baz', foo: { 'bar-baz': 'qux' }, @@ -1246,7 +1246,7 @@ describe('PercyConfig', () => { enableJavaScript: false, disableShadowDOM: true, cliEnableJavaScript: true, - ignoreRegionXPaths: [''] + ignoreRegionXpaths: [''] }, { snake: true })).toEqual({ foo_bar: 'baz', foo: { bar_baz: 'qux' }, diff --git a/packages/core/src/config.js b/packages/core/src/config.js index 8b2024d4f..58874b7d5 100644 --- a/packages/core/src/config.js +++ b/packages/core/src/config.js @@ -84,7 +84,7 @@ export const configSchema = { type: 'string' } }, - considerRegionXPaths: { + considerRegionXpaths: { type: 'array', items: { type: 'string' diff --git a/packages/core/src/utils.js b/packages/core/src/utils.js index 6e055a71a..e3a9bab57 100644 --- a/packages/core/src/utils.js +++ b/packages/core/src/utils.js @@ -46,7 +46,7 @@ export function percyAutomateRequestHandler(req, percy) { ignoreRegionSelectors: percy.config.snapshot.ignoreRegions?.ignoreRegionSelectors, ignoreRegionXpaths: percy.config.snapshot.ignoreRegions?.ignoreRegionXpaths, considerRegionSelectors: percy.config.snapshot.considerRegions?.considerRegionSelectors, - considerRegionXPaths: percy.config.snapshot.considerRegions?.considerRegionXPaths + considerRegionXpaths: percy.config.snapshot.considerRegions?.considerRegionXpaths }, camelCasedOptions ], (path, prev, next) => { diff --git a/packages/core/test/api.test.js b/packages/core/test/api.test.js index 06670302f..536037c13 100644 --- a/packages/core/test/api.test.js +++ b/packages/core/test/api.test.js @@ -277,7 +277,7 @@ describe('API Server', () => { percy.config.snapshot.percyCSS = '.global { color: blue }'; percy.config.snapshot.freezeAnimation = false; percy.config.snapshot.ignoreRegions = { ignoreRegionSelectors: ['.selector-global'] }; - percy.config.snapshot.considerRegions = { considerRegionXPaths: ['/xpath-global'] }; + percy.config.snapshot.considerRegions = { considerRegionXpaths: ['/xpath-global'] }; await expectAsync(request('/percy/automateScreenshot', { body: { @@ -302,8 +302,8 @@ describe('API Server', () => { freezeAnimation: true, percyCSS: '.global { color: blue }\n.percy-screenshot: { color: red }', ignoreRegionSelectors: ['.selector-global'], - ignoreRegionXPaths: ['/xpath-per-screenshot'], - considerRegionXPaths: ['/xpath-global', '/xpath-per-screenshot'] + ignoreRegionXpaths: ['/xpath-per-screenshot'], + considerRegionXpaths: ['/xpath-global', '/xpath-per-screenshot'] } }));