diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 1b4b984f7..f7429f2be 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -9,22 +9,9 @@ on: pull_request: jobs: - Coveralls: - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [15.x] - - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: npm ci - - run: npx jest tests/static/ --coverage - - name: Coveralls - uses: coverallsapp/github-action@master - with: - github-token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + call_coveralls: + uses: yext/slapshot-reusable-workflows/.github/workflows/coverage.yml@v1 + with: + test_script: npx jest tests/static/ --coverage + secrets: + caller_github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/percy-snapshots.yml b/.github/workflows/percy-snapshots.yml index f71776293..a5053af80 100644 --- a/.github/workflows/percy-snapshots.yml +++ b/.github/workflows/percy-snapshots.yml @@ -1,6 +1,6 @@ name: Percy Snapshots -on: +on: push: branches-ignore: dev/* pull_request: @@ -14,90 +14,46 @@ jobs: - id: nonce run: echo "::set-output name=result::${{ github.run_id }}-$(date +%s)" - default-snapshots: - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [12.18] + call_snapshots_default: needs: nonce - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: npm ci - - run: npm run setup-test-site - - run: npm run build-test-site - - name: Percy snapshots - run: npx percy exec --parallel -- node tests/percy/index.js - env: - PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }} - PERCY_PARALLEL_NONCE: ${{ needs.nonce.outputs.result }} - PERCY_PARALLEL_TOTAL: 4 + uses: yext/slapshot-reusable-workflows/.github/workflows/percy_snapshots.yml@v1 + with: + build_script: npm run setup-test-site && npm run build-test-site + percy_script: npx percy exec --parallel -- node tests/percy/index.js + PERCY_PARALLEL_NONCE: ${{ needs.nonce.outputs.result }} + PERCY_PARALLEL_TOTAL: 4 + secrets: + PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }} - iframe-snapshots: - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [12.18] + call_snapshots_iframe: needs: nonce - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: npm ci - - run: npm run setup-test-site - - run: npm run build-test-site - - name: Percy snapshots - run: npx percy exec --parallel -- node tests/percy/index.js iframe - env: - PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }} - PERCY_PARALLEL_NONCE: ${{ needs.nonce.outputs.result }} - PERCY_PARALLEL_TOTAL: 4 + uses: yext/slapshot-reusable-workflows/.github/workflows/percy_snapshots.yml@v1 + with: + build_script: npm run setup-test-site && npm run build-test-site + percy_script: npx percy exec --parallel -- node tests/percy/index.js iframe + PERCY_PARALLEL_NONCE: ${{ needs.nonce.outputs.result }} + PERCY_PARALLEL_TOTAL: 4 + secrets: + PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }} - spanish-snapshots: - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [12.18] + call_snapshots_spanish: needs: nonce - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: npm ci - - run: npm run setup-test-site - - run: npm run build-test-site - - name: Percy snapshots - run: npx percy exec --parallel -- node tests/percy/index.js spanish - env: - PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }} - PERCY_PARALLEL_NONCE: ${{ needs.nonce.outputs.result }} - PERCY_PARALLEL_TOTAL: 4 + uses: yext/slapshot-reusable-workflows/.github/workflows/percy_snapshots.yml@v1 + with: + build_script: npm run setup-test-site && npm run build-test-site + percy_script: npx percy exec --parallel -- node tests/percy/index.js spanish + PERCY_PARALLEL_NONCE: ${{ needs.nonce.outputs.result }} + PERCY_PARALLEL_TOTAL: 4 + secrets: + PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }} - rtl-snapshots: - runs-on: ubuntu-latest - strategy: - matrix: - node-version: [12.18] + call_snapshots_rtl: needs: nonce - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: npm ci - - run: npm run setup-test-site - - run: npm run build-test-site - - name: Percy snapshots - run: npx percy exec --parallel -- node tests/percy/index.js rtl - env: - PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }} - PERCY_PARALLEL_NONCE: ${{ needs.nonce.outputs.result }} - PERCY_PARALLEL_TOTAL: 4 + uses: yext/slapshot-reusable-workflows/.github/workflows/percy_snapshots.yml@v1 + with: + build_script: npm run setup-test-site && npm run build-test-site + percy_script: npx percy exec --parallel -- node tests/percy/index.js rtl + PERCY_PARALLEL_NONCE: ${{ needs.nonce.outputs.result }} + PERCY_PARALLEL_TOTAL: 4 + secrets: + PERCY_TOKEN: ${{ secrets.PERCY_TOKEN }} diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 48caaf756..2ecb067ec 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -6,19 +6,7 @@ name: Run Tests on: [push, pull_request] jobs: - build: - - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [12.x, 14.x, 15.x] - - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - run: npm ci - - run: npm test + call_run_tests: + uses: yext/slapshot-reusable-workflows/.github/workflows/run_tests.yml@v1 + with: + build_script: '' diff --git a/.github/workflows/sync_develop_and_main.yml b/.github/workflows/sync_develop_and_main.yml index 3c1bfb9d1..45808a607 100644 --- a/.github/workflows/sync_develop_and_main.yml +++ b/.github/workflows/sync_develop_and_main.yml @@ -1,27 +1,11 @@ -name: create PR from main to develop +name: Create PR from main to develop on: push: branches: [main, master] -permissions: - contents: read - pull-requests: write - jobs: - createPullRequest: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: extract package version - id: vars - run: | - PACKAGE_VERSION="v$(cat ./package.json | grep version | head -1 | awk -F: '{ print $2 }' | sed 's/[",]//g' | tr -d '[[:space:]]')" - echo ::set-output name=tag::${PACKAGE_VERSION} - - uses: repo-sync/pull-request@v2 - with: - source_branch: "${{ github.event.repository.default_branch }}" - destination_branch: "develop" - pr_title: "Merge ${{ github.event.repository.default_branch }} (${{ steps.vars.outputs.tag }}) into develop" - pr_body: "Merge ${{ github.event.repository.default_branch }} (${{ steps.vars.outputs.tag }}) into develop" - github_token: ${{ secrets.GITHUB_TOKEN }} + call_sync_develop_and_main: + uses: yext/slapshot-reusable-workflows/.github/workflows/sync_develop_and_main.yml@v1 + secrets: + caller_github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/version-update.yml b/.github/workflows/version-update.yml index e4a944be6..a246e47fa 100644 --- a/.github/workflows/version-update.yml +++ b/.github/workflows/version-update.yml @@ -4,49 +4,8 @@ on: push: branches: [release/*, hotfix/*] -permissions: - contents: write - pull-requests: write - jobs: - update-version: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - - name: update package version - id: vars - run: | - BRANCH_NAME="${GITHUB_REF#refs/heads/}" - PACKAGE_VERSION="${GITHUB_REF##*/}" - echo ::set-output name=branch::${BRANCH_NAME} - if [[ $PACKAGE_VERSION =~ ^v[0-9]+\.[0-9]+(\.[0-9]+)?$ ]] - then - if [[ $PACKAGE_VERSION =~ ^v[0-9]+\.[0-9]+$ ]] - then - PACKAGE_VERSION="${PACKAGE_VERSION}.0" - fi - echo ::set-output name=version::${PACKAGE_VERSION} - git config user.name 'github-actions[bot]' - git config user.email 'github-actions[bot]@users.noreply.github.com' - if npm version ${PACKAGE_VERSION} | tee >( grep -q 'npm ERR! Version not changed' ) - then - echo "Package version is already in sync with branch name." - echo ::set-output name=should_create_pr::0 - exit 0 - fi - echo ::set-output name=should_create_pr::1 - git push -u origin HEAD:"dev/update-version-${PACKAGE_VERSION}" - else - echo "Branch name ${BRANCH_NAME} does not have the correct format with package version." - exit 1 - fi - - name: create version update pr - if: steps.vars.outputs.should_create_pr == 1 - uses: repo-sync/pull-request@v2 - with: - source_branch: "dev/update-version-${{ steps.vars.outputs.version }}" - destination_branch: "${{ steps.vars.outputs.branch }}" - pr_title: "Update Package Version to ${{ steps.vars.outputs.version }}" - pr_body: "*An automated PR which updates the version number in package.json and package-lock.json files*" - github_token: ${{ secrets.GITHUB_TOKEN }} + call_version_update: + uses: yext/slapshot-reusable-workflows/.github/workflows/version_update.yml@v1 + secrets: + caller_github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/wcag_test.yml b/.github/workflows/wcag_test.yml index c0a7aa60d..e2c267310 100644 --- a/.github/workflows/wcag_test.yml +++ b/.github/workflows/wcag_test.yml @@ -5,20 +5,7 @@ on: branches: [develop, hotfix/*, release/*, support/*] jobs: - WCAG-test: - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [14.x] - - steps: - - uses: actions/checkout@v2 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2 - with: - node-version: ${{ matrix.node-version }} - - run: npm ci - - run: npm run setup-test-site - - run: npm run build-test-site - - run: npm run wcag \ No newline at end of file + call_wcag_test: + uses: yext/slapshot-reusable-workflows/.github/workflows/wcag_test.yml@v1 + with: + build_script: npm run setup-test-site && npm run build-test-site diff --git a/cards/card_component.js b/cards/card_component.js index 511d3fb92..6d1543dd3 100644 --- a/cards/card_component.js +++ b/cards/card_component.js @@ -80,32 +80,57 @@ BaseCard["{{componentName}}"] = class extends ANSWERS.Component { cardData.feedbackEnabled = ANSWERS.getAnalyticsOptIn() && cardData.feedback; - const { details, showMoreDetails } = cardData; - - const cardDetails = details || ''; - const cardShowMoreConfig = showMoreDetails || {}; - const { showMoreLimit } = cardShowMoreConfig; - - // Set the value of excessDetailsToggle. Note that it is not enough to have a showMoreLimit. - // The card's details must extend past this limit as well for the toggling to be enabled. - const showExcessDetailsToggle = showMoreLimit && cardDetails.length > showMoreLimit; - - const truncatedDetails = showExcessDetailsToggle - ? `${cardDetails.substring(0, showMoreLimit)}...` - : ''; + const { showExcessDetailsToggle, truncatedDetails } = + this._getTruncatedDetails(cardData.details, cardData.showMoreDetails); this.validateDataForRender(cardData); return super.setState({ ...data, card: cardData, - showExcessDetailsToggle: showExcessDetailsToggle, - truncatedDetails: truncatedDetails, + showExcessDetailsToggle, + truncatedDetails, cardName: `{{componentName}}`, relativePath: `{{relativePath}}` }); } + /** + * Returns whether to render the excess details toggle, and + * if so, the truncated details text. + * + * @param {string} details + * @param {Object} showMoreDetails + * @param {number} showMoreDetails.showMoreLimit + * @param {string} showMoreDetails.truncatedDetails + */ + _getTruncatedDetails(details = '', showMoreDetails = {}) { + const { showMoreLimit, truncatedDetails: userSpecifiedTruncatedDetails } = showMoreDetails; + + if (userSpecifiedTruncatedDetails) { + const showExcessDetailsToggle = userSpecifiedTruncatedDetails.length < details.length + const truncatedDetails = showExcessDetailsToggle ? userSpecifiedTruncatedDetails : ''; + return { + showExcessDetailsToggle, + truncatedDetails + } + } + + const suffix = '...'; + + // Set the value of excessDetailsToggle. Note that it is not enough to have a showMoreLimit. + // The card's details must extend past this limit as well for the toggling to be enabled. + const showExcessDetailsToggle = showMoreLimit && (details.length + suffix.length > showMoreLimit); + + const truncatedDetails = showExcessDetailsToggle + ? details.substring(0, showMoreLimit) + suffix + : ''; + return { + showExcessDetailsToggle, + truncatedDetails + }; + } + validateDataForRender(data) { if (!data){ console.error('Error: nothing returned from dataForRender'); diff --git a/cards/faq-accordion/component.js b/cards/faq-accordion/component.js index 657614ec6..1286f47a0 100644 --- a/cards/faq-accordion/component.js +++ b/cards/faq-accordion/component.js @@ -21,7 +21,7 @@ class faq_accordionCardComponent extends BaseCard['faq-accordion'] { // If the card's details are longer than a certain character count, you can truncate the // text. A toggle will be supplied that can show or hide the truncated text. // showMoreDetails: { - // showMoreLimit: null, // Character count limit + // truncatedDetails: profile.answer ? ANSWERS.formatRichText(profile.answer, "answer", linkTarget, 500) : null, // The truncated rich text // showMoreText: '', // Label when toggle will show truncated text // showLessText: '' // Label when toggle will hide truncated text // }, @@ -111,6 +111,19 @@ class faq_accordionCardComponent extends BaseCard['faq-accordion'] { } }); + const showExcessDetailsToggleEls = this._container.querySelectorAll('.js-HitchhikerFaqAccordion-detailsToggle'); + const excessDetailsEls = this._container.querySelectorAll('.js-HitchhikerFaqAccordion-detailsText'); + if (showExcessDetailsToggleEls && excessDetailsEls) { + showExcessDetailsToggleEls.forEach(el => + el.addEventListener('click', () => { + contentEl.style.height = 'auto'; + showExcessDetailsToggleEls.forEach(toggleEl => toggleEl.classList.toggle('js-hidden')); + excessDetailsEls.forEach(detailsEl => detailsEl.classList.toggle('js-hidden')); + contentEl.style.height = `${contentEl.scrollHeight}px`; + }) + ); + } + super.onMount(); } diff --git a/cards/faq-accordion/template.hbs b/cards/faq-accordion/template.hbs index c57bd83c5..fc6e66935 100644 --- a/cards/faq-accordion/template.hbs +++ b/cards/faq-accordion/template.hbs @@ -50,21 +50,21 @@ {{#if card.details}}
{{#if showExcessDetailsToggle}} -
+
{{{truncatedDetails}}}
{{/if}} -
+
{{{card.details}}}
{{#if showExcessDetailsToggle}} - - -
{{> templates/vertical-full-page-map/markup/alternativeresults }} @@ -45,6 +44,7 @@ {{!-- {{> templates/vertical-full-page-map/markup/facets }} --}} {{!-- {{> templates/vertical-full-page-map/markup/filterbox }} --}} {{!--
--}} + {{!-- {{> templates/vertical-full-page-map/collapsible-filters/markup/viewresultsbutton }} --}}
diff --git a/templates/vertical-grid/collapsible-filters/script/filterlink.js b/templates/vertical-grid/collapsible-filters/script/filterlink.js index f04667012..0859913f8 100644 --- a/templates/vertical-grid/collapsible-filters/script/filterlink.js +++ b/templates/vertical-grid/collapsible-filters/script/filterlink.js @@ -11,5 +11,8 @@ ANSWERS.addComponent('FilterLink', { CollapsibleFilters.Helpers.clearSearch(); collapsibleFiltersInteractions.focusSearchBar(); }, + onCreate: () => { + collapsibleFiltersInteractions.setupResposiveFiltersLayout(); + }, ...{{{ json componentSettings.FilterLink }}} }); \ No newline at end of file diff --git a/templates/vertical-grid/page-config.json b/templates/vertical-grid/page-config.json index b311b8dad..c6e2d7c73 100644 --- a/templates/vertical-grid/page-config.json +++ b/templates/vertical-grid/page-config.json @@ -66,7 +66,7 @@ "": { // 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": 4, // The result count limit for universal search + "universalLimit": 3, // The result count limit for universal search "cardType": "product-prominentimage", // 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": "grid-three-columns" diff --git a/templates/vertical-grid/page.html.hbs b/templates/vertical-grid/page.html.hbs index 1362ae503..ba627632c 100644 --- a/templates/vertical-grid/page.html.hbs +++ b/templates/vertical-grid/page.html.hbs @@ -26,25 +26,29 @@ The overlay partial should only be added to ONE page of your site, e.g. if you uncomment the partial for this page, you should not use it on any other page. --> {{!-- {{> layouts/overlay-suggestions }} --}} -
- {{> templates/vertical-grid/markup/spellcheck }} -
- {{> 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/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 }} --}} - {{!--
--}} -
- {{> templates/vertical-grid/markup/verticalresults }} - {{> templates/vertical-grid/markup/pagination }} - {{!-- {{> templates/vertical-grid/markup/qasubmission }} --}} +
+ {{> templates/vertical-grid/markup/spellcheck }} +
+ {{> templates/vertical-grid/markup/verticalresultscount }} + {{> templates/vertical-grid/markup/appliedfilters }} + {{!-- {{> templates/vertical-grid/collapsible-filters/markup/filterlink }} --}} +
+
+ {{> templates/vertical-grid/markup/verticalresults }} + {{> templates/vertical-grid/markup/pagination }} + {{!-- {{> templates/vertical-grid/markup/qasubmission }} --}} +
+ {{!-- {{> templates/vertical-grid/collapsible-filters/markup/viewresultsbutton }} --}}
{{> layouts/yext-logo }} diff --git a/templates/vertical-map/page.html.hbs b/templates/vertical-map/page.html.hbs index e9e21d377..feb085072 100644 --- a/templates/vertical-map/page.html.hbs +++ b/templates/vertical-map/page.html.hbs @@ -34,7 +34,6 @@ {{> templates/vertical-map/markup/verticalresultscount }} {{> templates/vertical-map/markup/appliedfilters }} {{!-- {{> templates/vertical-map/collapsible-filters/markup/filterlink }} --}} - {{!-- {{> templates/vertical-map/collapsible-filters/markup/viewresultsbutton }} --}}
{{!--
--}} @@ -42,6 +41,7 @@ {{!-- {{> templates/vertical-map/markup/facets }} --}} {{!-- {{> templates/vertical-map/markup/filterbox }} --}} {{!--
--}} + {{!-- {{> templates/vertical-map/collapsible-filters/markup/viewresultsbutton }} --}}
{{> templates/vertical-map/markup/verticalresults }} {{> templates/vertical-map/markup/pagination }} diff --git a/templates/vertical-standard/collapsible-filters/script/filterlink.js b/templates/vertical-standard/collapsible-filters/script/filterlink.js index f04667012..0859913f8 100644 --- a/templates/vertical-standard/collapsible-filters/script/filterlink.js +++ b/templates/vertical-standard/collapsible-filters/script/filterlink.js @@ -11,5 +11,8 @@ ANSWERS.addComponent('FilterLink', { CollapsibleFilters.Helpers.clearSearch(); collapsibleFiltersInteractions.focusSearchBar(); }, + onCreate: () => { + collapsibleFiltersInteractions.setupResposiveFiltersLayout(); + }, ...{{{ json componentSettings.FilterLink }}} }); \ No newline at end of file diff --git a/templates/vertical-standard/page.html.hbs b/templates/vertical-standard/page.html.hbs index 767d24184..4e51d87a2 100644 --- a/templates/vertical-standard/page.html.hbs +++ b/templates/vertical-standard/page.html.hbs @@ -29,25 +29,29 @@ partial for this page, you should not use it on any other page. --> {{!-- {{> layouts/overlay-suggestions }} --}}
- {{!-- {{> templates/vertical-standard/markup/directanswer }} --}} - {{> templates/vertical-standard/markup/spellcheck }} -
- {{> templates/vertical-standard/markup/verticalresultscount }} - {{> templates/vertical-standard/markup/appliedfilters }} - {{!-- {{> templates/vertical-standard/collapsible-filters/markup/filterlink }} --}} - {{!-- {{> templates/vertical-standard/collapsible-filters/markup/viewresultsbutton }} --}} +
+ + {{!--
--}} + {{!-- {{> templates/vertical-standard/markup/sortoptions }} --}} + {{!-- {{> templates/vertical-standard/markup/filterbox }} --}} + {{!-- {{> templates/vertical-standard/markup/facets }} --}} + {{!--
--}}
- - {{!--
--}} - {{!-- {{> templates/vertical-standard/markup/sortoptions }} --}} - {{!-- {{> templates/vertical-standard/markup/filterbox }} --}} - {{!-- {{> templates/vertical-standard/markup/facets }} --}} - {{!--
--}} -
- {{> templates/vertical-standard/markup/verticalresults }} - {{> templates/vertical-standard/markup/pagination }} - {{!-- {{> templates/vertical-standard/markup/qasubmission }} --}} +
+ {{!-- {{> templates/vertical-standard/markup/directanswer }} --}} + {{> templates/vertical-standard/markup/spellcheck }} +
+ {{> templates/vertical-standard/markup/verticalresultscount }} + {{> templates/vertical-standard/markup/appliedfilters }} + {{!-- {{> templates/vertical-standard/collapsible-filters/markup/filterlink }} --}} +
+
+ {{> templates/vertical-standard/markup/verticalresults }} + {{> templates/vertical-standard/markup/pagination }} + {{!-- {{> templates/vertical-standard/markup/qasubmission }} --}} +
+ {{!-- {{> templates/vertical-standard/collapsible-filters/markup/viewresultsbutton }} --}}
{{> layouts/yext-logo }} diff --git a/templates/vertical-standard/script/filteroptions.hbs b/templates/vertical-standard/script/filteroptions.hbs index a61cec62c..4435f0a77 100644 --- a/templates/vertical-standard/script/filteroptions.hbs +++ b/templates/vertical-standard/script/filteroptions.hbs @@ -1,9 +1,4 @@ -ANSWERS.addComponent("FilterOptions", -{{#shallowMergeConfig}}[ - { - "container": "#standard-filteroptions-container" - }, - {{{json componentSettings.FilterOptions}}} -] -{{/shallowMergeConfig}} -); +ANSWERS.addComponent("FilterOptions", { + container: "#standard-filteroptions-container", + ...{{{json componentSettings.FilterOptions}}} +}); diff --git a/test-site/.gitignore b/test-site/.gitignore index ac0661c47..44b520f28 100644 --- a/test-site/.gitignore +++ b/test-site/.gitignore @@ -9,6 +9,7 @@ package.json webpack-config.js !cards/custom-cta-icons/ +!cards/multilang-product-prominentvideo-custom/ !config/global_config.json !config/locale_config.json !config/index.json diff --git a/test-site/cards/multilang-product-prominentvideo-custom/component.js b/test-site/cards/multilang-product-prominentvideo-custom/component.js new file mode 100644 index 000000000..81e5acff6 --- /dev/null +++ b/test-site/cards/multilang-product-prominentvideo-custom/component.js @@ -0,0 +1,106 @@ +{{> cards/card_component componentName='multilang-product-prominentvideo-custom' }} + +class multilang_product_prominentvideo_customCardComponent extends BaseCard['multilang-product-prominentvideo-custom'] { + constructor(config = {}, systemConfig = {}) { + super(config, systemConfig); + } + + /** + * This returns an object that will be called `card` + * in the template. Put all mapping logic here. + * + * @param profile profile of the entity in the card + */ + dataForRender(profile) { + this.youtubeUrl = Formatter.getYoutubeUrl(profile.videos || []); + this.vimeoUrl = profile.c_vimeo; + + const linkTarget = AnswersExperience.runtimeConfig.get('linkTarget') || '_top'; + + return { + title: profile.name, // The header text of the card + url: profile.landingPageUrl, // If the card title is a clickable link, set URL here + target: linkTarget, // If the title's URL should open in a new tab, etc. + titleEventOptions: this.addDefaultEventOptions(), + subtitle: profile.featuredMessage?.description, // The sub-header text of the card + videoUrl: this.youtubeUrl || this.vimeoUrl, + details: profile.richTextDescription ? ANSWERS.formatRichText(profile.richTextDescription, 'richTextDescription', linkTarget) : null, // The text in the body of the card + // If the card's details are longer than a certain character count, you can truncate the + // text. A toggle will be supplied that can show or hide the truncated text. + showMoreDetails: { + truncatedDetails: profile.richTextDescription ? ANSWERS.formatRichText(profile.richTextDescription, 'richTextDescription', linkTarget, 38) : null, // The truncated rich text + showMoreText: {{ translateJS phrase='Show more' }}, // Label when toggle will show truncated text + showLessText: {{ translateJS phrase='Show less' }} // Label when toggle will hide truncated text + }, + // The primary CTA of the card + CTA1: { + label: profile.c_primaryCTA ? profile.c_primaryCTA.label : null, // The CTA's label + iconName: 'chevron', // The icon to use for the CTA + url: Formatter.generateCTAFieldTypeLink(profile.c_primaryCTA), // The URL a user will be directed to when clicking + target: linkTarget, // Where the new URL will be opened + eventType: 'CTA_CLICK', // Type of Analytics event fired when clicking the CTA + eventOptions: this.addDefaultEventOptions(), + // ariaLabel: '', // Accessible text providing a descriptive label for the CTA + }, + // The secondary CTA of the card + CTA2: { + label: profile.c_secondaryCTA ? profile.c_secondaryCTA.label : null, + iconName: 'chevron', + url: Formatter.generateCTAFieldTypeLink(profile.c_secondaryCTA), + target: linkTarget, + eventType: 'CTA_CLICK', + eventOptions: this.addDefaultEventOptions(), + // ariaLabel: '', + }, + feedback: false, // Shows thumbs up/down buttons to provide feedback on the result card + feedbackTextOnSubmission: {{ translateJS phrase='Thanks!' }}, // Text to display after a thumbs up/down is clicked + positiveFeedbackSrText: {{ translateJS phrase='This answered my question' }}, // Screen reader only text for thumbs-up + negativeFeedbackSrText: {{ translateJS phrase='This did not answer my question' }} // Screen reader only text for thumbs-down + }; + } + + onMount() { + super.onMount(); + const videoSelector = '.js-HitchhikerProductProminentVideo-video'; + const videoEl = this._container.querySelector(videoSelector); + if (!videoEl) { + return; + } + const addPlayer = videoApi => { + videoApi.addPlayer(videoEl, { + onPlay: () => this.onPlay() + }); + }; + if (this.youtubeUrl) { + HitchhikerJS.requireYoutubeAPI().then(addPlayer); + } else if (this.vimeoUrl) { + HitchhikerJS.requireVimeoAPI().then(addPlayer); + } + } + + onPlay() { + const event = new ANSWERS.AnalyticsEvent('CTA_CLICK') + .addOptions({ + verticalKey: this.verticalKey, + entityId: this.result?._raw?.id, + searcher: this._config.isUniversal ? 'UNIVERSAL' : 'VERTICAL', + ctaLabel: 'video_played' + }); + this.analyticsReporter.report(event); + } + + /** + * The template to render + * @returns {string} + * @override + */ + static defaultTemplateName (config) { + return 'cards/multilang-product-prominentvideo-custom'; + } +} + +ANSWERS.registerTemplate( + 'cards/multilang-product-prominentvideo-custom', + {{{stringifyPartial (read 'cards/multilang-product-prominentvideo-custom/template') }}} +); +ANSWERS.registerComponentType(multilang_product_prominentvideo_customCardComponent); diff --git a/test-site/cards/multilang-product-prominentvideo-custom/template.hbs b/test-site/cards/multilang-product-prominentvideo-custom/template.hbs new file mode 100644 index 000000000..5383acdf1 --- /dev/null +++ b/test-site/cards/multilang-product-prominentvideo-custom/template.hbs @@ -0,0 +1,129 @@ +
+ {{> video }} +
+ {{> title }} + {{> subtitle }} + {{> content }} + {{> thumbsfeedback card feedbackSubmitted=feedbackSubmitted}} +
+
+ +{{#*inline 'title'}} +{{#if card.title}} +
+ {{#if card.url}} + + {{card.title}} + + {{else}} + {{card.title}} + {{/if}} +
+{{/if}} +{{/inline}} + +{{#*inline 'subtitle'}} +{{#if card.subtitle}} +
+ {{card.subtitle}} +
+{{/if}} +{{/inline}} + +{{#*inline 'video'}} +{{#if card.videoUrl}} +
+ +
+{{/if}} +{{/inline}} + +{{#*inline 'content'}} +{{#if (any card.details (all card.CTA1 card.CTA1.url card.CTA1.label) (all card.CTA2 card.CTA2.url card.CTA2.label))}} +
+ {{> details }} + {{> ctas }} +
+{{/if}} +{{/inline}} + +{{! Displays the details for the card. If showMoreDetails has been configured, + this partial handles the show more toggle, show less toggle, truncated details, + and full details. If showMoreDetails has not been configured, it will display the + the regular card details. +}} +{{#*inline 'details'}} +{{#if card.details}} +
+ {{#if showExcessDetailsToggle}} +
+ {{{truncatedDetails}}} +
+ {{/if}} +
+ {{{card.details}}} +
+ {{#if showExcessDetailsToggle}} + + + {{/if}} +
+{{/if}} +{{/inline}} + +{{#*inline 'ctas'}} +{{#if (any (all card.CTA1 card.CTA1.url card.CTA1.label) (all card.CTA2 card.CTA2.url card.CTA2.label))}} +
+ {{> CTA card.CTA1 ctaName="primaryCTA" }} + {{> CTA card.CTA2 ctaName="secondaryCTA" }} +
+{{/if}} +{{/inline}} + +{{#*inline 'CTA'}} +{{#if (all url label)}} +
+ + {{#if (any iconName iconUrl)}} +
+
+ {{> icons/iconPartial + iconName=iconName + iconUrl=(relativePathHandler url=iconUrl relativePath=@root.relativePath) + }} +
+
+ {{/if}} +
+ {{label}} +
+ +
+{{/if}} +{{/inline}} diff --git a/test-site/config-overrides/products.json b/test-site/config-overrides/products.json new file mode 100644 index 000000000..bb7a6b34e --- /dev/null +++ b/test-site/config-overrides/products.json @@ -0,0 +1,9 @@ +{ + "verticalsToConfig": { + "products": { + "universalLimit": 3, + "cardType": "multilang-product-prominentvideo-custom", + "universalSectionTemplate": "grid-three-columns" + } + } +} \ No newline at end of file diff --git a/test-site/config/global_config.json b/test-site/config/global_config.json index 5d9b812f7..071d83e33 100644 --- a/test-site/config/global_config.json +++ b/test-site/config/global_config.json @@ -1,10 +1,10 @@ { - "sdkVersion": "1.12", // The version of the Answers SDK to use + "sdkVersion": "develop", // The version of the Answers SDK to use // "token": "", // The auth token to access Answers experience. "apiKey": "2d8c550071a64ea23e263118a2b0680b", // The answers api key found on the experiences page. This will be provided automatically by the Yext CI system // "experienceVersion": "", // the Answers Experience version to use for API requests. This will be provided automatically by the Yext CI system // "environment": "production", // The environment to run on for this Answers Experience. (i.e. 'production' or 'sandbox') - // "businessId": "", // The business ID of the account. This will be provided automatically by the Yext CI system + "businessId": "3350634", // The business ID of the account. This will be provided automatically by the Yext CI system // "initializeManually": true, // If true, the experience must be started by calling AnswersExperience.init() or AnswersExperienceFrame.init() for iframe integrations. // "useJWT": true, // Whether or not to enable JWT. If true, the apiKey will be hidden from the build and the token must be specified through the runtime config. "sessionTrackingEnabled": true, // Whether or not session tracking is enabled for all pages diff --git a/test-site/config/index.json b/test-site/config/index.json index 078bf263f..ae7acb9ae 100644 --- a/test-site/config/index.json +++ b/test-site/config/index.json @@ -31,6 +31,9 @@ "enabled": false // "customMicIconUrl": "", // Optional, display a custom microphone icon // "customListeningIconUrl": "" // Optional, displays a custom while voice search is active + }, + "autocomplete": { + "customPrompts": ["This is a custom prompt"] } } }, diff --git a/test-site/pages-patches/faqs.html.hbs.patch b/test-site/pages-patches/faqs.html.hbs.patch index 67b57d924..8306cb938 100644 --- a/test-site/pages-patches/faqs.html.hbs.patch +++ b/test-site/pages-patches/faqs.html.hbs.patch @@ -1,6 +1,6 @@ ---- faqs.html.hbs 2021-04-08 17:56:25.000000000 -0400 -+++ faqs.updated.html.hbs 2021-04-08 17:56:25.000000000 -0400 -@@ -13,7 +13,7 @@ +--- faqs.html.hbs 2022-04-05 11:53:14.000000000 -0400 ++++ faqs.updated.html.hbs 2022-04-05 11:54:18.000000000 -0400 +@@ -15,7 +15,7 @@ {{!-- {{> templates/vertical-standard/script/sortoptions }} --}} {{!-- {{> templates/vertical-standard/script/facets }} --}} {{!-- {{> templates/vertical-standard/script/filterbox }} --}} @@ -9,12 +9,12 @@ {{/script/core }}
-@@ -43,7 +43,7 @@ - {{> templates/vertical-standard/markup/spellcheck }} - {{> templates/vertical-standard/markup/verticalresults }} - {{> templates/vertical-standard/markup/pagination }} -- {{!-- {{> templates/vertical-standard/markup/qasubmission }} --}} -+ {{> templates/vertical-standard/markup/qasubmission }} +@@ -50,7 +50,7 @@ +
+ {{> templates/vertical-standard/markup/verticalresults }} + {{> templates/vertical-standard/markup/pagination }} +- {{!-- {{> templates/vertical-standard/markup/qasubmission }} --}} ++ {{> templates/vertical-standard/markup/qasubmission }} +
-
diff --git a/test-site/pages-patches/healthcare_professionals.html.hbs.patch b/test-site/pages-patches/healthcare_professionals.html.hbs.patch index b70e5ea60..5cbe6988e 100644 --- a/test-site/pages-patches/healthcare_professionals.html.hbs.patch +++ b/test-site/pages-patches/healthcare_professionals.html.hbs.patch @@ -1,5 +1,5 @@ ---- templates/vertical-grid/page.html.hbs 2021-07-27 11:14:10.000000000 -0400 -+++ test-site/pages/healthcare_professionals.html.hbs 2021-09-10 15:33:05.000000000 -0400 +--- healthcare_professionals.html.hbs 2022-04-05 11:33:23.000000000 -0400 ++++ healthcare_professionals.updated.html.hbs 2022-04-05 11:34:38.000000000 -0400 @@ -10,9 +10,9 @@ {{> templates/vertical-grid/script/verticalresults }} {{> templates/vertical-grid/script/pagination }} @@ -13,20 +13,20 @@ {{!-- {{> templates/vertical-grid/script/qasubmission }} --}} {{/script/core }}
-@@ -34,11 +34,11 @@ - {{!-- {{> templates/vertical-grid/collapsible-filters/markup/viewresultsbutton }} --}} +@@ -29,11 +29,11 @@ +
+
+ +- {{!--
--}} +- {{!-- {{> 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 }} ++
- -- {{!--
--}} -- {{!-- {{> 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 }} -+
-
+
{{> templates/vertical-grid/markup/spellcheck }} - {{> templates/vertical-grid/markup/verticalresults }} diff --git a/test-site/pages-patches/locations.html.hbs.patch b/test-site/pages-patches/locations.html.hbs.patch index 22903fa0d..a96b99128 100644 --- a/test-site/pages-patches/locations.html.hbs.patch +++ b/test-site/pages-patches/locations.html.hbs.patch @@ -23,9 +23,7 @@ {{> templates/vertical-map/markup/verticalresultscount }} {{> templates/vertical-map/markup/appliedfilters }} - {{!-- {{> templates/vertical-map/collapsible-filters/markup/filterlink }} --}} -- {{!-- {{> templates/vertical-map/collapsible-filters/markup/viewresultsbutton }} --}} + {{> templates/vertical-map/collapsible-filters/markup/filterlink }} -+ {{> templates/vertical-map/collapsible-filters/markup/viewresultsbutton }}
- {{!--
--}} @@ -36,7 +34,9 @@ + {{> templates/vertical-map/markup/facets }} {{!-- {{> templates/vertical-map/markup/filterbox }} --}} - {{!--
--}} +- {{!-- {{> templates/vertical-map/collapsible-filters/markup/viewresultsbutton }} --}} +
++ {{> templates/vertical-map/collapsible-filters/markup/viewresultsbutton }}
{{> templates/vertical-map/markup/spellcheck }} {{> templates/vertical-map/markup/verticalresults }} diff --git a/test-site/pages-patches/locations_full_page_map_with_filters.html.hbs.patch b/test-site/pages-patches/locations_full_page_map_with_filters.html.hbs.patch index fca029815..938b34c87 100644 --- a/test-site/pages-patches/locations_full_page_map_with_filters.html.hbs.patch +++ b/test-site/pages-patches/locations_full_page_map_with_filters.html.hbs.patch @@ -23,9 +23,7 @@ {{> templates/vertical-full-page-map/markup/verticalresultscount }} {{> templates/vertical-full-page-map/markup/appliedfilters }} - {{!-- {{> templates/vertical-full-page-map/collapsible-filters/markup/filterlink }} --}} -- {{!-- {{> templates/vertical-full-page-map/collapsible-filters/markup/viewresultsbutton }} --}} + {{> templates/vertical-full-page-map/collapsible-filters/markup/filterlink }} -+ {{> templates/vertical-full-page-map/collapsible-filters/markup/viewresultsbutton }}
{{> templates/vertical-full-page-map/markup/alternativeresults }} @@ -39,7 +37,9 @@ + {{> templates/vertical-full-page-map/markup/facets }} {{!-- {{> templates/vertical-full-page-map/markup/filterbox }} --}} - {{!--
--}} +- {{!-- {{> templates/vertical-full-page-map/collapsible-filters/markup/viewresultsbutton }} --}} +
++ {{> templates/vertical-full-page-map/collapsible-filters/markup/viewresultsbutton }}
diff --git a/test-site/pages-patches/people.html.hbs.patch b/test-site/pages-patches/people.html.hbs.patch index 2b0771874..6be96e39a 100644 --- a/test-site/pages-patches/people.html.hbs.patch +++ b/test-site/pages-patches/people.html.hbs.patch @@ -1,5 +1,5 @@ ---- people.html.hbs 2021-04-08 20:51:02.000000000 -0400 -+++ people.updated.html.hbs 2021-04-08 20:52:20.000000000 -0400 +--- people.html.hbs 2022-04-05 15:42:31.000000000 -0400 ++++ people.updated.html.hbs 2022-04-05 15:58:28.000000000 -0400 @@ -1,7 +1,7 @@ {{#> layouts/html }} {{#> script/core }} @@ -20,25 +20,36 @@ {{!-- {{> templates/vertical-grid/script/filterbox }} --}} {{!-- {{> templates/vertical-grid/script/qasubmission }} --}} {{/script/core }} -@@ -30,15 +30,15 @@ -
- {{> 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 }} +@@ -29,18 +29,18 @@ +
+
+ +- {{!--
--}} +- {{!-- {{> templates/vertical-grid/markup/sortoptions }} --}} ++
++ {{> templates/vertical-grid/markup/sortoptions }} + {{!-- {{> templates/vertical-grid/markup/filterbox }} --}} +- {{!-- {{> templates/vertical-grid/markup/facets }} --}} +- {{!--
--}} ++ {{> templates/vertical-grid/markup/facets }} ++
- -- {{!--
--}} -- {{!-- {{> templates/vertical-grid/markup/sortoptions }} --}} -+
-+ {{> templates/vertical-grid/markup/sortoptions }} - {{!-- {{> templates/vertical-grid/markup/filterbox }} --}} -- {{!-- {{> templates/vertical-grid/markup/facets }} --}} -- {{!--
--}} -+ {{> templates/vertical-grid/markup/facets }} -+
-
+
{{> templates/vertical-grid/markup/spellcheck }} - {{> templates/vertical-grid/markup/verticalresults }} +
+ {{> templates/vertical-grid/markup/verticalresultscount }} + {{> templates/vertical-grid/markup/appliedfilters }} +- {{!-- {{> templates/vertical-grid/collapsible-filters/markup/filterlink }} --}} ++ {{> templates/vertical-grid/collapsible-filters/markup/filterlink }} +
+
+ {{> templates/vertical-grid/markup/verticalresults }} +@@ -48,7 +48,7 @@ + {{!-- {{> templates/vertical-grid/markup/qasubmission }} --}} +
+
+- {{!-- {{> templates/vertical-grid/collapsible-filters/markup/viewresultsbutton }} --}} ++ {{> templates/vertical-grid/collapsible-filters/markup/viewresultsbutton }} +
+
+ {{> layouts/yext-logo }} diff --git a/tests/acceptance/constants.js b/tests/acceptance/constants.js index 349a1d0a1..732dd952c 100644 --- a/tests/acceptance/constants.js +++ b/tests/acceptance/constants.js @@ -1,3 +1,5 @@ -module.exports.PORT=9999; -module.exports.VERTICAL_SEARCH_URL_REGEX=/v2\/accounts\/me\/answers\/vertical\/query/; -module.exports.UNIVERSAL_SEARCH_URL_REGEX=/v2\/accounts\/me\/answers\/query/; +exports.PORT=9999; +exports.VERTICAL_SEARCH_URL_REGEX=/v2\/accounts\/me\/answers\/vertical\/query/; +exports.UNIVERSAL_SEARCH_URL_REGEX=/v2\/accounts\/me\/answers\/query/; +exports.UNIVERSAL_AUTOCOMPLETE_URL_REGEX=/v2\/accounts\/me\/answers\/autocomplete/; +exports.VERTICAL_AUTOCOMPLETE_URL_REGEX=/v2\/accounts\/me\/answers\/vertical\/autocomplete/; diff --git a/tests/acceptance/searchrequestlogger.js b/tests/acceptance/searchrequestlogger.js index f02ddb43d..357fd429d 100644 --- a/tests/acceptance/searchrequestlogger.js +++ b/tests/acceptance/searchrequestlogger.js @@ -1,10 +1,14 @@ -import { VERTICAL_SEARCH_URL_REGEX, UNIVERSAL_SEARCH_URL_REGEX } from './constants'; +import { VERTICAL_SEARCH_URL_REGEX, UNIVERSAL_SEARCH_URL_REGEX, VERTICAL_AUTOCOMPLETE_URL_REGEX, UNIVERSAL_AUTOCOMPLETE_URL_REGEX } from './constants'; import { RequestLogger } from 'testcafe'; +const LOGGER_OPTIONS = { + logRequestHeaders: true +} + /** * Handles request logger creation and request/response data received during test execution. */ -class SearchRequestLogger { +export class SearchRequestLogger { /** * Create a RequestLogger that tracks vertical query requests to given test. @@ -13,8 +17,9 @@ class SearchRequestLogger { */ createVerticalSearchLogger() { this._queryRequestLogger = RequestLogger({ - url: VERTICAL_SEARCH_URL_REGEX - }); + url: VERTICAL_SEARCH_URL_REGEX, + method: 'get' + }, LOGGER_OPTIONS); return this._queryRequestLogger; } @@ -25,8 +30,35 @@ class SearchRequestLogger { */ createUniversalSearchLogger() { this._queryRequestLogger = RequestLogger({ - url: UNIVERSAL_SEARCH_URL_REGEX - }); + url: UNIVERSAL_SEARCH_URL_REGEX, + method: 'get' + }, LOGGER_OPTIONS); + return this._queryRequestLogger; + } + + /** + * Create a RequestLogger that tracks vertical query requests to given test. + * + * @returns {import('testcafe').RequestLogger} + */ + createVerticalAutocompleteLogger() { + this._queryRequestLogger = RequestLogger({ + url: VERTICAL_AUTOCOMPLETE_URL_REGEX, + method: 'get' + }, LOGGER_OPTIONS); + return this._queryRequestLogger; + } + + /** + * Create a RequestLogger that tracks universal query requests to given test. + * + * @returns {import('testcafe').RequestLogger} + */ + createUniversalAutocompleteLogger() { + this._queryRequestLogger = RequestLogger({ + url: UNIVERSAL_AUTOCOMPLETE_URL_REGEX, + method: 'get' + }, LOGGER_OPTIONS); return this._queryRequestLogger; } diff --git a/tests/acceptance/suites/client-sdk-http-header.js b/tests/acceptance/suites/client-sdk-http-header.js new file mode 100644 index 000000000..321429f29 --- /dev/null +++ b/tests/acceptance/suites/client-sdk-http-header.js @@ -0,0 +1,56 @@ +import { + PORT, + UNIVERSAL_AUTOCOMPLETE_URL_REGEX, + UNIVERSAL_SEARCH_URL_REGEX, + VERTICAL_SEARCH_URL_REGEX, + VERTICAL_AUTOCOMPLETE_URL_REGEX +} from '../constants'; +import { SearchRequestLogger } from '../searchrequestlogger'; +import { registerIE11NoCacheHook } from '../../test-utils/testcafe'; +import packageJson from '../../../package.json'; + +const verticalSearchLogger = (new SearchRequestLogger()).createVerticalSearchLogger(); +const verticalAutocompleteLogger = (new SearchRequestLogger()).createVerticalAutocompleteLogger(); + +fixture`Client-SDK header works on vertical searches/autocomplete` + .page(`http://localhost:${PORT}/people`) + .requestHooks(verticalSearchLogger, verticalAutocompleteLogger) + .beforeEach(async t => { + await registerIE11NoCacheHook(t, VERTICAL_SEARCH_URL_REGEX); + await registerIE11NoCacheHook(t, VERTICAL_AUTOCOMPLETE_URL_REGEX); + await t.resizeWindow(1600, 900); + }) + +test('the Client-SDK header is sent correctly on vertical search/autocomplete requests', async t => { + await t.expect(verticalAutocompleteLogger.requests.length).eql(1); + await t.expect(verticalSearchLogger.requests.length).eql(1); + await t + .expect(verticalAutocompleteLogger.requests[0].request.headers['client-sdk']) + .contains(`ANSWERS_THEME=${packageJson.version}`); + await t + .expect(verticalSearchLogger.requests[0].request.headers['client-sdk']) + .contains(`ANSWERS_THEME=${packageJson.version}`); +}); + +const universalSearchLogger = (new SearchRequestLogger()).createUniversalSearchLogger(); +const universalAutocompleteLogger = (new SearchRequestLogger()).createUniversalAutocompleteLogger(); + +fixture`Client-SDK header works on universal searches/autocomplete` + .page(`http://localhost:${PORT}`) + .requestHooks(universalSearchLogger, universalAutocompleteLogger) + .beforeEach(async t => { + await registerIE11NoCacheHook(t, UNIVERSAL_SEARCH_URL_REGEX); + await registerIE11NoCacheHook(t, UNIVERSAL_AUTOCOMPLETE_URL_REGEX); + await t.resizeWindow(1600, 900); + }) + +test('the Client-SDK header is sent correctly on universal search/autocomplete requests', async t => { + await t.expect(universalSearchLogger.requests.length).eql(1); + await t.expect(universalAutocompleteLogger.requests.length).eql(1); + await t + .expect(universalAutocompleteLogger.requests[0].request.headers['client-sdk']) + .contains(`ANSWERS_THEME=${packageJson.version}`); + await t + .expect(universalSearchLogger.requests[0].request.headers['client-sdk']) + .contains(`ANSWERS_THEME=${packageJson.version}`); +}); \ No newline at end of file diff --git a/tests/hbshelpers/shallowMergeConfig.js b/tests/hbshelpers/shallowMergeConfig.js deleted file mode 100644 index afaa08019..000000000 --- a/tests/hbshelpers/shallowMergeConfig.js +++ /dev/null @@ -1,21 +0,0 @@ -const hbs = require('handlebars'); -import shallowMergeConfig from '../../hbshelpers/shallowMergeConfig'; - -hbs.registerHelper('shallowMergeConfig', shallowMergeConfig); - -it('performs a shallowMergeConfig', () => { - const context = hbs.compile('{{#shallowMergeConfig}}[{"a": "7"}, {"a": 2}, {"b": 3}, {"c": 4}]{{/shallowMergeConfig}}'); - expect(context()).toEqual(JSON.stringify({"a":2,"b":3,"c":4})); -}); - -it('performs shallowMergeConfig on 1 element', () => { - const template = hbs.compile('{{#shallowMergeConfig}}{"a": "7"}{{/shallowMergeConfig}}'); - expect(template()).toEqual(JSON.stringify({"a": "7"})); -}); - - -it('performs shallowMergeConfig on 0 elements', () => { - const template = hbs.compile('{{#shallowMergeConfig}}{}{{/shallowMergeConfig}}'); - expect(template()).toEqual(JSON.stringify({})); -}); - \ No newline at end of file diff --git a/tests/percy/index.js b/tests/percy/index.js index 73d4f4b68..3ac9784a2 100644 --- a/tests/percy/index.js +++ b/tests/percy/index.js @@ -36,17 +36,23 @@ async function rtlSnapshots(page) { await captureSnapshots(standardPageNavigator, page, standardCamera, 'ar'); } -async function captureSnapshots(navigator, page, camera, locale='en') { - const operator = new PageOperator(navigator, page, getTestingLocations(locale)); - while (operator.hasNextTestLocation()) { - const testConfig = await operator.nextTestLocation(); - if (testConfig.viewport) { - testConfig.viewport === 'mobile' - ? await camera.snapshotMobileOnly(testConfig.name) - : await camera.snapshotDesktopOnly(testConfig.name); - } else { - await camera.snapshot(testConfig.name); +async function captureSnapshots(navigator, page, camera, locale = 'en') { + try { + const operator = new PageOperator(navigator, page, getTestingLocations(locale)); + while (operator.hasNextTestLocation()) { + const testConfig = await operator.nextTestLocation(); + if (testConfig.viewport) { + testConfig.viewport === 'mobile' + ? await camera.snapshotMobileOnly(testConfig.name) + : await camera.snapshotDesktopOnly(testConfig.name); + } else { + await camera.snapshot(testConfig.name); + } } + } catch (e) { + console.error('Error taking snapshot of', testConfig.name); + console.error(e); + process.exit(1); } } diff --git a/tests/templates/script/fixtures/appliedfilters.hbs.js b/tests/templates/script/fixtures/appliedfilters.hbs.js index 0481920ab..172d5ffcd 100644 --- a/tests/templates/script/fixtures/appliedfilters.hbs.js +++ b/tests/templates/script/fixtures/appliedfilters.hbs.js @@ -1,2 +1,5 @@ -ANSWERS.addComponent('AppliedFilters', - {"container":"#js-answersAppliedFilters","verticalKey":"testKey","a":"testAF"}); \ No newline at end of file +ANSWERS.addComponent('AppliedFilters', { + container: "#js-answersAppliedFilters", + verticalKey: "testKey", + ...{"a":"testAF"} +}); \ No newline at end of file diff --git a/tests/templates/script/fixtures/directanswer.hbs.js b/tests/templates/script/fixtures/directanswer.hbs.js index 26566ae1a..f70636ae9 100644 --- a/tests/templates/script/fixtures/directanswer.hbs.js +++ b/tests/templates/script/fixtures/directanswer.hbs.js @@ -1,2 +1,4 @@ -ANSWERS.addComponent("DirectAnswer", -{"container":"#js-answersDirectAnswer"}); +ANSWERS.addComponent("DirectAnswer", { + container: "#js-answersDirectAnswer", + ...{} +}); diff --git a/tests/templates/script/fixtures/filterbox.hbs.js b/tests/templates/script/fixtures/filterbox.hbs.js index 3f1148b41..7b1990abc 100644 --- a/tests/templates/script/fixtures/filterbox.hbs.js +++ b/tests/templates/script/fixtures/filterbox.hbs.js @@ -1,2 +1,5 @@ -ANSWERS.addComponent("FilterBox", -{"container":"#js-answersFilterBox","verticalKey":"testKey","a":"testFB"}); \ No newline at end of file +ANSWERS.addComponent("FilterBox", { + container: "#js-answersFilterBox", + verticalKey: "testKey", + ...{"a":"testFB"} +}); \ No newline at end of file diff --git a/tests/templates/script/fixtures/locationbias.hbs.js b/tests/templates/script/fixtures/locationbias.hbs.js index b3a3385f0..f185e9c6e 100644 --- a/tests/templates/script/fixtures/locationbias.hbs.js +++ b/tests/templates/script/fixtures/locationbias.hbs.js @@ -1,2 +1,6 @@ -ANSWERS.addComponent("LocationBias", -{"container":"#js-answersLocationBias","updateLocationEl":"#js-answersLocationBias .js-locationBias-update-location","verticalKey":"testKey","a":"testLB"}); \ No newline at end of file +ANSWERS.addComponent("LocationBias", { + container: "#js-answersLocationBias", + updateLocationEl: "#js-answersLocationBias .js-locationBias-update-location", + verticalKey: "testKey", + ...{"a":"testLB"} +}); \ No newline at end of file diff --git a/tests/templates/script/fixtures/qasubmission.hbs.js b/tests/templates/script/fixtures/qasubmission.hbs.js index b0d3c1b2d..e262d3bad 100644 --- a/tests/templates/script/fixtures/qasubmission.hbs.js +++ b/tests/templates/script/fixtures/qasubmission.hbs.js @@ -1,3 +1,5 @@ -ANSWERS.addComponent("QASubmission", -{"container":"#js-answersQASubmission","a":"testQAS"}); +ANSWERS.addComponent("QASubmission", { + container: "#js-answersQASubmission", + ...{"a":"testQAS"} +}); diff --git a/tests/templates/script/fixtures/sortoptions.hbs.js b/tests/templates/script/fixtures/sortoptions.hbs.js index c710cb3f5..73a92df7d 100644 --- a/tests/templates/script/fixtures/sortoptions.hbs.js +++ b/tests/templates/script/fixtures/sortoptions.hbs.js @@ -1,2 +1,5 @@ -ANSWERS.addComponent("SortOptions", -{"container":"#js-answersSortOptions","verticalKey":"testKey","a":"testSO"}); +ANSWERS.addComponent("SortOptions", { + container: "#js-answersSortOptions", + verticalKey: "testKey", + ...{"a":"testSO"} +}); diff --git a/tests/templates/script/fixtures/spellcheck.hbs.js b/tests/templates/script/fixtures/spellcheck.hbs.js index e03aa4741..01211c8d3 100644 --- a/tests/templates/script/fixtures/spellcheck.hbs.js +++ b/tests/templates/script/fixtures/spellcheck.hbs.js @@ -1,3 +1,5 @@ -ANSWERS.addComponent("SpellCheck", -{"container":"#js-answersSpellCheck","a":"testSC"}); +ANSWERS.addComponent("SpellCheck", { + container: "#js-answersSpellCheck", + ...{"a":"testSC"} +}); diff --git a/tests/templates/script/fixtures/verticalresultscount.hbs.js b/tests/templates/script/fixtures/verticalresultscount.hbs.js index 098e0a146..f14a5d662 100644 --- a/tests/templates/script/fixtures/verticalresultscount.hbs.js +++ b/tests/templates/script/fixtures/verticalresultscount.hbs.js @@ -1,2 +1,4 @@ -ANSWERS.addComponent('VerticalResultsCount', -{"container":"#js-answersVerticalResultsCount","a":"testVRC"}); +ANSWERS.addComponent('VerticalResultsCount', { + container: "#js-answersVerticalResultsCount", + ...{"a":"testVRC"} +}); diff --git a/tests/wcag/index.js b/tests/wcag/index.js index 12be4986f..c4fbcf77f 100755 --- a/tests/wcag/index.js +++ b/tests/wcag/index.js @@ -13,14 +13,14 @@ const PORT = 5042; * API documentation: https://github.com/dequelabs/axe-core/blob/master/doc/API.md * - set reporter to 'no-passes' to only return violation results * - set runOnly with tag values below to run WCAG standards: - * - WCAG 2.0 Level A, AA, AAA + * - WCAG 2.0 Level A, AA * - WCAG 2.1 Level A, AA */ const config = { reporter: "no-passes", runOnly: { type: 'tag', - values: ['wcag2a', 'wcag2aa', 'wcag21a', 'wcag21aa', 'wcag2aaa'], + values: ['wcag2a', 'wcag2aa', 'wcag21a', 'wcag21aa'], } } diff --git a/translations/messages.pot b/translations/messages.pot index 232e48e2f..18c7bad3f 100644 --- a/translations/messages.pot +++ b/translations/messages.pot @@ -105,9 +105,9 @@ msgstr "" #: cards/multilang-job-standard/component.js:31 #: cards/multilang-link-standard/component.js:28 #: cards/multilang-menuitem-standard/component.js:36 -#: cards/multilang-product-prominentimage/component.js:39 -#: cards/multilang-product-prominentvideo/component.js:34 -#: cards/multilang-product-standard/component.js:38 +#: cards/multilang-product-prominentimage/component.js:38 +#: cards/multilang-product-prominentvideo/component.js:33 +#: cards/multilang-product-standard/component.js:37 #: cards/multilang-professional-location/component.js:44 #: cards/multilang-professional-standard/component.js:36 #: cards/multilang-standard/component.js:31 @@ -119,9 +119,9 @@ msgstr "" #: cards/multilang-job-standard/component.js:30 #: cards/multilang-link-standard/component.js:27 #: cards/multilang-menuitem-standard/component.js:35 -#: cards/multilang-product-prominentimage/component.js:38 -#: cards/multilang-product-prominentvideo/component.js:33 -#: cards/multilang-product-standard/component.js:37 +#: cards/multilang-product-prominentimage/component.js:37 +#: cards/multilang-product-prominentvideo/component.js:32 +#: cards/multilang-product-standard/component.js:36 #: cards/multilang-professional-location/component.js:43 #: cards/multilang-professional-standard/component.js:35 #: cards/multilang-standard/component.js:30 @@ -154,9 +154,9 @@ msgstr "" #: cards/multilang-location-standard/component.js:58 #: cards/multilang-menuitem-standard/component.js:59 #: cards/multilang-product-prominentimage-clickable/component.js:44 -#: cards/multilang-product-prominentimage/component.js:62 -#: cards/multilang-product-prominentvideo/component.js:57 -#: cards/multilang-product-standard/component.js:61 +#: cards/multilang-product-prominentimage/component.js:61 +#: cards/multilang-product-prominentvideo/component.js:56 +#: cards/multilang-product-standard/component.js:60 #: cards/multilang-professional-location/component.js:69 #: cards/multilang-professional-standard/component.js:59 #: cards/multilang-standard/component.js:54 @@ -178,9 +178,9 @@ msgstr[1] "" #: cards/multilang-location-standard/component.js:59 #: cards/multilang-menuitem-standard/component.js:60 #: cards/multilang-product-prominentimage-clickable/component.js:45 -#: cards/multilang-product-prominentimage/component.js:63 -#: cards/multilang-product-prominentvideo/component.js:58 -#: cards/multilang-product-standard/component.js:62 +#: cards/multilang-product-prominentimage/component.js:62 +#: cards/multilang-product-prominentvideo/component.js:57 +#: cards/multilang-product-standard/component.js:61 #: cards/multilang-professional-location/component.js:70 #: cards/multilang-professional-standard/component.js:60 #: cards/multilang-standard/component.js:55 @@ -198,9 +198,9 @@ msgstr "" #: cards/multilang-location-standard/component.js:60 #: cards/multilang-menuitem-standard/component.js:61 #: cards/multilang-product-prominentimage-clickable/component.js:46 -#: cards/multilang-product-prominentimage/component.js:64 -#: cards/multilang-product-prominentvideo/component.js:59 -#: cards/multilang-product-standard/component.js:63 +#: cards/multilang-product-prominentimage/component.js:63 +#: cards/multilang-product-prominentvideo/component.js:58 +#: cards/multilang-product-standard/component.js:62 #: cards/multilang-professional-location/component.js:71 #: cards/multilang-professional-standard/component.js:61 #: cards/multilang-standard/component.js:56