Sperating out test_utils/test_calendar_pciker_methods.py into two files

One for unit testing the variable generation and the other to test all the methods work with BCSS

Author: adrianoaru-nhs

…ts_utils/test_calender_picker_methods.py tests/test_calendar_picker_methods.pytests_utils/test_calender_picker_methods.py renamed to tests/test_calendar_picker_methods.py tests_utils/test_calender_picker_methods.py renamed to tests/test_calendar_picker_methods.py

@@ -1,51 +1,51 @@
-from pages.screening_subject_search.subject_screening_search_page import (
-    SubjectScreeningPage,
-)
-from pages.communication_production.communications_production_page import (
-    CommunicationsProduction,
-)
-from pages.communication_production.batch_list_page import ActiveBatchList
-import pytest
-from playwright.sync_api import Page
-from pages.base_page import BasePage
-from utils.user_tools import UserTools
-from datetime import datetime
-
-
-@pytest.mark.smoke
-def test_calender_picker_v1(page: Page) -> None:
-    """
-    This test is used to verify that the v1 calendar picker in utils/calendar_picker.py works as intended
-    This uses the subject screening search page in order to do so
-    NOTE: currently there is no validation that it has selected the correct date.
-        This should be implemented after each date is selected however the locators on BCSS make this task difficult
-    """
-    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
-    BasePage(page).go_to_screening_subject_search_page()
-    SubjectScreeningPage(page).select_dob_using_calendar_picker(datetime(2021, 12, 1))
-    SubjectScreeningPage(page).click_clear_filters_button()
-    SubjectScreeningPage(page).select_dob_using_calendar_picker(datetime(2020, 3, 30))
-    SubjectScreeningPage(page).click_clear_filters_button()
-    SubjectScreeningPage(page).select_dob_using_calendar_picker(datetime(2020, 6, 15))
-    SubjectScreeningPage(page).click_clear_filters_button()
-    SubjectScreeningPage(page).select_dob_using_calendar_picker(datetime.today())
-
-
-@pytest.mark.smoke
-def test_calender_picker_v2(page: Page) -> None:
-    """
-    This test is used to verify that the v2 calendar picker in utils/calendar_picker.py works as intended
-    This uses the active batch list page in order to do so
-    NOTE: currently there is no validation that it has selected the correct date.
-        This should be implemented after each date is selected however the locators on BCSS make this task difficult
-    """
-    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
-    BasePage(page).go_to_communications_production_page()
-    CommunicationsProduction(page).go_to_active_batch_list_page()
-    ActiveBatchList(page).enter_deadline_date_filter(datetime(1961, 12, 30))
-    ActiveBatchList(page).clear_deadline_filter_date()
-    ActiveBatchList(page).enter_deadline_date_filter(datetime(2026, 12, 1))
-    ActiveBatchList(page).clear_deadline_filter_date()
-    ActiveBatchList(page).enter_deadline_date_filter(datetime(1989, 6, 15))
-    ActiveBatchList(page).clear_deadline_filter_date()
-    ActiveBatchList(page).enter_deadline_date_filter(datetime.today())
+from pages.screening_subject_search.subject_screening_search_page import (
+    SubjectScreeningPage,
+)
+from pages.communication_production.communications_production_page import (
+    CommunicationsProduction,
+)
+from pages.communication_production.batch_list_page import ActiveBatchList
+import pytest
+from playwright.sync_api import Page
+from pages.base_page import BasePage
+from utils.user_tools import UserTools
+from datetime import datetime
+
+
+@pytest.mark.smoke
+def test_calender_picker_v1(page: Page) -> None:
+    """
+    This test is used to verify that the v1 calendar picker in utils/calendar_picker.py works as intended
+    This uses the subject screening search page in order to do so
+    NOTE: currently there is no validation that it has selected the correct date.
+        This should be implemented after each date is selected however the locators on BCSS make this task difficult
+    """
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
+    BasePage(page).go_to_screening_subject_search_page()
+    SubjectScreeningPage(page).select_dob_using_calendar_picker(datetime(2021, 12, 1))
+    SubjectScreeningPage(page).click_clear_filters_button()
+    SubjectScreeningPage(page).select_dob_using_calendar_picker(datetime(2020, 3, 30))
+    SubjectScreeningPage(page).click_clear_filters_button()
+    SubjectScreeningPage(page).select_dob_using_calendar_picker(datetime(2020, 6, 15))
+    SubjectScreeningPage(page).click_clear_filters_button()
+    SubjectScreeningPage(page).select_dob_using_calendar_picker(datetime.today())
+
+
+@pytest.mark.smoke
+def test_calender_picker_v2(page: Page) -> None:
+    """
+    This test is used to verify that the v2 calendar picker in utils/calendar_picker.py works as intended
+    This uses the active batch list page in order to do so
+    NOTE: currently there is no validation that it has selected the correct date.
+        This should be implemented after each date is selected however the locators on BCSS make this task difficult
+    """
+    UserTools.user_login(page, "Hub Manager State Registered at BCS01")
+    BasePage(page).go_to_communications_production_page()
+    CommunicationsProduction(page).go_to_active_batch_list_page()
+    ActiveBatchList(page).enter_deadline_date_filter(datetime(1961, 12, 30))
+    ActiveBatchList(page).clear_deadline_filter_date()
+    ActiveBatchList(page).enter_deadline_date_filter(datetime(2026, 12, 1))
+    ActiveBatchList(page).clear_deadline_filter_date()
+    ActiveBatchList(page).enter_deadline_date_filter(datetime(1989, 6, 15))
+    ActiveBatchList(page).clear_deadline_filter_date()
+    ActiveBatchList(page).enter_deadline_date_filter(datetime.today())

tests_utils/test_calendar_picker_util.py

@@ -0,0 +1,93 @@
+import pytest
+from utils.calendar_picker import CalendarPicker
+from datetime import datetime
+from playwright.sync_api import Page
+
+pytestmark = [pytest.mark.utils]
+
+
+def test_calculate_v2_calendar_variables(page: Page):
+    calendar_picker = CalendarPicker(page)
+    (
+        current_month_long,
+        month_long,
+        month_short,
+        current_year,
+        year,
+        end_of_current_decade,
+        current_decade,
+        decade,
+        end_of_current_century,
+        current_century,
+        century,
+    ) = calendar_picker.calculate_v2_calendar_variables(
+        datetime(2025, 4, 9), datetime(2020, 6, 9)
+    )
+
+    assert current_month_long == "June"
+    assert month_long == "April"
+    assert month_short == "Apr"
+    assert current_year == 2020
+    assert year == 2025
+    assert end_of_current_decade == "2029"
+    assert current_decade == 2020
+    assert decade == 2020
+    assert end_of_current_century == "2090"
+    assert current_century == 2000
+    assert century == 2000
+
+    (
+        current_month_long,
+        month_long,
+        month_short,
+        current_year,
+        year,
+        end_of_current_decade,
+        current_decade,
+        decade,
+        end_of_current_century,
+        current_century,
+        century,
+    ) = calendar_picker.calculate_v2_calendar_variables(
+        datetime(1963, 1, 28), datetime(2020, 6, 9)
+    )
+
+    assert current_month_long == "June"
+    assert month_long == "January"
+    assert month_short == "Jan"
+    assert current_year == 2020
+    assert year == 1963
+    assert end_of_current_decade == "2029"
+    assert current_decade == 2020
+    assert decade == 1960
+    assert end_of_current_century == "2090"
+    assert current_century == 2000
+    assert century == 1900
+
+    (
+        current_month_long,
+        month_long,
+        month_short,
+        current_year,
+        year,
+        end_of_current_decade,
+        current_decade,
+        decade,
+        end_of_current_century,
+        current_century,
+        century,
+    ) = calendar_picker.calculate_v2_calendar_variables(
+        datetime(2356, 12, 18), datetime(2020, 6, 9)
+    )
+
+    assert current_month_long == "June"
+    assert month_long == "December"
+    assert month_short == "Dec"
+    assert current_year == 2020
+    assert year == 2356
+    assert end_of_current_decade == "2029"
+    assert current_decade == 2020
+    assert decade == 2350
+    assert end_of_current_century == "2090"
+    assert current_century == 2000
+    assert century == 2300

utils/calendar_picker.py

@@ -105,7 +105,7 @@ def v1_calender_picker(self, date: datetime) -> None:
         self.select_day(date)
 
     def calculate_v2_calendar_variables(
-        self, date: datetime
+        self, date: datetime, current_date: datetime
     ) -> tuple[str, str, str, int, int, str, int, int, str, int, int]:
         """
         This function calculates all of the variables needed to traverse through the v2 calendar picker
@@ -122,7 +122,6 @@ def calculate_v2_calendar_variables(
             current_century: the current century in yyyy format (e.g. 2000/2100)
             century: the wanted century in yyyy format (e.g. 1900)
         """
-        current_date = datetime.today()
         current_month_long = str(current_date.strftime("%B"))
         current_year = int(current_date.strftime("%Y"))
         current_century = (current_year // 100) * 100
@@ -227,7 +226,7 @@ def v2_calendar_picker(self, date: datetime) -> None:
         This is the main method to navigate the v2 calendar picker (like the one on the Active Batch List page)
         This calls all the relevant functions in order to know how to traverse the picker
         """
-
+        current_date = datetime.today()
         (
             current_month_long,
             month_long,
@@ -240,7 +239,7 @@ def v2_calendar_picker(self, date: datetime) -> None:
             end_of_current_century,
             current_century,
             century,
-        ) = self.calculate_v2_calendar_variables(date)
+        ) = self.calculate_v2_calendar_variables(date, current_date)
 
         click_month, click_year, click_decade, click_century = (
             self.v2_calendar_picker_traverse_back(