From 41f0a93e7d603ca1fda0a049f47fe90970463a6b Mon Sep 17 00:00:00 2001 From: Yen Truong Date: Wed, 9 Jun 2021 16:19:47 -0400 Subject: [PATCH 1/5] add multilang testing to theme J=1363 --- test-site/config/locale_config.json | 6 ++++++ test-site/scripts/create-verticals.js | 2 +- tests/percy/index.js | 8 ++++++++ tests/percy/photographer.js | 10 ++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) diff --git a/test-site/config/locale_config.json b/test-site/config/locale_config.json index 5897cf38d..a381c2ac7 100644 --- a/test-site/config/locale_config.json +++ b/test-site/config/locale_config.json @@ -6,6 +6,12 @@ // "translationFile": ".po", // the filepath for the translation file // "urlOverride": "", // provide an override for the url path for this locale if you want it to be different than specified in the urlFormat object "experienceKey": "slanswers" // the unique key of your search configuration for this locale + }, + "es": { + // "fallback": [""], // allows you to specify locale fallbacks for this locale + // "translationFile": ".po", // the filepath for the translation file + // "urlOverride": "", // provide an override for the url path for this locale if you want it to be different than specified in the urlFormat object + "experienceKey": "slanswers-es" // the unique key of your search configuration for this locale } }, "urlFormat": { diff --git a/test-site/scripts/create-verticals.js b/test-site/scripts/create-verticals.js index 4dcdd4172..a56760f29 100644 --- a/test-site/scripts/create-verticals.js +++ b/test-site/scripts/create-verticals.js @@ -90,7 +90,7 @@ const testSiteDir = path.resolve(__dirname, '..'); process.chdir(testSiteDir); Object.entries(verticalConfiguration).forEach(([pageName, config]) => { - execSync(`npx jambo vertical --name ${pageName} --verticalKey ${config.verticalKey} --template ${config.template} --cardName ${config.cardName}`); + execSync(`npx jambo vertical --name ${pageName} --verticalKey ${config.verticalKey} --template ${config.template} --cardName ${config.cardName} --locales es`); configMerger.mergeConfigForPage(pageName); pagePatcher.applyPatchToPage(pageName); }); diff --git a/tests/percy/index.js b/tests/percy/index.js index 213426a03..684a0c72f 100644 --- a/tests/percy/index.js +++ b/tests/percy/index.js @@ -17,11 +17,19 @@ PercyScript.run(async (page, percySnapshot) => { const standardPageNavigator = new StandardPageNavigator(page, `http://localhost:${PORT}`); const iframePageNavigator = new IframePageNavigator(page, `http://localhost:${PORT}`, 'iframe_test'); + + const es_standardPageNavigator = new StandardPageNavigator(page, `http://localhost:${PORT}/es/`); + const es_iframePageNavigator = new IframePageNavigator(page, `http://localhost:${PORT}/es/`, 'iframe_test'); + const standardCamera = new Camera(percySnapshot); const iframeCamera = new Camera(percySnapshot, true); await (new Photographer(standardPageNavigator, standardCamera).captureSnapshots()); await (new Photographer(iframePageNavigator, iframeCamera).captureSnapshots()); + + await (new Photographer(es_standardPageNavigator, standardCamera).captureSnapshots()); + await (new Photographer(es_iframePageNavigator, iframeCamera).captureSnapshots()); + server.shutdown(); }); \ No newline at end of file diff --git a/tests/percy/photographer.js b/tests/percy/photographer.js index c8a14cae5..68d573153 100644 --- a/tests/percy/photographer.js +++ b/tests/percy/photographer.js @@ -23,6 +23,16 @@ class Photographer { await this._captureVerticalMapSearch(); await this._captureVerticalFullPageMapSearch(); await this._captureDirectAnswers(); + + await this._captureUniversalSearchES(); + } + + async _captureUniversalSearchES () { + await this._pageNavigator.gotoUniversalPage(); + await this._camera.snapshot('universal-search'); + + await this._pageNavigator.gotoUniversalPage({ query: 'a' }); + await this._camera.snapshot('universal-search--no-results'); } async _captureUniversalSearch () { From 4864645b30ac4bbef0dbd56f61652807ab381bc9 Mon Sep 17 00:00:00 2001 From: Yen Truong Date: Wed, 9 Jun 2021 16:45:02 -0400 Subject: [PATCH 2/5] percy snapshots --- test-site/config-overrides/events.es.json | 8 +++ test-site/config-overrides/people.es.json | 7 +++ .../pages-patches/people.es.htnl.hbs.patch | 50 +++++++++++++++++++ test-site/scripts/create-verticals.js | 2 + tests/percy/index.js | 13 ++--- tests/percy/photographer.js | 6 ++- 6 files changed, 78 insertions(+), 8 deletions(-) create mode 100644 test-site/config-overrides/events.es.json create mode 100644 test-site/config-overrides/people.es.json create mode 100644 test-site/pages-patches/people.es.htnl.hbs.patch diff --git a/test-site/config-overrides/events.es.json b/test-site/config-overrides/events.es.json new file mode 100644 index 000000000..1d847f823 --- /dev/null +++ b/test-site/config-overrides/events.es.json @@ -0,0 +1,8 @@ +{ + "pageTitle": "Eventos", + "verticalsToConfig": { + "events": { + "label": "Eventos" + } + } +} \ No newline at end of file diff --git a/test-site/config-overrides/people.es.json b/test-site/config-overrides/people.es.json new file mode 100644 index 000000000..61b706508 --- /dev/null +++ b/test-site/config-overrides/people.es.json @@ -0,0 +1,7 @@ +{ + "verticalsToConfig": { + "people": { + "label": "Pesonas" + } + } +} \ No newline at end of file diff --git a/test-site/pages-patches/people.es.htnl.hbs.patch b/test-site/pages-patches/people.es.htnl.hbs.patch new file mode 100644 index 000000000..6ece9f638 --- /dev/null +++ b/test-site/pages-patches/people.es.htnl.hbs.patch @@ -0,0 +1,50 @@ +--- people.es.html.hbs 2021-06-09 16:38:37.000000000 -0400 ++++ people.es.updated.html.hbs 2021-06-09 16:38:50.000000000 -0400 +@@ -1,7 +1,7 @@ + {{#> layouts/html }} + {{#> script/core }} + {{> cards/all }} +- {{!-- {{> templates/vertical-grid/collapsible-filters/page-setup }} --}} ++ {{> templates/vertical-grid/collapsible-filters/page-setup }} + {{> templates/vertical-grid/script/appliedfilters }} + {{> templates/vertical-grid/script/verticalresultscount }} + {{> templates/vertical-grid/script/searchbar }} +@@ -10,8 +10,8 @@ + {{> templates/vertical-grid/script/verticalresults }} + {{> templates/vertical-grid/script/pagination }} + {{> templates/vertical-grid/script/locationbias }} +- {{!-- {{> templates/vertical-grid/script/sortoptions }} --}} +- {{!-- {{> templates/vertical-grid/script/facets }} --}} ++ {{> templates/vertical-grid/script/sortoptions }} ++ {{> templates/vertical-grid/script/facets }} + {{!-- {{> templates/vertical-grid/script/filterbox }} --}} + {{!-- {{> templates/vertical-grid/script/qasubmission }} --}} + {{/script/core }} +@@ -30,8 +30,8 @@ +
+ {{> templates/vertical-grid/markup/verticalresultscount }} + {{> templates/vertical-grid/markup/appliedfilters }} +- {{!-- {{> templates/vertical-grid/collapsible-filters/markup/filterlink }} --}} +- {{!-- {{> templates/vertical-grid/collapsible-filters/markup/viewresultsbutton }} --}} ++ {{> templates/vertical-grid/collapsible-filters/markup/filterlink }} ++ {{> templates/vertical-grid/collapsible-filters/markup/viewresultsbutton }} +
+
+ {{> templates/vertical-grid/markup/spellcheck }} +@@ -40,11 +40,11 @@ + {{!-- {{> templates/vertical-grid/markup/qasubmission }} --}} +
+ +- {{!--
--}} +- {{!-- {{> templates/vertical-grid/markup/sortoptions }} --}} +- {{!-- {{> templates/vertical-grid/markup/filterbox }} --}} +- {{!-- {{> templates/vertical-grid/markup/facets }} --}} +- {{!--
--}} ++
++ {{> templates/vertical-grid/markup/sortoptions }} ++ {{> templates/vertical-grid/markup/filterbox }} ++ {{> templates/vertical-grid/markup/facets }} ++
+ +
+ {{> layouts/yext-logo }} diff --git a/test-site/scripts/create-verticals.js b/test-site/scripts/create-verticals.js index a56760f29..c89935ad7 100644 --- a/test-site/scripts/create-verticals.js +++ b/test-site/scripts/create-verticals.js @@ -93,4 +93,6 @@ Object.entries(verticalConfiguration).forEach(([pageName, config]) => { execSync(`npx jambo vertical --name ${pageName} --verticalKey ${config.verticalKey} --template ${config.template} --cardName ${config.cardName} --locales es`); configMerger.mergeConfigForPage(pageName); pagePatcher.applyPatchToPage(pageName); + configMerger.mergeConfigForPage(pageName + '.es'); + pagePatcher.applyPatchToPage(pageName + '.es'); }); diff --git a/tests/percy/index.js b/tests/percy/index.js index 684a0c72f..ec6055de1 100644 --- a/tests/percy/index.js +++ b/tests/percy/index.js @@ -22,14 +22,15 @@ PercyScript.run(async (page, percySnapshot) => { const es_iframePageNavigator = new IframePageNavigator(page, `http://localhost:${PORT}/es/`, 'iframe_test'); const standardCamera = new Camera(percySnapshot); - const iframeCamera = new Camera(percySnapshot, true); + // const iframeCamera = new Camera(percySnapshot, true); - await (new Photographer(standardPageNavigator, standardCamera).captureSnapshots()); - await (new Photographer(iframePageNavigator, iframeCamera).captureSnapshots()); + await (new Photographer(es_standardPageNavigator, standardCamera).captureSnapshotsES()); - - await (new Photographer(es_standardPageNavigator, standardCamera).captureSnapshots()); - await (new Photographer(es_iframePageNavigator, iframeCamera).captureSnapshots()); + + // await (new Photographer(standardPageNavigator, standardCamera).captureSnapshots()); + + // await (new Photographer(iframePageNavigator, iframeCamera).captureSnapshots()); + // await (new Photographer(es_iframePageNavigator, iframeCamera).captureSnapshotsES()); server.shutdown(); }); \ No newline at end of file diff --git a/tests/percy/photographer.js b/tests/percy/photographer.js index 68d573153..815de84f3 100644 --- a/tests/percy/photographer.js +++ b/tests/percy/photographer.js @@ -23,16 +23,18 @@ class Photographer { await this._captureVerticalMapSearch(); await this._captureVerticalFullPageMapSearch(); await this._captureDirectAnswers(); + } + async captureSnapshotsES() { await this._captureUniversalSearchES(); } async _captureUniversalSearchES () { await this._pageNavigator.gotoUniversalPage(); - await this._camera.snapshot('universal-search'); + await this._camera.snapshot('es-universal-search'); await this._pageNavigator.gotoUniversalPage({ query: 'a' }); - await this._camera.snapshot('universal-search--no-results'); + await this._camera.snapshot('es-universal-search--no-results'); } async _captureUniversalSearch () { From a8b64d66126c09e2c97adf618bc22dd199a1a557 Mon Sep 17 00:00:00 2001 From: Yen Truong Date: Wed, 9 Jun 2021 22:42:47 -0400 Subject: [PATCH 3/5] multilang cards --- package.json | 3 ++- .../financial_professionals.es.json | 12 +++++++++++ .../healthcare_professionals.es.json | 10 ++++++++++ .../config-overrides/help_articles.es.json | 12 +++++++++++ test-site/config-overrides/jobs.es.json | 12 +++++++++++ test-site/config-overrides/products.es.json | 10 ++++++++++ test-site/config/index.json | 8 ++++---- test-site/config/locale_config.json | 2 +- test-site/scripts/create-verticals.js | 20 +++++++++---------- tests/percy/index.js | 4 ++-- 10 files changed, 75 insertions(+), 18 deletions(-) create mode 100644 test-site/config-overrides/financial_professionals.es.json create mode 100644 test-site/config-overrides/healthcare_professionals.es.json create mode 100644 test-site/config-overrides/help_articles.es.json create mode 100644 test-site/config-overrides/jobs.es.json create mode 100644 test-site/config-overrides/products.es.json diff --git a/package.json b/package.json index 4b28b5714..abba97284 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "setup-test-site": "./test-site/scripts/setup.sh", "build-test-site": "./test-site/scripts/build.sh", "serve-test-site": "serve -p 5042 test-site/public", - "acceptance": "node ./tests/acceptance/index.js" + "acceptance": "node ./tests/acceptance/index.js", + "percy": "npx percy exec -- node tests/percy/index.js" }, "repository": { "type": "git", diff --git a/test-site/config-overrides/financial_professionals.es.json b/test-site/config-overrides/financial_professionals.es.json new file mode 100644 index 000000000..b3e7971ed --- /dev/null +++ b/test-site/config-overrides/financial_professionals.es.json @@ -0,0 +1,12 @@ +{ + "verticalsToConfig": { + "financial_professionals": { // The vertical key from your search configuration + "label": "Profesionales financieros", // The name of the vertical in the section header and the navigation bar + // "verticalLimit": 15, // The result count limit for vertical search + // "universalLimit": 5, // The result count limit for universal search + "cardType": "multilang-financial-professional-location", // The name of the card to use - e.g. accordion, location, customcard + "icon": "star", // The icon to use on the card for this vertical + "universalSectionTemplate": "standard" + } + } +} \ No newline at end of file diff --git a/test-site/config-overrides/healthcare_professionals.es.json b/test-site/config-overrides/healthcare_professionals.es.json new file mode 100644 index 000000000..99798bcfc --- /dev/null +++ b/test-site/config-overrides/healthcare_professionals.es.json @@ -0,0 +1,10 @@ +{ + "verticalsToConfig": { + "healthcare_professionals": { // The vertical key from your search configuration + "label": "Profesionales de la salud", // The name of the vertical in the section header and the navigation bar + "cardType": "multilang-professional-standard", // The name of the card to use - e.g. accordion, location, customcard + "icon": "star", // The icon to use on the card for this vertical + "universalSectionTemplate": "standard" + } + } +} \ No newline at end of file diff --git a/test-site/config-overrides/help_articles.es.json b/test-site/config-overrides/help_articles.es.json new file mode 100644 index 000000000..3c5ab13b5 --- /dev/null +++ b/test-site/config-overrides/help_articles.es.json @@ -0,0 +1,12 @@ +{ + "verticalsToConfig": { + "help_articles": { // The vertical key from your search configuration + "label": "Artículos de ayuda", // The name of the vertical in the section header and the navigation bar + // "verticalLimit": 15, // The result count limit for vertical search + // "universalLimit": 5, // The result count limit for universal search + "cardType": "document-standard", // The name of the card to use - e.g. accordion, location, customcard + "icon": "star", // The icon to use on the card for this vertical + "universalSectionTemplate": "standard" + } + } +} \ No newline at end of file diff --git a/test-site/config-overrides/jobs.es.json b/test-site/config-overrides/jobs.es.json new file mode 100644 index 000000000..a615f1dc1 --- /dev/null +++ b/test-site/config-overrides/jobs.es.json @@ -0,0 +1,12 @@ +{ + "verticalsToConfig": { + "jobs": { // The vertical key from your search configuration + "label": "Trabajos", // The name of the vertical in the section header and the navigation bar + // "verticalLimit": 15, // The result count limit for vertical search + // "universalLimit": 5, // The result count limit for universal search + "cardType": "multilang-job-standard", // The name of the card to use - e.g. accordion, location, customcard + "icon": "star", // The icon to use on the card for this vertical + "universalSectionTemplate": "standard" + } + } +} \ No newline at end of file diff --git a/test-site/config-overrides/products.es.json b/test-site/config-overrides/products.es.json new file mode 100644 index 000000000..5cd7fda6f --- /dev/null +++ b/test-site/config-overrides/products.es.json @@ -0,0 +1,10 @@ +{ + "verticalsToConfig": { + "products": { // The vertical key from your search configuration + "label": "Productos", // The name of the vertical in the section header and the navigation bar + "cardType": "multilang-product-prominentvideo", // The name of the card to use - e.g. accordion, location, customcard + "icon": "star", // The icon to use on the card for this vertical + "universalSectionTemplate": "standard" + } + } +} \ No newline at end of file diff --git a/test-site/config/index.json b/test-site/config/index.json index b88c26b3d..ceb2cbd7f 100644 --- a/test-site/config/index.json +++ b/test-site/config/index.json @@ -36,20 +36,20 @@ }, "KM": { "universalSectionTemplate": "grid-two-columns", - "cardType": "financial-professional-location", + "cardType": "multilang-financial-professional-location", "mapConfig": { "mapProvider": "Google" } }, "products": { "universalSectionTemplate": "grid-three-columns", - "cardType": "product-prominentimage" + "cardType": "multilang-product-prominentimage" }, "links": { - "cardType": "link-standard" + "cardType": "multilang-link-standard" }, "healthcare_professionals": { - "cardType": "professional-location" + "cardType": "multilang-professional-location" } } } \ No newline at end of file diff --git a/test-site/config/locale_config.json b/test-site/config/locale_config.json index a381c2ac7..5f328802f 100644 --- a/test-site/config/locale_config.json +++ b/test-site/config/locale_config.json @@ -9,7 +9,7 @@ }, "es": { // "fallback": [""], // allows you to specify locale fallbacks for this locale - // "translationFile": ".po", // the filepath for the translation file + // "translationFile": "../../translation/es.po", // the filepath for the translation file // "urlOverride": "", // provide an override for the url path for this locale if you want it to be different than specified in the urlFormat object "experienceKey": "slanswers-es" // the unique key of your search configuration for this locale } diff --git a/test-site/scripts/create-verticals.js b/test-site/scripts/create-verticals.js index c89935ad7..f5d5105ca 100644 --- a/test-site/scripts/create-verticals.js +++ b/test-site/scripts/create-verticals.js @@ -18,27 +18,27 @@ const verticalConfiguration = { locations: { verticalKey: 'KM', template: 'vertical-map', - cardName: 'location-standard' + cardName: 'multilang-location-standard' }, locations_google: { verticalKey: 'KM', template: 'vertical-map', - cardName: 'location-standard' + cardName: 'multilang-location-standard' }, locations_full_page_map: { verticalKey: 'KM', template: 'vertical-full-page-map', - cardName: 'location-standard' + cardName: 'multilang-location-standard' }, locations_full_page_map_with_filters: { verticalKey: 'KM', template: 'vertical-full-page-map', - cardName: 'location-standard' + cardName: 'multilang-location-standard' }, people: { verticalKey: 'people', template: 'vertical-grid', - cardName: 'standard' + cardName: 'multilang-standard' }, products: { verticalKey: 'products', @@ -48,22 +48,22 @@ const verticalConfiguration = { products_clickable_image: { verticalKey: 'products', template: 'vertical-grid', - cardName: 'product-prominentimage-clickable' + cardName: 'multilang-product-prominentimage-clickable' }, financial_professionals: { verticalKey: 'financial_professionals', template: 'vertical-standard', - cardName: 'financial-professional-location' + cardName: 'multilang-financial-professional-location' }, healthcare_professionals: { verticalKey: 'healthcare_professionals', template: 'vertical-grid', - cardName: 'professional-standard' + cardName: 'multilang-professional-standard' }, jobs: { verticalKey: 'jobs', template: 'vertical-standard', - cardName: 'job-standard' + cardName: 'multilang-job-standard' }, help_articles: { verticalKey: 'help_articles', @@ -73,7 +73,7 @@ const verticalConfiguration = { menu_items: { verticalKey: 'menu_items', template: 'vertical-grid', - cardName: 'menuitem-standard' + cardName: 'multilang-menuitem-standard' } }; diff --git a/tests/percy/index.js b/tests/percy/index.js index ec6055de1..6d53df354 100644 --- a/tests/percy/index.js +++ b/tests/percy/index.js @@ -18,7 +18,7 @@ PercyScript.run(async (page, percySnapshot) => { const standardPageNavigator = new StandardPageNavigator(page, `http://localhost:${PORT}`); const iframePageNavigator = new IframePageNavigator(page, `http://localhost:${PORT}`, 'iframe_test'); - const es_standardPageNavigator = new StandardPageNavigator(page, `http://localhost:${PORT}/es/`); + const es_standardPageNavigator = new StandardPageNavigator(page, `http://localhost:${PORT}`); const es_iframePageNavigator = new IframePageNavigator(page, `http://localhost:${PORT}/es/`, 'iframe_test'); const standardCamera = new Camera(percySnapshot); @@ -26,7 +26,7 @@ PercyScript.run(async (page, percySnapshot) => { await (new Photographer(es_standardPageNavigator, standardCamera).captureSnapshotsES()); - + // await (new Photographer(standardPageNavigator, standardCamera).captureSnapshots()); // await (new Photographer(iframePageNavigator, iframeCamera).captureSnapshots()); From 768fc429019c0c2fe2cb8fca8bd66f42e7db5bcb Mon Sep 17 00:00:00 2001 From: Yen Truong Date: Thu, 10 Jun 2021 11:24:58 -0400 Subject: [PATCH 4/5] update navigator and photographer to handle multilang --- test-site/config-overrides/events.es.json | 9 +- test-site/config-overrides/menu_items.es.json | 10 ++ .../products_clickable_image.es.json | 10 ++ .../pages-patches/people.es.htnl.hbs.patch | 50 ------- tests/percy/iframepagenavigator.js | 18 ++- tests/percy/index.js | 17 ++- tests/percy/multilangphotographer.js | 128 ++++++++++++++++++ tests/percy/standardpagenavigator.js | 18 ++- 8 files changed, 193 insertions(+), 67 deletions(-) create mode 100644 test-site/config-overrides/menu_items.es.json create mode 100644 test-site/config-overrides/products_clickable_image.es.json delete mode 100644 test-site/pages-patches/people.es.htnl.hbs.patch create mode 100644 tests/percy/multilangphotographer.js diff --git a/test-site/config-overrides/events.es.json b/test-site/config-overrides/events.es.json index 1d847f823..4764898d4 100644 --- a/test-site/config-overrides/events.es.json +++ b/test-site/config-overrides/events.es.json @@ -1,7 +1,12 @@ { - "pageTitle": "Eventos", "verticalsToConfig": { - "events": { + "events": { // The vertical key from your search configuration + // "label": "", // The name of the vertical in the section header and the navigation bar + // "verticalLimit": 15, // The result count limit for vertical search + // "universalLimit": 5, // The result count limit for universal search + "cardType": "event-custom", // The name of the card to use - e.g. accordion, location, customcard + "icon": "star", // The icon to use on the card for this vertical + "universalSectionTemplate": "standard", "label": "Eventos" } } diff --git a/test-site/config-overrides/menu_items.es.json b/test-site/config-overrides/menu_items.es.json new file mode 100644 index 000000000..57e1c497a --- /dev/null +++ b/test-site/config-overrides/menu_items.es.json @@ -0,0 +1,10 @@ +{ + "verticalsToConfig": { + "menu_items": { // The vertical key from your search configuration + "label": "Elementos de menú", // The name of the vertical in the section header and the navigation bar + "cardType": "multilang-menuitem-standard", // The name of the card to use - e.g. accordion, location, customcard + "icon": "star", // The icon to use on the card for this vertical + "universalSectionTemplate": "standard" + } + } +} \ No newline at end of file diff --git a/test-site/config-overrides/products_clickable_image.es.json b/test-site/config-overrides/products_clickable_image.es.json new file mode 100644 index 000000000..e50f7aa93 --- /dev/null +++ b/test-site/config-overrides/products_clickable_image.es.json @@ -0,0 +1,10 @@ +{ + "verticalsToConfig": { + "products": { // The vertical key from your search configuration + "label": "Productos", // The name of the vertical in the section header and the navigation bar + "cardType": "multilang-product-prominentimage-clickable", // The name of the card to use - e.g. accordion, location, customcard + "icon": "star", // The icon to use on the card for this vertical + "universalSectionTemplate": "standard" + } + } +} \ No newline at end of file diff --git a/test-site/pages-patches/people.es.htnl.hbs.patch b/test-site/pages-patches/people.es.htnl.hbs.patch deleted file mode 100644 index 6ece9f638..000000000 --- a/test-site/pages-patches/people.es.htnl.hbs.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- people.es.html.hbs 2021-06-09 16:38:37.000000000 -0400 -+++ people.es.updated.html.hbs 2021-06-09 16:38:50.000000000 -0400 -@@ -1,7 +1,7 @@ - {{#> layouts/html }} - {{#> script/core }} - {{> cards/all }} -- {{!-- {{> templates/vertical-grid/collapsible-filters/page-setup }} --}} -+ {{> templates/vertical-grid/collapsible-filters/page-setup }} - {{> templates/vertical-grid/script/appliedfilters }} - {{> templates/vertical-grid/script/verticalresultscount }} - {{> templates/vertical-grid/script/searchbar }} -@@ -10,8 +10,8 @@ - {{> templates/vertical-grid/script/verticalresults }} - {{> templates/vertical-grid/script/pagination }} - {{> templates/vertical-grid/script/locationbias }} -- {{!-- {{> templates/vertical-grid/script/sortoptions }} --}} -- {{!-- {{> templates/vertical-grid/script/facets }} --}} -+ {{> templates/vertical-grid/script/sortoptions }} -+ {{> templates/vertical-grid/script/facets }} - {{!-- {{> templates/vertical-grid/script/filterbox }} --}} - {{!-- {{> templates/vertical-grid/script/qasubmission }} --}} - {{/script/core }} -@@ -30,8 +30,8 @@ -
- {{> templates/vertical-grid/markup/verticalresultscount }} - {{> templates/vertical-grid/markup/appliedfilters }} -- {{!-- {{> templates/vertical-grid/collapsible-filters/markup/filterlink }} --}} -- {{!-- {{> templates/vertical-grid/collapsible-filters/markup/viewresultsbutton }} --}} -+ {{> templates/vertical-grid/collapsible-filters/markup/filterlink }} -+ {{> templates/vertical-grid/collapsible-filters/markup/viewresultsbutton }} -
-
- {{> templates/vertical-grid/markup/spellcheck }} -@@ -40,11 +40,11 @@ - {{!-- {{> templates/vertical-grid/markup/qasubmission }} --}} -
- -- {{!--
--}} -- {{!-- {{> templates/vertical-grid/markup/sortoptions }} --}} -- {{!-- {{> templates/vertical-grid/markup/filterbox }} --}} -- {{!-- {{> templates/vertical-grid/markup/facets }} --}} -- {{!--
--}} -+
-+ {{> templates/vertical-grid/markup/sortoptions }} -+ {{> templates/vertical-grid/markup/filterbox }} -+ {{> templates/vertical-grid/markup/facets }} -+
-
-
- {{> layouts/yext-logo }} diff --git a/tests/percy/iframepagenavigator.js b/tests/percy/iframepagenavigator.js index 6c4f0bdec..f686c0907 100644 --- a/tests/percy/iframepagenavigator.js +++ b/tests/percy/iframepagenavigator.js @@ -9,24 +9,36 @@ class IframePageNavigator extends PageNavigator { * @param {import('puppeteer').Page} page A Pupeteer Page * @param {string} siteUrl A url to the index of the site * @param {string} iframePage The name of the iframe page + * @param {string} defaultLocale default locale config of the site */ - constructor(page, siteUrl, iframePage) { + constructor(page, siteUrl, iframePage, defaultLocale='en') { super(); this._page = page; this._siteUrl = siteUrl; this._iframePage = iframePage; + this._defaultLocale = defaultLocale; + this._localeUrlPath = ''; + } + + /** + * Set locale for the site + * + * @param {string} locale + */ + setCurrentLocale(locale) { + this._localeUrlPath = locale === this.defaultLocale? '' : '/' + locale; } async gotoUniversalPage(queryParams = {}) { const queryParamsString = getQueryParamsString(queryParams); - const url = `${this._siteUrl}/${this._iframePage}.html?${queryParamsString}`; + const url = `${this._siteUrl}${this._localeUrlPath}/${this._iframePage}.html?${queryParamsString}`; await this._page.goto(url); await waitTillHTMLRendered(this._page); } async gotoVerticalPage(vertical, queryParams = {}) { const queryParamsString = getQueryParamsString(queryParams); - const url = `${this._siteUrl}/${this._iframePage}.html?verticalUrl=${vertical}.html&${queryParamsString}`; + const url = `${this._siteUrl}${this._localeUrlPath}/${this._iframePage}.html?verticalUrl=${vertical}.html&${queryParamsString}`; await this._page.goto(url); await waitTillHTMLRendered(this._page); } diff --git a/tests/percy/index.js b/tests/percy/index.js index 6d53df354..d6cf82766 100644 --- a/tests/percy/index.js +++ b/tests/percy/index.js @@ -1,6 +1,7 @@ const PercyScript = require('@percy/script'); const HttpServer = require('../test-utils/server'); const Photographer = require('./photographer'); +const MultilangPhotographer = require('./multilangphotographer'); const StandardPageNavigator = require('./standardpagenavigator'); const IframePageNavigator = require('./iframepagenavigator'); const Camera = require('./camera'); @@ -17,20 +18,18 @@ PercyScript.run(async (page, percySnapshot) => { const standardPageNavigator = new StandardPageNavigator(page, `http://localhost:${PORT}`); const iframePageNavigator = new IframePageNavigator(page, `http://localhost:${PORT}`, 'iframe_test'); - - const es_standardPageNavigator = new StandardPageNavigator(page, `http://localhost:${PORT}`); - const es_iframePageNavigator = new IframePageNavigator(page, `http://localhost:${PORT}/es/`, 'iframe_test'); const standardCamera = new Camera(percySnapshot); - // const iframeCamera = new Camera(percySnapshot, true); + const iframeCamera = new Camera(percySnapshot, true); - await (new Photographer(es_standardPageNavigator, standardCamera).captureSnapshotsES()); + await (new Photographer(standardPageNavigator, standardCamera).captureSnapshots()); + await (new Photographer(iframePageNavigator, iframeCamera).captureSnapshots()); + standardPageNavigator.setCurrentLocale('es'); + iframePageNavigator.setCurrentLocale('es'); + await (new MultilangPhotographer(standardPageNavigator, standardCamera, 'es').captureSnapshots()); + await (new MultilangPhotographer(iframePageNavigator, iframeCamera, 'es').captureSnapshots()); - // await (new Photographer(standardPageNavigator, standardCamera).captureSnapshots()); - - // await (new Photographer(iframePageNavigator, iframeCamera).captureSnapshots()); - // await (new Photographer(es_iframePageNavigator, iframeCamera).captureSnapshotsES()); server.shutdown(); }); \ No newline at end of file diff --git a/tests/percy/multilangphotographer.js b/tests/percy/multilangphotographer.js new file mode 100644 index 000000000..49e47e1cd --- /dev/null +++ b/tests/percy/multilangphotographer.js @@ -0,0 +1,128 @@ +/** + * @typedef {import('./pagenavigator.js')} PageNavigator + * @typedef {import('./Camera.js')} Camera + */ + +/** + * Responsible for determining which snapshots to take for specific locale + */ + class MultilangPhotographer { + /** + * @param {PageNavigator} pageNavigator + * @param {Camera} camera + */ + constructor(pageNavigator, camera, locale) { + this._pageNavigator = pageNavigator; + this._camera = camera; + this._locale = locale; + this._queries = {}; + } + + async captureSnapshots() { + switch (this._locale) { + case 'es': + this._queries = { + faq: '¿Qué pasa si olvidé mi contraseña?', + job: 'trabajo', + menu_item: 'rollo' + } + default: + this._queries = { + faq: 'what if i forgot my password?', + job: 'job', + menu_item: 'roll' + } + } + await this._captureUniversalSearch(); + await this._captureVerticalSearch(); + await this._captureVerticalGridSearch(); + await this._captureVerticalMapSearch(); + await this._captureVerticalFullPageMapSearch(); + } + + async _captureUniversalSearch () { + await this._pageNavigator.gotoUniversalPage(); + await this._camera.snapshot(this._locale + '--universal-search'); + + await this._pageNavigator.gotoUniversalPage({ query: 'a' }); + await this._camera.snapshot(this._locale + '--universal-search--no-results'); + + await this._pageNavigator.gotoUniversalPage({ query: 'yext answers'}); + await this._camera.snapshot(this._locale + '--universal-search--product-prominentimage'); + + await this._pageNavigator.gotoUniversalPage({ query: this._queries.faq}); + await this._pageNavigator.click('.HitchhikerFaqAccordion-toggle') + await this._camera.snapshot(this._locale + '--universal-search--faq-accordion'); + } + + async _captureVerticalSearch () { + await this._pageNavigator.gotoVerticalPage('events'); + await this._camera.snapshot(this._locale + '--vertical-search'); + + await this._pageNavigator.gotoVerticalPage('events', { query: 'a' }); + await this._camera.snapshot(this._locale + '--vertical-search--no-results'); + + await this._pageNavigator.gotoVerticalPage('financial_professionals', { query: 'connor' }); + await this._camera.snapshot(this._locale + '--vertical-search--financial-professional-location'); + + await this._pageNavigator.gotoVerticalPage('jobs', { query: this._queries.job }); + await this._camera.snapshot(this._locale + '--vertical-search--job-standard'); + + await this._pageNavigator.gotoVerticalPage('help_articles', { query: 'slap chop' }); + await this._camera.snapshot(this._locale + '--vertical-search--document-standard'); + + await this._pageNavigator.gotoVerticalPage('menu_items', { query: this._queries.menu_item }); + await this._camera.snapshot(this._locale + '--vertical-search--menuitem-standard'); + } + + async _captureVerticalGridSearch () { + await this._pageNavigator.gotoVerticalPage('people', { query: 'a' }); + await this._camera.snapshot(this._locale + '--vertical-grid-search'); + + await this._pageNavigator.gotoVerticalPage('people', { query: 'vrginia' }); + await this._camera.snapshot(this._locale + '--vertical-grid-search--spellcheck'); + + await this._pageNavigator.gotoVerticalPage('products', { query: 'yext answers' }); + await this._camera.snapshot(this._locale + '--vertical-grid-search--product-prominentvideo'); + + await this._pageNavigator.gotoVerticalPage('products_clickable_image', { query: 'yext answers' }); + await this._camera.snapshot(this._locale + '--vertical-grid-search--product-prominentimage-clickable'); + } + + async _captureVerticalMapSearch () { + await this._pageNavigator.gotoVerticalPage('locations', { query: 'a' }); + await this._camera.snapshot(this._locale + '--vertical-map-search'); + + await this._pageNavigator.gotoVerticalPage('locations_google', { query: 'virginia' }); + await this._camera.snapshot(this._locale + '--vertical-map-search--google'); + } + + async _captureVerticalFullPageMapSearch () { + await this._pageNavigator + .gotoVerticalPage('locations_full_page_map', { query: '' }); + await this._camera.snapshotDesktopOnly(this._locale + '--vertical-full-page-map__desktop-view'); + await this._camera.snapshotMobileOnly(this._locale + '--vertical-full-page-map__mobile-list-view'); + + await this._pageNavigator.click('.Answers-mobileToggle'); + await this._camera.snapshotMobileOnly(this._locale + '--vertical-full-page-map__mobile-map-view'); + + const mapboxPinSelector = '.js-answersMap button'; + await this._pageNavigator.click(mapboxPinSelector); + await this._camera.snapshotMobileOnly(this._locale + '--vertical-full-page-map__mobile-detail-view'); + + await this._pageNavigator + .gotoVerticalPage('locations_full_page_map', { query: 'office sparce'}); + await this._camera.snapshotDesktopOnly(this._locale + '--vertical-full-page-map--spellcheck__desktop-view'); + await this._camera.snapshotMobileOnly(this._locale + '--vertical-full-page-map--spellcheck__mobile-list-view'); + + await this._pageNavigator + .gotoVerticalPage('locations_full_page_map', { query: 'virginia' }); + await this._camera.snapshotDesktopOnly(this._locale + '--vertical-full-page-map--nlp-filters__desktop-view'); + + await this._pageNavigator + .gotoVerticalPage('locations_full_page_map_with_filters', { query: 'virginia' }); + await this._camera.snapshotDesktopOnly(this._locale + '--vertical-full-page-map-with-filters--nlp-filters__desktop-view'); + } + } + + module.exports = MultilangPhotographer; \ No newline at end of file diff --git a/tests/percy/standardpagenavigator.js b/tests/percy/standardpagenavigator.js index 37e18ab54..9def8cc6a 100644 --- a/tests/percy/standardpagenavigator.js +++ b/tests/percy/standardpagenavigator.js @@ -8,23 +8,35 @@ class StandardPageNavigator extends PageNavigator { /** * @param {import('puppeteer').Page} page A Pupeteer Page * @param {string} siteUrl A url to the index of the site + * @param {string} defaultLocale default locale config of the site */ - constructor(page, siteUrl) { + constructor(page, siteUrl, defaultLocale='en') { super(); this._page = page; this._siteUrl = siteUrl; + this._defaultLocale = defaultLocale; + this._localeUrlPath = ''; + } + + /** + * Set locale for the site + * + * @param {string} locale + */ + setCurrentLocale(locale) { + this._localeUrlPath = locale === this.defaultLocale? '' : '/' + locale; } async gotoUniversalPage(queryParams = {}) { const queryParamsString = getQueryParamsString(queryParams); - const url = `${this._siteUrl}?${queryParamsString}`; + const url = `${this._siteUrl}${this._localeUrlPath}?${queryParamsString}`; await this._page.goto(url); await waitTillHTMLRendered(this._page); } async gotoVerticalPage(vertical, queryParams = {}) { const queryParamsString = getQueryParamsString(queryParams); - const url = `${this._siteUrl}/${vertical}.html?${queryParamsString}`; + const url = `${this._siteUrl}${this._localeUrlPath}/${vertical}.html?${queryParamsString}`; await this._page.goto(url); await waitTillHTMLRendered(this._page); } From a0dbb6d539fa1073a705b09a39bc22806a6ca974 Mon Sep 17 00:00:00 2001 From: Yen Truong Date: Thu, 10 Jun 2021 12:15:35 -0400 Subject: [PATCH 5/5] change custom cards --- test-site/scripts/build.sh | 6 +++--- tests/percy/photographer.js | 18 +++--------------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/test-site/scripts/build.sh b/test-site/scripts/build.sh index dc3245e84..4951796ba 100755 --- a/test-site/scripts/build.sh +++ b/test-site/scripts/build.sh @@ -12,9 +12,9 @@ rm -rf directanswercards/allfields-custom set -e -npx jambo card --name event-custom --templateCardFolder cards/event-standard -npx jambo directanswercard --name allfields-custom --templateCardFolder directanswercards/allfields-standard +npx jambo card --name event-custom --templateCardFolder cards/multilang-event-standard +npx jambo directanswercard --name allfields-custom --templateCardFolder directanswercards/multilang-allfields-standard node scripts/create-verticals.js -npx jambo build && grunt webpack +npx jambo build && npx grunt webpack diff --git a/tests/percy/photographer.js b/tests/percy/photographer.js index 815de84f3..0f31fb1b7 100644 --- a/tests/percy/photographer.js +++ b/tests/percy/photographer.js @@ -6,7 +6,7 @@ /** * Responsible for determining which snapshots to take */ -class Photographer { + class Photographer { /** * @param {PageNavigator} pageNavigator * @param {Camera} camera @@ -24,18 +24,6 @@ class Photographer { await this._captureVerticalFullPageMapSearch(); await this._captureDirectAnswers(); } - - async captureSnapshotsES() { - await this._captureUniversalSearchES(); - } - - async _captureUniversalSearchES () { - await this._pageNavigator.gotoUniversalPage(); - await this._camera.snapshot('es-universal-search'); - - await this._pageNavigator.gotoUniversalPage({ query: 'a' }); - await this._camera.snapshot('es-universal-search--no-results'); - } async _captureUniversalSearch () { await this._pageNavigator.gotoUniversalPage(); @@ -82,8 +70,8 @@ class Photographer { await this._pageNavigator.gotoVerticalPage('people', { query: 'a' }); await this._camera.snapshot('vertical-grid-search'); - await this._pageNavigator.gotoVerticalPage('people', { query: 'vrginia' }); - await this._camera.snapshot('vertical-grid-search--spellcheck'); + // await this._pageNavigator.gotoVerticalPage('people', { query: 'vrginia' }); + // await this._camera.snapshot('vertical-grid-search--spellcheck'); await this._pageNavigator.gotoVerticalPage('products', { query: 'yext answers' }); await this._camera.snapshot('vertical-grid-search--product-prominentvideo');