Reverting merge conflict overwrites and adding typing to a method.

adrianoaru-nhs · adrianoaru-nhs · commit 38989a4be90a · 2025-06-26T09:27:44.000+01:00
diff --git a/tests/bcss_tests.properties b/tests/bcss_tests.properties
@@ -25,5 +25,6 @@ episode_closed_date=22/09/2020
 # ----------------------------------
 # CALL AND RECALL TEST DATA
 # ----------------------------------
-daily_invitation_rate=6
+daily_invitation_rate=28
+fobt_daily_invitation_rate=6
 weekly_invitation_rate=130
diff --git a/tests/regression/call_and_recall/test_generate_fobt_invitation_regression.py b/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["daily_invitation_rate"])
+        int(general_properties["fobt_daily_invitation_rate"])
     )
     logging.info("Invitations generated successfully")
 
diff --git a/utils/table_util.py b/utils/table_util.py
@@ -235,7 +235,7 @@ def get_cell_value(self, column_name: str, row_index: int) -> str:
                 f"No cell found at column '{column_name}' and row index {row_index}"
             )
 
-    def assert_surname_in_table(self, surname_pattern):
+    def assert_surname_in_table(self, surname_pattern: str) -> None:
         """
         Asserts that a surname matching the given pattern exists in the table.
         Args:

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ def test_run_fobt_invitations_and_process_s1_batch(`
`41`	`41`	`logging.info("Generating invitations based on the invitation plan")`
`42`	`42`	`GenerateInvitationsPage(page).click_generate_invitations_button()`
`43`	`43`	`GenerateInvitationsPage(page).wait_for_invitation_generation_complete(`
`44`		`- int(general_properties["daily_invitation_rate"])`
	`44`	`+ int(general_properties["fobt_daily_invitation_rate"])`
`45`	`45`	`)`
`46`	`46`	`logging.info("Invitations generated successfully")`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ def get_cell_value(self, column_name: str, row_index: int) -> str:`
`235`	`235`	`f"No cell found at column '{column_name}' and row index {row_index}"`
`236`	`236`	`)`
`237`	`237`
`238`		`- def assert_surname_in_table(self, surname_pattern):`
	`238`	`+ def assert_surname_in_table(self, surname_pattern: str) -> None:`
`239`	`239`	`"""`
`240`	`240`	`Asserts that a surname matching the given pattern exists in the table.`
`241`	`241`	`Args:`