From ba755b9f4370f8a9202dca1d405409ae2c4d6ec4 Mon Sep 17 00:00:00 2001 From: AdamCaouetteSafelite <91896960+AdamCaouetteSafelite@users.noreply.github.com> Date: Wed, 13 Aug 2025 11:12:28 -0400 Subject: [PATCH 1/6] Revert "CASH-1328: css specificity fix" --- src/layouts/quote/quote.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index b74e34829..212b6f109 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -903,7 +903,7 @@ export default { padding-bottom: 2rem; :deep(.nav-bar) { position: initial; - button.btn { + button { width: 100%; justify-content: center; } From a27f3fadf09ccc28780efc9cdfc0e6382f0a242b Mon Sep 17 00:00:00 2001 From: maguire-arman Date: Wed, 20 Aug 2025 14:08:44 -0400 Subject: [PATCH 2/6] Reorganizes pipeline test stages Consolidates test stages for pull requests by moving the unit tests stage to run after the playwright tests to optimize the pipeline execution flow. This allows for faster feedback on UI related issues. --- azure-pipelines.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 69d7e11f3..c94a22456 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -51,16 +51,7 @@ stages: displayName: Run Prettier check - stage: TestPr - displayName: Run Unit Tests For PullRequest - jobs: - - template: templates/digital/vue-jest-run-unit-tests.yml@AzureDevOps - parameters: - nodeContainer: node - npmLocation: $(Build.SourcesDirectory) - testResultsFile: junit.xml - summaryFileLocation: $(Build.SourcesDirectory)/coverage/cobertura-coverage.xml - - stage: TestPrPlaywright - displayName: Run Playwright Tests For PullRequest + displayName: Run Tests For PullRequest jobs: - template: temp/playwright-test.yml parameters: @@ -76,6 +67,12 @@ stages: secrets: CCIS_API_AUTH: $(CCIS_API_AUTH) JIRA_API_KEY: $(JIRA_API_KEY) + - template: templates/digital/vue-jest-run-unit-tests.yml@AzureDevOps + parameters: + nodeContainer: node + npmLocation: $(Build.SourcesDirectory) + testResultsFile: junit.xml + summaryFileLocation: $(Build.SourcesDirectory)/coverage/cobertura-coverage.xml - ${{ else }}: # Dev Build/Deploy - stage: Dev From cee54f8b4c93d86b933239ed93fee698d80233ec Mon Sep 17 00:00:00 2001 From: Minojhini Valaiyapathi Date: Thu, 21 Aug 2025 11:54:45 -0400 Subject: [PATCH 3/6] CASH-1348 - Updated the response object model for closestShops --- src/layouts/address-lookup/address-lookup.spec.js | 2 +- src/layouts/address-lookup/address-lookup.vue | 2 +- src/layouts/license-plate-lookup/license-plate-lookup.spec.js | 2 +- src/layouts/license-plate-lookup/license-plate-lookup.vue | 2 +- .../service-zip-modal-question/service-zip-modal-question.vue | 2 +- .../service-location/shop-question/shop-question-popup.vue | 2 +- src/layouts/service-zip/service-zip.vue | 2 +- src/layouts/vehicle/vehicle.vue | 2 +- src/layouts/vin-lookup/vin-lookup.vue | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/layouts/address-lookup/address-lookup.spec.js b/src/layouts/address-lookup/address-lookup.spec.js index 2e3c766d2..6ebce247e 100644 --- a/src/layouts/address-lookup/address-lookup.spec.js +++ b/src/layouts/address-lookup/address-lookup.spec.js @@ -757,7 +757,7 @@ function setupMocks({ wrapper.vm.$refs.navbar.removeLoader = jest.fn(); const closestShops = { data: { - providers: [ + inShopProviders: [ { id: 1, name: "Shop 1" }, { id: 2, name: "Shop 2" }, ], diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue index 8f077f75b..081be8def 100644 --- a/src/layouts/address-lookup/address-lookup.vue +++ b/src/layouts/address-lookup/address-lookup.vue @@ -308,7 +308,7 @@ export default { this.serviceZipCode, this.carId ); - this.displayNoServiceAlert = !closestShops?.data?.providers?.length; + this.displayNoServiceAlert = !closestShops?.data?.inShopProviders?.length; if (this.displayNoServiceAlert) { return this.$refs.navbar.removeLoader(); } diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.spec.js b/src/layouts/license-plate-lookup/license-plate-lookup.spec.js index a1b768fb3..bb632054c 100644 --- a/src/layouts/license-plate-lookup/license-plate-lookup.spec.js +++ b/src/layouts/license-plate-lookup/license-plate-lookup.spec.js @@ -722,7 +722,7 @@ function setupMocks({ wrapper.vm.$refs.navbar.removeLoader = jest.fn(); const closestShops = { data: { - providers: [ + inShopProviders: [ { id: 1, name: "Shop 1" }, { id: 2, name: "Shop 2" }, ], diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue index f1e942028..4a4b6b04c 100644 --- a/src/layouts/license-plate-lookup/license-plate-lookup.vue +++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue @@ -285,7 +285,7 @@ export default { this.serviceZipCode, this.carId ); - this.displayNoServiceAlert = !closestShops?.data?.providers?.length; + this.displayNoServiceAlert = !closestShops?.data?.inShopProviders?.length; if (this.displayNoServiceAlert) { return this.$refs.navbar.removeLoader(); } diff --git a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue index cdcba989a..2ee6aac3f 100644 --- a/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue +++ b/src/layouts/service-location/service-zip-modal-question/service-zip-modal-question.vue @@ -178,7 +178,7 @@ export default { "service-location" ); - if (!closestShops || closestShops.providers?.length === 0) { + if (!closestShops || closestShops.inShopProviders?.length === 0) { this.displayNoServiceAlert = true; this.focusOnZipInput(); this.resetModalButtonStyle(); diff --git a/src/layouts/service-location/shop-question/shop-question-popup.vue b/src/layouts/service-location/shop-question/shop-question-popup.vue index ff3a9f75a..2ab9d1945 100644 --- a/src/layouts/service-location/shop-question/shop-question-popup.vue +++ b/src/layouts/service-location/shop-question/shop-question-popup.vue @@ -277,7 +277,7 @@ export default { "service-location" ); - if (!closestShops || closestShops.providers?.length === 0) { + if (!closestShops || closestShops.inShopProviders?.length === 0) { // We need an alert for heavy trucks return null; } diff --git a/src/layouts/service-zip/service-zip.vue b/src/layouts/service-zip/service-zip.vue index 273d87604..978035a87 100644 --- a/src/layouts/service-zip/service-zip.vue +++ b/src/layouts/service-zip/service-zip.vue @@ -277,7 +277,7 @@ export default { this.serviceZipCode, this.carId ); - this.displayNoServiceAlert = !closestShops?.data?.providers?.length; + this.displayNoServiceAlert = !closestShops?.data?.inShopProviders?.length; if (this.displayNoServiceAlert) { return this.$refs.navbar.removeLoader(); } diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue index aeb58eecb..0191fcd14 100644 --- a/src/layouts/vehicle/vehicle.vue +++ b/src/layouts/vehicle/vehicle.vue @@ -522,7 +522,7 @@ export default { "vehicle" ); - if (!closestShops || closestShops.data?.providers?.length === 0) { + if (!closestShops || closestShops.data?.inShopProviders?.length === 0) { this.displayNoServiceAlert = true; if (store.getters.externalParameterState?.isExternalParameter) { return baseMixin.methods.ResetExternalParamsAndHideModal(); diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index b63582c96..483016463 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -352,7 +352,7 @@ export default { this.serviceZipCode, this.carId ); - this.displayNoServiceAlert = !closestShops?.data?.providers?.length; + this.displayNoServiceAlert = !closestShops?.data?.inShopProviders?.length; if (this.displayNoServiceAlert) { return this.$refs.navbar.removeLoader(); } From 82995c3e80bd0e87f86591f618da23778c65c636 Mon Sep 17 00:00:00 2001 From: maguire-arman Date: Thu, 21 Aug 2025 14:30:13 -0400 Subject: [PATCH 4/6] rerun pipeline to avoid failures --- playwright-tests/tests/0000__M.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/playwright-tests/tests/0000__M.test.ts b/playwright-tests/tests/0000__M.test.ts index 204648276..c8788b04a 100644 --- a/playwright-tests/tests/0000__M.test.ts +++ b/playwright-tests/tests/0000__M.test.ts @@ -291,7 +291,6 @@ async function runWorkflow(page: Page, testCase: TestCase) { // let serviceLocationPage = testCase.pages.serviceLocationPage; // await serviceLocationPage.handleServiceLocationPage(testCase.testData); - // Schedule appointment let schedulePage = testCase.pages.schedulePage; await schedulePage.handleSchedulePage(testCase.testData); From 79bacc424d22d3d2e1fa6e16b5439724bcff949b Mon Sep 17 00:00:00 2001 From: maguire-arman Date: Thu, 21 Aug 2025 15:59:40 -0400 Subject: [PATCH 5/6] Rerun pipeline --- playwright-tests/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/playwright-tests/README.md b/playwright-tests/README.md index b9124727e..d0ca74081 100644 --- a/playwright-tests/README.md +++ b/playwright-tests/README.md @@ -260,7 +260,6 @@ ADMIN_SERVICE_API_URL=
SAUCE_USERNAME=
SAUCE_ACCESS_KEY=
- ## CI/CD Integration The project uses Azure Pipelines for continuous integration with configurations defined in azure-pipelines.yml. From 5098719644fdd0876dd790a70f33723ecc6cb851 Mon Sep 17 00:00:00 2001 From: Chris Redelinghuys Date: Wed, 3 Sep 2025 13:12:07 -0400 Subject: [PATCH 6/6] CASH-1477: Modal cta button color/type --- src/digital-components/modal/modal.vue | 3 ++- .../modal-button-main/modal-button-main.vue | 18 +++++++++++------- .../save-progress-modal-question.vue | 1 + .../save-progress-popup-question.vue | 1 + src/styles/ux-variables.scss | 4 ++-- src/ux-components/button-main/button-main.vue | 14 +++++++------- 6 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/digital-components/modal/modal.vue b/src/digital-components/modal/modal.vue index f0d546782..89d428363 100644 --- a/src/digital-components/modal/modal.vue +++ b/src/digital-components/modal/modal.vue @@ -32,7 +32,7 @@

{{ modalBodyText }}

.btn { - &:first-child:active { - background-color: $red; - } &.btn-primary { position: relative; background: $red; @@ -117,8 +114,8 @@ export default { &.btn-secondary { position: relative; background: transparent; - border: 1px solid $red; - color: $red; + border: 1px solid $blue; + color: $blue; font-weight: 500; transition: all 150ms linear; height: 3rem; @@ -131,8 +128,11 @@ export default { outline: none; box-shadow: 0 0 0 3px $white, - 0 0 0 5.5px $red; - color: $white; + 0 0 0 5.5px $blue; + color: $blue; + &:hover { + color: $white; + } } &:disabled { background: transparent;