From 76e667f7cc3c8800baa758ba05c9281ab81e47be Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Thu, 31 Jul 2025 09:42:32 -0400 Subject: [PATCH 01/11] CASH-1182 CASH-1182 moved serviceZipModal under appointmentType question, left alignedheaders and stuff on the page --- .../date-picker/date-picker.vue | 2 +- src/layouts/schedule/schedule.vue | 40 ++++++++++--------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index 72bdcb093..f8b5496fe 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -1106,7 +1106,7 @@ export default { grid-area: 1 / 1 / 2 / 5; font-family: UrbanistBold; color: $black; - justify-content: center; + justify-content: left; margin-bottom: 0.5rem; } .legend { diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 0e68cb458..f060debac 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -5,22 +5,6 @@
- -
-
+
+
+ + +
-
+
Date: Fri, 1 Aug 2025 09:36:51 -0400 Subject: [PATCH 02/11] CASH-1182 CASH-1182 updated cms, font stylings --- .../date-picker/date-picker.vue | 2 ++ src/layouts/schedule/schedule.vue | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index f8b5496fe..65870270c 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -1026,6 +1026,8 @@ export default { flex-grow: 0; display: flex; flex-direction: column; + align-items: flex-start; + text-align: left; .date-picker-header { margin-bottom: 1.5rem; diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index f060debac..4032e0de6 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -45,7 +45,8 @@
-
+
+
-
+
-
+
From e6d602ec3da8b767c95d8e315ad2d487ba1aacfd Mon Sep 17 00:00:00 2001 From: JennyNou <167806377+JennyNou@users.noreply.github.com> Date: Fri, 1 Aug 2025 11:45:57 -0400 Subject: [PATCH 03/11] Tag automation tests to run in pipeline --- playwright-tests/tests/CashReplaceMultiGlassMobile.ts | 2 +- playwright-tests/tests/CashReplaceSafeliteCanNotRecalMobile.ts | 2 +- playwright-tests/tests/CashReplaceVinMobile.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playwright-tests/tests/CashReplaceMultiGlassMobile.ts b/playwright-tests/tests/CashReplaceMultiGlassMobile.ts index f67f44234..5db56fb85 100644 --- a/playwright-tests/tests/CashReplaceMultiGlassMobile.ts +++ b/playwright-tests/tests/CashReplaceMultiGlassMobile.ts @@ -95,7 +95,7 @@ const cashReplaceMultiGlassMobileTests: ITestCase[] = []; const tc = { name: `CashReplaceMultiGlassMobile`, - tags: ['@E2E','@CashReplaceMultiGlassMobile', '@test_report', '@CASH'], + tags: ['@E2E','@CashReplaceMultiGlassMobile', '@test_report', '@CASH', '@CASH-1182'], testData: cashReplaceMultiGlassMobileData }; cashReplaceMultiGlassMobileTests.push(tc); diff --git a/playwright-tests/tests/CashReplaceSafeliteCanNotRecalMobile.ts b/playwright-tests/tests/CashReplaceSafeliteCanNotRecalMobile.ts index 3729ff72b..7bbc671ee 100644 --- a/playwright-tests/tests/CashReplaceSafeliteCanNotRecalMobile.ts +++ b/playwright-tests/tests/CashReplaceSafeliteCanNotRecalMobile.ts @@ -77,7 +77,7 @@ const cashReplaceSafeliteCanNotRecalMobileTests: ITestCase[] = []; const tc = { name: `CashReplaceSafeliteCanNotRecalMobile`, - tags: ['@E2E','@CashReplaceSafeliteCanNotRecalMobile', '@test_report', '@CASH'], + tags: ['@E2E','@CashReplaceSafeliteCanNotRecalMobile', '@test_report', '@CASH', '@CASH-1182'], testData: cashReplaceSafeliteCanNotRecalMobileData }; cashReplaceSafeliteCanNotRecalMobileTests.push(tc); diff --git a/playwright-tests/tests/CashReplaceVinMobile.ts b/playwright-tests/tests/CashReplaceVinMobile.ts index d47ab608f..e81220cd0 100644 --- a/playwright-tests/tests/CashReplaceVinMobile.ts +++ b/playwright-tests/tests/CashReplaceVinMobile.ts @@ -66,7 +66,7 @@ const cashReplaceVinMobileTests: ITestCase[] = []; const tc = { name: `CashReplaceVinMobile`, - tags: ['@E2E','@CashReplaceVinMobile', '@test_report', '@CASH'], + tags: ['@E2E','@CashReplaceVinMobile', '@test_report', '@CASH', '@CASH-1182'], testData: cashReplaceVinMobileData }; cashReplaceVinMobileTests.push(tc); From 0e2b29d803a6161268922649327ba189e3e57b16 Mon Sep 17 00:00:00 2001 From: Johnny shultz Date: Fri, 1 Aug 2025 13:14:43 -0400 Subject: [PATCH 04/11] CASH-1182 CASH-1182 formatting and removed unused css --- src/layouts/schedule/schedule.vue | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 4be8c59e9..241df49cd 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -1798,13 +1798,8 @@ export default { background: $blue-100; box-shadow: 0 0 0 1px $primary; } -.schedule-header { - font-weight: 400; - font-size: 20px; - text-align: left; -} -.container .row .col-12 .alert-success .alert-heading{ +.container .row .col-12 .alert-success .alert-heading { color: $black; font-weight: 600; } From 92a6bc141add792e5bc1c9296e04368f02b8f5b1 Mon Sep 17 00:00:00 2001 From: JennyNou <167806377+JennyNou@users.noreply.github.com> Date: Fri, 1 Aug 2025 13:34:35 -0400 Subject: [PATCH 05/11] Comment out progress bar validation function --- playwright-tests/pages/BasePage.ts | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/playwright-tests/pages/BasePage.ts b/playwright-tests/pages/BasePage.ts index ec6c5d767..30df48447 100644 --- a/playwright-tests/pages/BasePage.ts +++ b/playwright-tests/pages/BasePage.ts @@ -131,24 +131,24 @@ export class BasePage { } async validateProgressBar(progressPercentage: string, timeout: number = 60000) { + // This section has been commented out until progress bar work is completed for parity. - - await waitUntil(async () => { - let loaderElements = await this.page.locator('button .loader, .buy-loader, timeout, .modal-loader').all(); - return !(await Promise.any(loaderElements.map(el => el.isVisible())).catch(() => false)); - }); + // await waitUntil(async () => { + // let loaderElements = await this.page.locator('button .loader, .buy-loader, timeout, .modal-loader').all(); + // return !(await Promise.any(loaderElements.map(el => el.isVisible())).catch(() => false)); + // }); - // Take a screenshot of the page before validating the progress bar - await this.page.screenshot({ path: `test-results\\ortoni-data\\progress-bar-${Date.now()}.png`, fullPage: true }); - // Wait until the progress bar element is attached and visible + // // Take a screenshot of the page before validating the progress bar + // await this.page.screenshot({ path: `test-results\\ortoni-data\\progress-bar-${Date.now()}.png`, fullPage: true }); + // // Wait until the progress bar element is attached and visible - const actualProgressPercentage = await this.progressBar.evaluate( - async (element) => { - await new Promise(resolve => setTimeout(resolve, 200)); - return element.style.width || "Not Found"; - } - ); - Soft.expect(actualProgressPercentage).toBe(progressPercentage); - console.log(`Progress Bar Percentage: Actual - ${actualProgressPercentage} vs Expected - ${progressPercentage}`); + // const actualProgressPercentage = await this.progressBar.evaluate( + // async (element) => { + // await new Promise(resolve => setTimeout(resolve, 200)); + // return element.style.width || "Not Found"; + // } + // ); + // Soft.expect(actualProgressPercentage).toBe(progressPercentage); + // console.log(`Progress Bar Percentage: Actual - ${actualProgressPercentage} vs Expected - ${progressPercentage}`); } } \ No newline at end of file From 1011e0ee448f460e07683ba7fc6515ae9dce6608 Mon Sep 17 00:00:00 2001 From: JennyNou <167806377+JennyNou@users.noreply.github.com> Date: Fri, 1 Aug 2025 13:44:13 -0400 Subject: [PATCH 06/11] Add to comment --- playwright-tests/pages/BasePage.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/playwright-tests/pages/BasePage.ts b/playwright-tests/pages/BasePage.ts index 30df48447..bcaeab3ec 100644 --- a/playwright-tests/pages/BasePage.ts +++ b/playwright-tests/pages/BasePage.ts @@ -132,6 +132,7 @@ export class BasePage { async validateProgressBar(progressPercentage: string, timeout: number = 60000) { // This section has been commented out until progress bar work is completed for parity. + // Uncomment when ready. // await waitUntil(async () => { // let loaderElements = await this.page.locator('button .loader, .buy-loader, timeout, .modal-loader').all(); From d217f9ee44c33f6f4dcd5637645c5798c8004aa6 Mon Sep 17 00:00:00 2001 From: maguire-arman Date: Fri, 1 Aug 2025 13:52:08 -0400 Subject: [PATCH 07/11] Comments out progress bar validation. Comments out the progress bar validation code. This is done because the progress bar implementation is not yet complete. The validation will be re-enabled when the progress bar work is finished. --- playwright-tests/pages/BasePage.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/playwright-tests/pages/BasePage.ts b/playwright-tests/pages/BasePage.ts index bcaeab3ec..30df48447 100644 --- a/playwright-tests/pages/BasePage.ts +++ b/playwright-tests/pages/BasePage.ts @@ -132,7 +132,6 @@ export class BasePage { async validateProgressBar(progressPercentage: string, timeout: number = 60000) { // This section has been commented out until progress bar work is completed for parity. - // Uncomment when ready. // await waitUntil(async () => { // let loaderElements = await this.page.locator('button .loader, .buy-loader, timeout, .modal-loader').all(); From 08e51f5dde260d11b68b306aa2685f3a6c08943e Mon Sep 17 00:00:00 2001 From: maguire-arman Date: Fri, 1 Aug 2025 14:04:00 -0400 Subject: [PATCH 08/11] Test commit to trigger pipeline --- playwright-tests/pages/BasePage.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/playwright-tests/pages/BasePage.ts b/playwright-tests/pages/BasePage.ts index 30df48447..0c2779ba2 100644 --- a/playwright-tests/pages/BasePage.ts +++ b/playwright-tests/pages/BasePage.ts @@ -132,6 +132,7 @@ export class BasePage { async validateProgressBar(progressPercentage: string, timeout: number = 60000) { // This section has been commented out until progress bar work is completed for parity. + // // await waitUntil(async () => { // let loaderElements = await this.page.locator('button .loader, .buy-loader, timeout, .modal-loader').all(); From b4fd2ed9703434bb937e66947305633e6518cfa5 Mon Sep 17 00:00:00 2001 From: maguire-arman Date: Fri, 1 Aug 2025 14:14:55 -0400 Subject: [PATCH 09/11] test commit to trigger pipeline 2 Comments out the progress bar validation logic in the base page. This is a temporary measure until the progress bar implementation is completed. --- playwright-tests/pages/BasePage.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playwright-tests/pages/BasePage.ts b/playwright-tests/pages/BasePage.ts index 0c2779ba2..c5326504d 100644 --- a/playwright-tests/pages/BasePage.ts +++ b/playwright-tests/pages/BasePage.ts @@ -132,7 +132,7 @@ export class BasePage { async validateProgressBar(progressPercentage: string, timeout: number = 60000) { // This section has been commented out until progress bar work is completed for parity. - // + // await waitUntil(async () => { // let loaderElements = await this.page.locator('button .loader, .buy-loader, timeout, .modal-loader').all(); From 94aaad64d3c706bdfe590623143a8b558b6aa4d2 Mon Sep 17 00:00:00 2001 From: maguire-arman Date: Fri, 1 Aug 2025 14:25:04 -0400 Subject: [PATCH 10/11] test commit test commit --- playwright-tests/pages/BasePage.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/playwright-tests/pages/BasePage.ts b/playwright-tests/pages/BasePage.ts index c5326504d..30df48447 100644 --- a/playwright-tests/pages/BasePage.ts +++ b/playwright-tests/pages/BasePage.ts @@ -133,7 +133,6 @@ export class BasePage { async validateProgressBar(progressPercentage: string, timeout: number = 60000) { // This section has been commented out until progress bar work is completed for parity. - // await waitUntil(async () => { // let loaderElements = await this.page.locator('button .loader, .buy-loader, timeout, .modal-loader').all(); // return !(await Promise.any(loaderElements.map(el => el.isVisible())).catch(() => false)); From 9901b84bc68ccc82ac745f039750f18665acef53 Mon Sep 17 00:00:00 2001 From: maguire-arman Date: Fri, 1 Aug 2025 14:37:00 -0400 Subject: [PATCH 11/11] Removes trailing whitespace from .env.dev Removes an unnecessary empty line at the end of the .env.dev file, improving code cleanliness. --- playwright-tests/.env.dev | 1 - 1 file changed, 1 deletion(-) diff --git a/playwright-tests/.env.dev b/playwright-tests/.env.dev index 0f8e62d0c..00c66dc6c 100644 --- a/playwright-tests/.env.dev +++ b/playwright-tests/.env.dev @@ -27,4 +27,3 @@ ADMIN_SERVICE_API_URL="https://issadminapi.dev.sagaws.net/iss-admin/api/v1/" # API authentication (replace with actual value when running tests) CCIS_API_AUTH="undefined" -