Added a method to datetime utils

Fixed failing non invitation days test

Author: Andyg79

pages/call_and_recall/non_invitations_days_page.py

@@ -10,15 +10,17 @@ def __init__(self, page: Page):
         super().__init__(page)
         self.page = page
         # Non Invitation Days - page locators, methods
-        self.enter_note_field = self.page.get_by_role("textbox", name="note")
+        self.enter_note_field = self.page.locator("#note")
         self.enter_date_field = self.page.get_by_role("textbox", name="date")
         self.add_non_invitation_day_button = self.page.get_by_role(
             "button", name="Add Non-Invitation Day"
         )
         self.non_invitation_day_delete_button = self.page.get_by_role(
             "button", name="Delete"
         )
-        self.created_on_date_locator = self.page.locator("#displayRS")
+        self.created_on_date_locator = self.page.locator(
+            "tr.oddTableRow td:nth-child(4)"
+        )
 
     def verify_non_invitation_days_tile(self) -> None:
         """Verifies the page title of the Non Invitation Days page"""
@@ -46,18 +48,16 @@ def click_delete_button(self) -> None:
         """Clicks the Delete button for a non-invitation day"""
         self.click(self.non_invitation_day_delete_button)
 
-    def verify_date_is_visible(self) -> None:
+    def verify_created_on_date_is_visible(self) -> None:
         """Verifies that the specified date is visible on the page
         Args:
             date (str): The date to verify, formatted as 'dd/mm/yyyy'.
         """
-        date = DateTimeUtils.current_datetime("dd/mm/yyyy")
-        expect(self.created_on_date_locator).to_have_text(date)
+        today = DateTimeUtils.current_datetime("%d/%m/%Y")
+        expect(self.created_on_date_locator).to_have_text(today)
 
-    def verify_date_is_not_visible(self) -> None:
-        """Verifies that the specified date is not visible on the page
-        Args:
-            date (str): The date to verify, formatted as 'dd/mm/yyyy'.
+    def verify_created_on_date_is_not_visible(self) -> None:
+        """Verifies that the 'created on' date element is not visible on the page.
+        This is used to confirm that the non-invitation day has been successfully deleted.
         """
-        date = DateTimeUtils.current_datetime("dd/mm/yyyy")
-        expect(self.created_on_date_locator).not_to_have_text(date)
+        expect(self.created_on_date_locator).not_to_be_visible

tests/regression/call_and_recall/test_non_invitation_days_regression.py

@@ -4,6 +4,7 @@
 from pages.call_and_recall.call_and_recall_page import CallAndRecallPage
 from pages.call_and_recall.non_invitations_days_page import NonInvitationDaysPage
 from utils.user_tools import UserTools
+from utils.date_time_utils import DateTimeUtils
 
 
 @pytest.fixture(scope="function", autouse=True)
@@ -24,29 +25,32 @@ def test_add_then_delete_non_invitation_day(page: Page) -> None:
     """
     Verifies that a user can add and delete a non-invitation day.
     """
-    # Scenario: Add then delete a non invitation day
-    # And I go to "Non-Invitation Days"
+    test_date = DateTimeUtils().generate_unique_weekday_date()
+
+    # When I go to "Non-Invitation Days"
     CallAndRecallPage(page).go_to_non_invitation_days_page()
 
-    # # The date entered should be a week day, otherwise a warning message will pop up
-    # When I enter "14/11/2030" in the input box with id "date"
-    NonInvitationDaysPage(page).enter_date("14/11/2030")
-    # # Add a new non invitation day
+    # And I enter a date in the input box with id "date"
+    # (The date entered should be a week day, otherwise a warning message will pop up)
+    NonInvitationDaysPage(page).enter_date(test_date)
+
     # And I enter "Add a non invitation day for automated test" in the input box with id "note"
     NonInvitationDaysPage(page).enter_note(
         "Add a non-invitation day for automated test"
     )
 
     # And I click the "Add Non-Invitation Day" button
     NonInvitationDaysPage(page).click_add_non_invitation_day_button()
+
     # Then todays date is visible in the non-invitation days table
-    NonInvitationDaysPage(page).verify_date_is_visible()
+    NonInvitationDaysPage(page).verify_created_on_date_is_visible()
+
     # When I click the delete button for the non-invitation day
-    # NonInvitationDaysPage(page).click_delete_button() TODO: this step should be executed as part of the next step (delete this step once confirmed working)
     # And I press OK on my confirmation prompt
     BasePage(page).safe_accept_dialog(page.get_by_role("button", name="Delete"))
-    # Then todays date is not visible in the non-invitation days table
-    NonInvitationDaysPage(page).verify_date_is_not_visible()
+
+    # Then the non-invitation days has been successfully deleted
+    NonInvitationDaysPage(page).verify_created_on_date_is_not_visible()
 
 
 @pytest.mark.regression

utils/date_time_utils.py

@@ -1,4 +1,5 @@
 from datetime import datetime, timedelta
+import random
 
 
 class DateTimeUtils:
@@ -124,3 +125,22 @@ def month_string_to_number(self, string: str) -> int:
             return out
         except Exception:
             raise ValueError("Not a month")
+
+    def generate_unique_weekday_date(self, start_year: int = 2025) -> str:
+        # Start from tomorrow to ensure future date
+        base_date = datetime.now() + timedelta(days=1)
+
+        # Keep moving forward until we find a weekday in 2025 or later
+        while True:
+            if base_date.weekday() < 5 and base_date.year >= start_year:
+                break
+            base_date += timedelta(days=1)
+
+        # Add randomness to avoid repeated values across runs
+        base_date += timedelta(days=random.randint(0, 10))
+
+        # Re-check for weekday after shift
+        while base_date.weekday() >= 5:
+            base_date += timedelta(days=1)
+
+        return base_date.strftime("%d/%m/%Y")