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" - 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 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); diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index fa8c9d218..8033f5b41 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -1025,6 +1025,8 @@ export default { flex-grow: 0; display: flex; flex-direction: column; + align-items: flex-start; + text-align: left; .duration-text-block { text-align: left; @@ -1108,7 +1110,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 0be89d4dd..241df49cd 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -5,22 +5,6 @@