From 0e8711e8ed0a11fd2629df6b4f5a98b2e316be23 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Mon, 4 Aug 2025 14:26:38 -0400 Subject: [PATCH 1/5] CASH-1182 CASH-1182 changed appointmentType button styling, and some semiBold font-weight adjustments --- .../date-picker/date-picker.vue | 3 ++- src/layouts/schedule/schedule.vue | 27 ++++++++++++++++++- .../appointment-type-question.vue | 8 +++++- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index 858ddb3e4..bb42d3ca9 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -1108,10 +1108,11 @@ export default { .month-year { grid-area: 1 / 1 / 2 / 5; - font-family: UrbanistBold; + font-family: UrbanistSemiBold; color: $black; justify-content: left; margin-bottom: 0.5rem; + font-weight:500; } .legend { grid-area: 1 / 5 / 2 / 8; diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 48dc66ad2..d91472cc5 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -46,7 +46,7 @@
- + diff --git a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue index 469344d04..ce71c3591 100644 --- a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue +++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue @@ -7,7 +7,6 @@ :questionText="questionText" :answers="answersToDisplay" :groupName="groupName" - buttonTypeString="listCard" v-model="selectedValue" :suppressError="suppressError" :validationRules="validationRules" @@ -134,4 +133,11 @@ export default { width: auto; } } +div.appointment-type-question div.button-question div.col div.button-content{ + padding-left: 0.5rem; + padding-right: 0.5rem; +} +div.appointment-type-question div.button-question div.question-text span { + font-weight: 500; +} From 132d186ab104b5fb5962d4111cdabb799dddb25c Mon Sep 17 00:00:00 2001 From: JennyNou <167806377+JennyNou@users.noreply.github.com> Date: Mon, 4 Aug 2025 14:34:24 -0400 Subject: [PATCH 2/5] Tag in-shop Playwright tests --- playwright-tests/tests/CashReplaceGlassPromoInshop.ts | 2 +- playwright-tests/tests/CashReplaceMultiGlassPromoInshop.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playwright-tests/tests/CashReplaceGlassPromoInshop.ts b/playwright-tests/tests/CashReplaceGlassPromoInshop.ts index c7922e144..d958c86e2 100644 --- a/playwright-tests/tests/CashReplaceGlassPromoInshop.ts +++ b/playwright-tests/tests/CashReplaceGlassPromoInshop.ts @@ -60,7 +60,7 @@ const cashReplaceGlassPromoInshopTests: ITestCase[] = []; const tc = { name: `CashReplaceGlassPromoInshop`, - tags: ['@E2E','@CashReplaceGlassPromoInshop', '@test_report', '@CASH'], + tags: ['@E2E','@CashReplaceGlassPromoInshop', '@test_report', '@CASH', '@CASH-1182'], testData: cashReplaceGlassPromoInshopData }; cashReplaceGlassPromoInshopTests.push(tc); diff --git a/playwright-tests/tests/CashReplaceMultiGlassPromoInshop.ts b/playwright-tests/tests/CashReplaceMultiGlassPromoInshop.ts index 7237bb530..102c7b415 100644 --- a/playwright-tests/tests/CashReplaceMultiGlassPromoInshop.ts +++ b/playwright-tests/tests/CashReplaceMultiGlassPromoInshop.ts @@ -101,7 +101,7 @@ const cashReplaceMultiGlassPromoInshopTests: ITestCase[] = []; const tc = { name: `CashReplaceMultiGlassPromoInshop`, - tags: ['@E2E','@CashReplaceMultiGlassPromoInshop', '@test_report', '@CASH'], + tags: ['@E2E','@CashReplaceMultiGlassPromoInshop', '@test_report', '@CASH', '@CASH-1182'], testData: cashReplaceMultiGlassPromoInshopData }; cashReplaceMultiGlassPromoInshopTests.push(tc); From 8a26261c94c6b1ef1d82150b8fd2a9a69ab508f4 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Mon, 4 Aug 2025 14:47:08 -0400 Subject: [PATCH 3/5] CASH-1182 formatting --- src/digital-components/date-picker/date-picker.vue | 2 +- .../appointment-type-question/appointment-type-question.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index bb42d3ca9..b68d99dc2 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -1112,7 +1112,7 @@ export default { color: $black; justify-content: left; margin-bottom: 0.5rem; - font-weight:500; + font-weight: 500; } .legend { grid-area: 1 / 5 / 2 / 8; diff --git a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue index ce71c3591..680345dc5 100644 --- a/src/layouts/service-location/appointment-type-question/appointment-type-question.vue +++ b/src/layouts/service-location/appointment-type-question/appointment-type-question.vue @@ -133,7 +133,7 @@ export default { width: auto; } } -div.appointment-type-question div.button-question div.col div.button-content{ +div.appointment-type-question div.button-question div.col div.button-content { padding-left: 0.5rem; padding-right: 0.5rem; } From 2e0958391ab0877bbb8b78be96594804fa2c1101 Mon Sep 17 00:00:00 2001 From: JennyNou <167806377+JennyNou@users.noreply.github.com> Date: Mon, 4 Aug 2025 15:56:16 -0400 Subject: [PATCH 4/5] Update locator and step for both inshop and mobile flow --- playwright-tests/pages/SchedulePage.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/playwright-tests/pages/SchedulePage.ts b/playwright-tests/pages/SchedulePage.ts index d4d00b6f0..2c3dc0a6f 100644 --- a/playwright-tests/pages/SchedulePage.ts +++ b/playwright-tests/pages/SchedulePage.ts @@ -17,7 +17,7 @@ export class SchedulePage extends BasePage { readonly militaryWarningMessage: Locator; readonly changeZipButton: Locator; readonly updateZipTextBox: Locator; - readonly saveZipButton: Locator; + readonly saveLocationButton: Locator; readonly changeShopLocationLink: Locator; readonly selectAShopOptions: Locator; readonly yourSafeliteShop: Locator; @@ -37,14 +37,14 @@ export class SchedulePage extends BasePage { super(page); this.page = page; - this.inShopButton = this.page.getByText(/In-shop/); - this.mobileButton = this.page.locator('label[buttonlabel="Mobile"]'); + this.inShopButton = this.page.locator('label[buttonlabel="You come to our store"]'); + this.mobileButton = this.page.locator('label[buttonlabel="Our mobile shop comes to you"]'); this.RecalWarningMessage1 = this.page.getByText(/We're not able to provide mobile service/); this.RecalWarningMessage2 = this.page.getByText(/advanced safety system recalibration needs to be done in our shop./); this.militaryWarningMessage = this.page.locator('[class*="widget-name-AlertMilitaryBaseZipWidget"]'); this.changeZipButton = this.page.locator('a:has(span.sr-only:has-text("edit zip code"))'); this.updateZipTextBox = this.page.locator('#serviceZipCode').filter({ visible: true }); - this.saveZipButton = this.page.getByText('Save ZIP code', { exact: true }); + this.saveLocationButton = this.page.getByText('Save location', { exact: true }); this.changeShopLocationLink = this.page.locator(".shop-question a").filter({ hasText: "Change shop location " }); this.selectAShopOptions = this.page.locator('[class="shop-question"]'); this.yourSafeliteShop = this.page.locator("fieldset:has(#chooseShop) label"); @@ -82,10 +82,10 @@ export class SchedulePage extends BasePage { if (zipCodeMatch) { const zipCode = zipCodeMatch[0]; // Enter the ZIP code into the updateZipTextBox - await this.changeZipButton.click(); + await this.changeShopLocationLink.click(); await this.page.waitForTimeout(500); await this.updateZipTextBox.fill(zipCode); - await this.saveZipButton.click(); + await this.saveLocationButton.click(); } await this.inShopButton.click(); From 70fa7a870a7cce8c058db9069dfa25929017fa47 Mon Sep 17 00:00:00 2001 From: JennyNou <167806377+JennyNou@users.noreply.github.com> Date: Mon, 4 Aug 2025 16:13:35 -0400 Subject: [PATCH 5/5] Comment to rerun --- playwright-tests/pages/SchedulePage.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/playwright-tests/pages/SchedulePage.ts b/playwright-tests/pages/SchedulePage.ts index 2c3dc0a6f..368993d5f 100644 --- a/playwright-tests/pages/SchedulePage.ts +++ b/playwright-tests/pages/SchedulePage.ts @@ -85,6 +85,7 @@ export class SchedulePage extends BasePage { await this.changeShopLocationLink.click(); await this.page.waitForTimeout(500); await this.updateZipTextBox.fill(zipCode); + // Click the save location button await this.saveLocationButton.click(); }