Merge pull request #1759 from wittejm/remove-proposed-order-from-umat…

…illa-county-2

Remove proposed order form from umatilla county

src/backend/expungeservice/form_filling.py

@@ -570,8 +570,8 @@ def validate_initial_state(self):
 class FormFilling:
     OREGON_PDF_NAME = "oregon"
     NON_OREGON_PDF_COUNTIES = ["multnomah"]
-    COUNTIES_NEEDING_CONVICTION_OR_ARREST_ORDER = ["umatilla", "multnomah"]
-    COUNTIES_NEEDING_COUNTY_SPECIFIC_DOWNLOAD_NAME = ["umatilla"]
+    COUNTIES_NEEDING_CONVICTION_OR_ARREST_ORDER = ["multnomah"]
+    COUNTIES_NEEDING_COUNTY_SPECIFIC_DOWNLOAD_NAME : List[str] = []
     OSP_PDF_NAME = "OSP_Form"
     #COMPILED_PDF_NAME = "COMPILED_MOTIONS"
 

src/backend/tests/test_form_filling.py

@@ -214,8 +214,11 @@ def assert_correct_download_file_path(self, county: str, expected_file_name: str
         assert file_path == "dir/case_name_case_number_" + expected_file_name
 
     def test_correct_pdf_path_is_built(self):
+        '''
+        No longer an active test because umatilla no longer has special behavior, but if we  add the Proposed Order back onto a county we will use this code
         self.assert_correct_pdf_file_name("Umatilla", "oregon_arrest.pdf", has_convictions=False)
         self.assert_correct_pdf_file_name("Umatilla", "oregon_conviction.pdf", has_convictions=True)
+        '''
 
         self.assert_correct_pdf_file_name("Multnomah", "multnomah_arrest.pdf", has_convictions=False)
         self.assert_correct_pdf_file_name("Multnomah", "multnomah_conviction.pdf", has_convictions=True)
@@ -224,9 +227,10 @@ def test_correct_pdf_path_is_built(self):
         self.assert_correct_pdf_file_name("unknown", "oregon.pdf", has_convictions=True)
 
     def test_correct_download_file_path_is_built(self):
+        '''
         self.assert_correct_download_file_path("Umatilla", "umatilla_with_arrest_order.pdf", has_convictions=False)
         self.assert_correct_download_file_path("Umatilla", "umatilla_with_conviction_order.pdf", has_convictions=True)
-
+        '''
         self.assert_correct_download_file_path("Other", "other.pdf", has_convictions=False)
         self.assert_correct_download_file_path("Other", "other.pdf", has_convictions=True)
 
@@ -587,7 +591,8 @@ def test_has_misdemeanor_class_a_severity_level(self, conviction_charge: Mock, p
             pdf_factory([conviction_charge]), {**self.expected_conviction_values, **new_expected_values}
         )
 
-
+'''
+No longer an active test because umatilla no longer has special behavior, but if we add the Proposed Order back onto a county we will use this code
 class TestBuildUmatillaPDF(TestBuildOregonPDF):
     county = "Umatilla"
     expected_county_data = {
@@ -639,7 +644,7 @@ def test_has_contempt_of_court_and_case_number_with_comments(self, conviction_ch
             **new_expected_values,
         }
         self.assert_pdf_values(pdf_factory([conviction_charge]), all_expected_values)
-
+'''
 
 class TestBuildMultnomahPDF(PDFTestFixtures):
     county = "Multnomah"