Merge branch 'main' of github.com:NHSDigital/bcss-playwright into feature/BCSS-20679-selenium-to-playwright-subject-selection-query-builder

# Conflicts:
#	tests/bcss_tests.properties
#	tests/regression/call_and_recall/test_generate_fobt_invitation_regression.py

Author: adrianoaru-nhs

tests/bcss_tests.properties

@@ -25,6 +25,5 @@ episode_closed_date=22/09/2020
 # ----------------------------------
 # CALL AND RECALL TEST DATA
 # ----------------------------------
-daily_invitation_rate=28
-fobt_daily_invitation_rate=6
+daily_invitation_rate=6
 weekly_invitation_rate=130

tests/regression/call_and_recall/test_generate_fobt_invitation_regression.py

@@ -41,7 +41,7 @@ def test_run_fobt_invitations_and_process_s1_batch(
     logging.info("Generating invitations based on the invitation plan")
     GenerateInvitationsPage(page).click_generate_invitations_button()
     GenerateInvitationsPage(page).wait_for_invitation_generation_complete(
-        int(general_properties["fobt_daily_invitation_rate"])
+        int(general_properties["daily_invitation_rate"])
     )
     logging.info("Invitations generated successfully")
 

…r_test_harness/mock_selection_builder.py …r_test_harness/mock_selection_builder.pyutils/oracle/query_builder_test_harness/mock_selection_builder.py renamed to tests_utils/query_builder_test_harness/mock_selection_builder.py utils/oracle/query_builder_test_harness/mock_selection_builder.py renamed to tests_utils/query_builder_test_harness/mock_selection_builder.py

@@ -23,7 +23,9 @@
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "../..")))
 print("PYTHONPATH set to:", sys.path[0])
-from utils.oracle.query_builder_test_harness.mock_selection_builder import MockSelectionBuilder
+from tests_utils.query_builder_test_harness.mock_selection_builder import (
+    MockSelectionBuilder,
+)
 from classes.subject_selection_criteria_key import SubjectSelectionCriteriaKey
 
 
@@ -37,6 +39,7 @@ def make_builder(key, value, index=0, comparator="="):
     b.criteria_comparator = comparator
     return b
 
+
 # === Example usage ===
 # Replace the examples below with your tests for the method you want to test