@@ -209,7 +209,7 @@ test.describe("Out of office", () => {
209209 await goToOOOPage ( page ) ;
210210 await openOOODialog ( page ) ;
211211
212- await selectToAndFromDates ( page , "13" , "22" , true ) ;
212+ await selectToAndFromDates ( page , "13" , "22" , "previous" ) ;
213213
214214 // send request
215215 await saveAndWaitForResponse ( page ) ;
@@ -694,16 +694,21 @@ async function saveAndWaitForResponse(page: Page, expectedStatusCode = 200) {
694694 } ) ;
695695}
696696
697- async function selectToAndFromDates ( page : Page , fromDate : string , toDate : string , isRangeInPast = false ) {
697+ async function selectToAndFromDates (
698+ page : Page ,
699+ fromDate : string ,
700+ toDate : string ,
701+ month : "previous" | "next" = "next"
702+ ) {
698703 await page . getByTestId ( "date-range" ) . click ( ) ;
699704 await page . locator ( ".rdp" ) . waitFor ( { state : "visible" } ) ;
700705
701- const month = isRangeInPast ? "previous" : "next" ;
702-
703706 await page . locator ( `button[name="${ month } -month"]` ) . click ( ) ;
704707
705708 await page . locator ( `button[name="day"]:text-is("${ fromDate } ")` ) . nth ( 0 ) . click ( ) ;
706709 await page . locator ( `button[name="day"]:text-is("${ toDate } ")` ) . nth ( 0 ) . click ( ) ;
710+
711+ await page . keyboard . press ( "Escape" ) ;
707712}
708713
709714async function selectDateAndCreateOOO (
@@ -718,17 +723,8 @@ async function selectDateAndCreateOOO(
718723) {
719724 const t = await localize ( "en" ) ;
720725
721- await page . getByTestId ( "date-range" ) . click ( ) ;
722- await page . locator ( ".rdp" ) . waitFor ( { state : "visible" } ) ;
726+ await selectToAndFromDates ( page , fromDate , toDate , month ) ;
723727
724- // Look for month navigation button
725- const monthButtonSelector = `button[name="${ month } -month"]` ;
726-
727- await page . locator ( monthButtonSelector ) . click ( ) ;
728-
729- await page . locator ( `button[name="day"]:text-is("${ fromDate } ")` ) . nth ( 0 ) . click ( ) ;
730-
731- await page . locator ( `button[name="day"]:text-is("${ toDate } ")` ) . nth ( 0 ) . click ( ) ;
732728 if ( editMode ) {
733729 await page . locator ( `text=${ t ( "edit_an_out_of_office" ) } ` ) . click ( ) ;
734730 } else if ( forTeamMember ) {
@@ -757,12 +753,5 @@ async function goToOOOPage(page: Page, type: "individual" | "team" = "individual
757753}
758754
759755async function openOOODialog ( page : Page ) {
760- const reasonListRespPromise = page . waitForResponse (
761- ( response ) => response . url ( ) . includes ( "outOfOfficeReasonList?batch=1" ) && response . status ( ) === 200
762- ) ;
763- const hasTeamPlanRespPromise = page . waitForResponse (
764- ( response ) => response . url ( ) . includes ( "hasTeamPlan?batch=1" ) && response . status ( ) === 200
765- ) ;
766756 await page . getByTestId ( "add_entry_ooo" ) . click ( ) ;
767- await Promise . all ( [ reasonListRespPromise , hasTeamPlanRespPromise ] ) ;
768757}
0 commit comments