fix tests

Author: robvickers

tests/regression/reports/operational/test_subjects_to_be_invited_with_temporary_address.py

@@ -21,15 +21,14 @@
 from datetime import datetime, timedelta
 
 
-@pytest.mark.wip
 @pytest.mark.regression
 @pytest.mark.reports_operational
 def test_subject_not_on_report_if_not_due(page: Page) -> None:
     """
-    Test to check if a subject is not due for invite they are not in the report.
+    Test to check that a subject who is not due for invite is not in the report.
     """
     logging.info(
-        "Starting test: Test to check if a subject is not due for invite they are not in the report."
+        "Starting test: Test to check that a subject who is not due for invite is not in the report."
     )
 
     criteria1 = {
@@ -52,10 +51,10 @@ def test_subject_not_on_report_if_not_due(page: Page) -> None:
 @pytest.mark.reports_operational
 def test_subject_to_be_invited_without_temporary_address_at_this_hub_not_on_report(page: Page) -> None:
     """
-    Test to check if a subject that is due to be invited, that does not have a temporary address, at this hub, does not appear in the report.
+    Test to check that a subject who is due to be invited, but does not have a temporary address, and is at this hub, does not appear in the report.
     """
     logging.info(
-        "Starting test: Verify a subject that is due to be invited, that does not have a temporary address, at this hub, does not appear in the report."
+        "Starting test: Check that a subject who is due to be invited, but does not have a temporary address, and is at this hub, does not appear in the report."
     )
 
     criteria = {
@@ -87,15 +86,14 @@ def test_subject_to_be_invited_without_temporary_address_at_this_hub_not_on_repo
     report.assertRecordsVisible(nhs_no, True)
 
 
-@pytest.mark.wip
 @pytest.mark.regression
 @pytest.mark.reports_operational
-def test_subject_to_be_invited_without_temporary_address_at_another_hub_not_on_report(page: Page) -> None:
+def test_subject_to_be_invited_with_temporary_address_at_another_hub_not_on_report(page: Page) -> None:
     """
-    Test to check if a subject that is due to be invited, that does have a temporary address but at another hub, does not appear in the report.
+    Test to check that a subject who is due to be invited, and does have a temporary address but is at another hub, does not appear in the report.
     """
     logging.info(
-        "Starting test: Verify a subject that is due to be invited, that does have a temporary address but at another hub, does not appear in the report."
+        "Starting test: Check that a subject who is due to be invited, and does have a temporary address but is at another hub, does not appear in the report."
     )
 
     criteria = {
@@ -115,15 +113,15 @@ def test_subject_to_be_invited_without_temporary_address_at_another_hub_not_on_r
     report.filter_by_nhs_number(nhs_no)
     report.assertRecordsVisible(nhs_no, False)
 
-@pytest.mark.wip
+
 @pytest.mark.regression
 @pytest.mark.reports_operational
 def test_subject_on_report_is_hidden_after_review(page: Page) -> None:
     """
-    Test to check if a subject is reviewed they are hidden from the default view in the report.
+    Test to check that a subject who becomes reviewed is then hidden from the default view in the report.
     """
     logging.info(
-        "Starting test: Test to check if a subject is reviewed they are hidden from the default view in the report."
+        "Starting test: Check that a subject who becomes reviewed is then hidden from the default view in the report."
     )
 
     criteria = {
@@ -166,15 +164,15 @@ def test_subject_on_report_is_hidden_after_review(page: Page) -> None:
     report.filterByReviewed("No")
     report.assertRecordsVisible(nhs_no, True)
 
-@pytest.mark.wip
+
 @pytest.mark.regression
 @pytest.mark.reports_operational
 def test_subject_to_be_invited_with_temporary_address_at_this_hub_is_on_report(page: Page) -> None:
     """
-    Test to check if a subject that is due to be invited, that does have a temporary address, at this hub, does appear in the report.
+    Test to check that a subject who is due to be invited, and does have a temporary address, and is at this hub, does appear in the report.
     """
     logging.info(
-        "Starting test: Verify a subject that is due to be invited, that does have a temporary address, at this hub, does appear in the report."
+        "Starting test: Check that a subject who is due to be invited, and does have a temporary address, and is at this hub, does appear in the report."
     )
 
     criteria = {
@@ -274,4 +272,7 @@ def _remove_a_temp_address(page: Page) -> None:
 def _update_temp_address(page: Page, temp_address) -> None:
     logging.info(f"Updating Temporary address : {temp_address}.")
     demographic_page = SubjectDemographicPage(page)
+
+    logging.info("Updating postcode as sometimes the existing address has a bad or blank value which might break the save")
+    demographic_page.fill_postcode_input("EX11AA")
     demographic_page.update_temporary_address(temp_address)

tests/regression/subject/demographic/test_temporary_address.py

@@ -35,7 +35,7 @@ def before_each(page: Page) -> str:
     search_subject_demographics_by_nhs_number(page, nhs_no)
     return nhs_no
 
-@pytest.mark.wip
+
 @pytest.mark.vpn_required
 @pytest.mark.regression
 @pytest.mark.subject_tests
@@ -58,7 +58,6 @@ def test_not_amending_temporary_address(page: Page, before_each) -> None:
     LogoutPage(page).log_out()
 
 
-@pytest.mark.wip
 @pytest.mark.vpn_required
 @pytest.mark.regression
 @pytest.mark.subject_tests
@@ -100,7 +99,6 @@ def test_add_temporary_address_then_delete(page: Page, before_each) -> None:
     LogoutPage(page).log_out()
 
 
-@pytest.mark.wip
 @pytest.mark.vpn_required
 @pytest.mark.regression
 @pytest.mark.subject_tests
@@ -173,7 +171,6 @@ def test_validation_regarding_dates(page: Page) -> None:
     LogoutPage(page).log_out()
 
 
-@pytest.mark.wip
 @pytest.mark.vpn_required
 @pytest.mark.regression
 @pytest.mark.subject_tests
@@ -229,7 +226,6 @@ def test_ammending_temporary_address(page: Page, before_each) -> None:
     LogoutPage(page).log_out()
 
 
-@pytest.mark.wip
 @pytest.mark.vpn_required
 @pytest.mark.regression
 @pytest.mark.subject_tests

utils/oracle/subject_selection_query_builder.py

@@ -3204,7 +3204,7 @@ def _add_criteria_bowel_scope_due_date_reason(self):
 
     def _add_criteria_subject_is_due_for_invite(self) -> None:
         try:
-            answer = YesNoType.from_description(self.criteria_value)
+            answer = YesNoType.by_description_case_insensitive(self.criteria_value)
 
             if answer == YesNoType.YES:
                 self.sql_from.append(" INNER JOIN next_invitation_subject nis ")