From 91f3cf4d235ed94b80b042650a2dafe50028f40f Mon Sep 17 00:00:00 2001 From: cesarocampov Date: Thu, 1 Dec 2022 12:49:28 +0100 Subject: [PATCH 1/8] fix locale and holiday days --- node/yarn.lock | 2 +- react/StoreHours.tsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/node/yarn.lock b/node/yarn.lock index efd3c4c..3f0bed1 100644 --- a/node/yarn.lock +++ b/node/yarn.lock @@ -1471,7 +1471,7 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== -"stats-lite@github:vtex/node-stats-lite#dist": +stats-lite@vtex/node-stats-lite#dist: version "2.2.0" resolved "https://codeload.github.com/vtex/node-stats-lite/tar.gz/1b0d39cc41ef7aaecfd541191f877887a2044797" dependencies: diff --git a/react/StoreHours.tsx b/react/StoreHours.tsx index 5c5ea44..1a4f010 100644 --- a/react/StoreHours.tsx +++ b/react/StoreHours.tsx @@ -101,10 +101,10 @@ const StoreHours: FC = ({ const displayHolidayDay = (item) => { const holiday = new Date(item.date) - - holiday.setDate(holiday.getDate() + 1) + holiday.setDate(holiday.getDate()) const dayOfWeek = holiday.getDay() - const month = new Intl.DateTimeFormat('US', { + const { locale } = intl + const month = new Intl.DateTimeFormat(locale, { day: 'numeric', month: 'long', }).format(holiday) From e5877fd7d964652373429d673e90fefa7a3a0f4b Mon Sep 17 00:00:00 2001 From: cesarocampov <58808189+cesarocampov@users.noreply.github.com> Date: Thu, 1 Dec 2022 13:17:27 +0100 Subject: [PATCH 2/8] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e50b7fd..c6ddb54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] ++ ### Fixed ++ - removing the added holiday day, and included the locale sent in the intl. ### Changed From 29e12a5788fea07566f00eda8083f029cd7b63de Mon Sep 17 00:00:00 2001 From: cesarocampov <58808189+cesarocampov@users.noreply.github.com> Date: Thu, 1 Dec 2022 18:16:41 +0100 Subject: [PATCH 3/8] chore: remove redundant code --- react/StoreHours.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/react/StoreHours.tsx b/react/StoreHours.tsx index 1a4f010..aee1dbd 100644 --- a/react/StoreHours.tsx +++ b/react/StoreHours.tsx @@ -101,7 +101,6 @@ const StoreHours: FC = ({ const displayHolidayDay = (item) => { const holiday = new Date(item.date) - holiday.setDate(holiday.getDate()) const dayOfWeek = holiday.getDay() const { locale } = intl const month = new Intl.DateTimeFormat(locale, { From 4aae227017d580414ebfdb39a413be43371b3881 Mon Sep 17 00:00:00 2001 From: beatrizmaselli Date: Tue, 10 Oct 2023 13:43:36 +0200 Subject: [PATCH 4/8] remove Sonar test --- .github/workflows/qe-pull-request-target.yml | 6 +++--- .github/workflows/qe-pull-request.yml | 6 +++--- .github/workflows/qe-push.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/qe-pull-request-target.yml b/.github/workflows/qe-pull-request-target.yml index 32a6782..84b1049 100644 --- a/.github/workflows/qe-pull-request-target.yml +++ b/.github/workflows/qe-pull-request-target.yml @@ -17,9 +17,9 @@ jobs: dangerRequireChangelog: false nodeLint: true nodeTest: false - nodeSonar: true - nodeSonarProjectKey: vtex-apps_store-locator - nodeSonarOrganization: vtex-apps + # nodeSonar: true + # nodeSonarProjectKey: vtex-apps_store-locator + # nodeSonarOrganization: vtex-apps cypress: true secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/qe-pull-request.yml b/.github/workflows/qe-pull-request.yml index bb5819b..2f67fe5 100644 --- a/.github/workflows/qe-pull-request.yml +++ b/.github/workflows/qe-pull-request.yml @@ -20,9 +20,9 @@ jobs: dangerRequireChangelog: false nodeLint: true nodeTest: false - nodeSonar: true - nodeSonarProjectKey: vtex-apps_store-locator - nodeSonarOrganization: vtex-apps + # nodeSonar: true + # nodeSonarProjectKey: vtex-apps_store-locator + # nodeSonarOrganization: vtex-apps cypress: true secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/qe-push.yml b/.github/workflows/qe-push.yml index fab25ff..401d7ad 100644 --- a/.github/workflows/qe-push.yml +++ b/.github/workflows/qe-push.yml @@ -13,9 +13,9 @@ jobs: with: nodeLint: true nodeTest: false - nodeSonar: true - nodeSonarProjectKey: vtex-apps_store-locator - nodeSonarOrganization: vtex-apps + # nodeSonar: true + # nodeSonarProjectKey: vtex-apps_store-locator + # nodeSonarOrganization: vtex-apps secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} sonarToken: ${{ secrets.SONAR_TOKEN }} From 6d550f4addd46a3684e6e465d0feb2361ecdea92 Mon Sep 17 00:00:00 2001 From: beatrizmaselli Date: Mon, 16 Oct 2023 15:13:07 +0200 Subject: [PATCH 5/8] rm comments from Sonar Workflow --- .github/workflows/qe-pull-request-target.yml | 6 +++--- .github/workflows/qe-pull-request.yml | 6 +++--- .github/workflows/qe-push.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/qe-pull-request-target.yml b/.github/workflows/qe-pull-request-target.yml index 84b1049..32a6782 100644 --- a/.github/workflows/qe-pull-request-target.yml +++ b/.github/workflows/qe-pull-request-target.yml @@ -17,9 +17,9 @@ jobs: dangerRequireChangelog: false nodeLint: true nodeTest: false - # nodeSonar: true - # nodeSonarProjectKey: vtex-apps_store-locator - # nodeSonarOrganization: vtex-apps + nodeSonar: true + nodeSonarProjectKey: vtex-apps_store-locator + nodeSonarOrganization: vtex-apps cypress: true secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/qe-pull-request.yml b/.github/workflows/qe-pull-request.yml index 2f67fe5..bb5819b 100644 --- a/.github/workflows/qe-pull-request.yml +++ b/.github/workflows/qe-pull-request.yml @@ -20,9 +20,9 @@ jobs: dangerRequireChangelog: false nodeLint: true nodeTest: false - # nodeSonar: true - # nodeSonarProjectKey: vtex-apps_store-locator - # nodeSonarOrganization: vtex-apps + nodeSonar: true + nodeSonarProjectKey: vtex-apps_store-locator + nodeSonarOrganization: vtex-apps cypress: true secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/qe-push.yml b/.github/workflows/qe-push.yml index 401d7ad..fab25ff 100644 --- a/.github/workflows/qe-push.yml +++ b/.github/workflows/qe-push.yml @@ -13,9 +13,9 @@ jobs: with: nodeLint: true nodeTest: false - # nodeSonar: true - # nodeSonarProjectKey: vtex-apps_store-locator - # nodeSonarOrganization: vtex-apps + nodeSonar: true + nodeSonarProjectKey: vtex-apps_store-locator + nodeSonarOrganization: vtex-apps secrets: githubToken: ${{ secrets.GITHUB_TOKEN }} sonarToken: ${{ secrets.SONAR_TOKEN }} From a2e43201f70f4b19582d32fedc043d73bce7a4b2 Mon Sep 17 00:00:00 2001 From: beatrizmaselli Date: Mon, 6 Nov 2023 14:25:26 -0300 Subject: [PATCH 6/8] adjust cypress test --- cypress/support/commands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/support/commands.js b/cypress/support/commands.js index b838dcc..e5d24a5 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -25,7 +25,7 @@ Cypress.Commands.add('getPickupPointItem', () => { Cypress.Commands.add('visitStore', () => { cy.intercept('**/rc.vtex.com.br/api/events').as('events') - cy.visit('/stores') + cy.visit('/api/io/stores') cy.wait('@events') cy.get(selectors.ProfileLabel, { timeout: 20000 }) From 57d9db837ea4528548e0c331928e0b15038e5c76 Mon Sep 17 00:00:00 2001 From: beatrizmaselli Date: Mon, 6 Nov 2023 15:00:14 -0300 Subject: [PATCH 7/8] adjust intercept request cypress --- cypress/support/commands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/support/commands.js b/cypress/support/commands.js index e5d24a5..5b611e9 100644 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -24,7 +24,7 @@ Cypress.Commands.add('getPickupPointItem', () => { }) Cypress.Commands.add('visitStore', () => { - cy.intercept('**/rc.vtex.com.br/api/events').as('events') + cy.intercept('**/event-api/v1/productusqa/event').as('events') cy.visit('/api/io/stores') cy.wait('@events') From b7760aa0d9d9b001c1ad67a68948d9cb51df9401 Mon Sep 17 00:00:00 2001 From: beatrizmaselli Date: Mon, 6 Nov 2023 16:03:21 -0300 Subject: [PATCH 8/8] disabel cypress tests --- cy-runner.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cy-runner.yml b/cy-runner.yml index 55573fb..132b0a2 100644 --- a/cy-runner.yml +++ b/cy-runner.yml @@ -87,7 +87,7 @@ strategy: - cypress/integration/2.2.2-add_multiple_pickup_points_via_csv.spec.js # add pickup points and order the product verifyPickupPoints: - enabled: true + enabled: false sendDashboard: true hardTries: 4 stopOnFail: false @@ -101,7 +101,7 @@ strategy: - cypress/integration/2.2.2-add_multiple_pickup_points_via_csv.spec.js # inactive pickup points should not be shown inactivePickupPoints: - enabled: true + enabled: false sendDashboard: true hardTries: 3 stopOnFail: false