From 70e5d4759086e4c8f24df69a71ec2e7b74ee59ec Mon Sep 17 00:00:00 2001 From: ghazal-salehi <126438691+ghazal-salehi@users.noreply.github.com> Date: Thu, 27 Jul 2023 12:10:16 +1000 Subject: [PATCH 01/10] Qoldev 515 funnelack upgrade set location (#1029) * QOLDEV-515 Updating set location after Funnelback upgrade, Updating Search story file * Fixing footer feedback test originally from 4.3.0 * Bump puppeteer from 19.6.3 to 20.9.0 * Increasing package version * QOLDEV-515 Updating search domain and collection string * QOLDEV-515 Updating funnelback-search-test based on the results for jobs * QOLDEV-515 Updating funnelback-search-test based on the results for jobs, exact string --- .../components/funnelback-search-test.js | 2 +- e2e/__tests__/layout/footer-feedback-test.js | 8 +++++-- package.json | 4 ++-- .../components/site-search/qg-site-search.js | 6 ++++- .../layout/footer/_service-centre.scss | 8 +++---- .../_blocks/layout/location/qg-location.js | 22 ++++++++++++------- .../layout/service-centre/service-centre.html | 2 +- .../_blocks/layout/site-search-form.html | 4 ++-- .../components/Header/templates/Search.html | 4 ++-- 9 files changed, 37 insertions(+), 23 deletions(-) diff --git a/e2e/__tests__/components/funnelback-search-test.js b/e2e/__tests__/components/funnelback-search-test.js index 960eb5420..c06983302 100644 --- a/e2e/__tests__/components/funnelback-search-test.js +++ b/e2e/__tests__/components/funnelback-search-test.js @@ -21,7 +21,7 @@ describe('SWE Header testing', () => { await page.waitForTimeout(ct.WT); expect( await page.$$eval('.qg-search-concierge-content li button', nodes => nodes.map(n => n.textContent)), - ).toEqual(['jobs in qld government', 'jobs', 'jobs in the queensland government']); + ).toEqual(['jobs in queensland government', 'jobs', 'government jobs']); }); afterAll(async () => { diff --git a/e2e/__tests__/layout/footer-feedback-test.js b/e2e/__tests__/layout/footer-feedback-test.js index d49b27af8..3b2fb5df0 100644 --- a/e2e/__tests__/layout/footer-feedback-test.js +++ b/e2e/__tests__/layout/footer-feedback-test.js @@ -12,14 +12,18 @@ beforeAll(async () => { describe('SWE Footer testing', () => { test('Footer feedback', async () => { + await page.click('.qg-feedback-toggle'); + // check getRecaptcha input value is populated as expected and is false by default await page.waitForTimeout(ct.WT); const getRecaptcha = await page.$eval('input[name=g-recaptcha-response]', el => $(el).val()); expect(getRecaptcha).toMatch(/false/); - await page.click('#page-feedback-about-this-website'); - await page.click('#fs-very-satisfied'); + + await page.click('label[for="page-feedback-about-this-website"]'); + await page.click('label[for="fs-very-satisfied"]'); await page.type('#comments', 'Useful website', { delay: 20 }); + // this test case causing massive fail in circleci, which have issue when submitting a real form with remote api, disabled this test for now. // as we are moving out from circleci, Github Actions pipeline doesn't has this issues /* diff --git a/package.json b/package.json index 76b03234e..89cc338ba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Queensland-Government-Web-Template", - "version": "4.2.2", + "version": "4.2.3", "description": "This template is designed to provide a template for all Franchise websites, and the underpinning technology for new Agency websites.", "main": "gulpfile.babel.js", "repository": { @@ -102,7 +102,7 @@ "jest-puppeteer": "^7.0.0", "node-ssi": "^0.3.2", "np": "^7.6.3", - "puppeteer": "^19.6.3", + "puppeteer": "^20.9.0", "sass": "^1.61.0", "storybook-addon-pseudo-states": "^1.15.2", "string-replace-loader": "^3.1.0", diff --git a/src/assets/_project/_blocks/components/site-search/qg-site-search.js b/src/assets/_project/_blocks/components/site-search/qg-site-search.js index 9a7b8ce01..578a549e8 100644 --- a/src/assets/_project/_blocks/components/site-search/qg-site-search.js +++ b/src/assets/_project/_blocks/components/site-search/qg-site-search.js @@ -382,7 +382,11 @@ $(function () { // Look for services in standard results if (allResults.length > 0) { var filteredResults = allResults.filter(function (result) { - return result['metaData']['sfinder'] === 'yes'; + if (result['listMetadata'] != null && result['listMetadata']['sfinder'] != null) { + return result['listMetadata']['sfinder'] === 'yes'; + } else { + return false; + } }); serviceResults = serviceResults.concat(filteredResults); diff --git a/src/assets/_project/_blocks/layout/footer/_service-centre.scss b/src/assets/_project/_blocks/layout/footer/_service-centre.scss index ae7365bc1..566b8f03b 100644 --- a/src/assets/_project/_blocks/layout/footer/_service-centre.scss +++ b/src/assets/_project/_blocks/layout/footer/_service-centre.scss @@ -64,12 +64,12 @@ position: absolute; } - &:nth-child(1):before { - content: "\f05a"; + &.service-info:before { + content: "\f05a"; // inforamation icon } - &:nth-child(2):before { - content: "\f14e"; + &.centre-distance:before { + content: "\f14e"; // compass icon } } } diff --git a/src/assets/_project/_blocks/layout/location/qg-location.js b/src/assets/_project/_blocks/layout/location/qg-location.js index bd0709a28..150b98c84 100644 --- a/src/assets/_project/_blocks/layout/location/qg-location.js +++ b/src/assets/_project/_blocks/layout/location/qg-location.js @@ -767,15 +767,18 @@ $(function () { centreData = results[0]; } - if (centreData) { - var centreName = centreData['metaData']['t']; - var centreID = centreData['metaData']['id']; + if (centreData && centreData['listMetadata']) { + var centreName = centreData['listMetadata']['t']; + var centreID = centreData['listMetadata']['id']; var centreDistance = centreData['kmFromOrigin']; - var centreAddress1 = centreData['metaData']['address1']; - var centreAddress2 = centreData['metaData']['address2']; + var centreAddress1 = centreData['listMetadata']['address1']; + var centreAddress2 = centreData['listMetadata']['address2']; // Build URL - var centreType = centreData['metaData']['datasource'].toLowerCase(); + var centreType = centreData['listMetadata']['datasource']; + if (centreType !== undefined) { + centreType = centreType[0].toLowerCase(); + } var centreURL = centreContainer.attr('data-' + centreType); // Handle special cases @@ -790,10 +793,12 @@ $(function () { // Build HTML centreHTML += '' + centreName + ''; centreHTML += '