fix: change api_submission blackout message to match web ui (ietf-tools#5623)

* test: api_submission returns an error in the blackout period

* fix: change api_submission blackout message to match web ui (ietf-tools#5350)

Author: pselkirk

ietf/submit/forms.py

@@ -194,7 +194,7 @@ def cleanup():  # called when context exited, even in case of exception
 
     def clean(self):
         if self.shutdown and not has_role(self.request.user, "Secretariat"):
-            raise forms.ValidationError('The submission tool is currently shut down')
+            raise forms.ValidationError(self.cutoff_warning)
 
         # check general submission rate thresholds before doing any more work
         today = date_today()
@@ -383,7 +383,7 @@ def format_messages(where, e, log):
             return msgs
 
         if self.shutdown and not has_role(self.request.user, "Secretariat"):
-            raise forms.ValidationError('The submission tool is currently shut down')
+            raise forms.ValidationError(self.cutoff_warning)
 
         for ext in self.formats:
             f = self.cleaned_data.get(ext, None)

ietf/submit/tests.py

@@ -2744,6 +2744,10 @@ def supply_extra_metadata(self, name, status_url, submitter_name, submitter_emai
 class ApiSubmissionTests(BaseSubmitTestCase):
     TASK_TO_MOCK = "ietf.submit.views.process_and_accept_uploaded_submission_task"
 
+    def setUp(self):
+        super().setUp()
+        MeetingFactory(type_id='ietf', date=date_today()+datetime.timedelta(days=60))
+
     def test_upload_draft(self):
         """api_submission accepts a submission and queues it for processing"""
         url = urlreverse('ietf.submit.views.api_submission')
@@ -2890,6 +2894,24 @@ def test_submission_status(self):
         r = self.client.get(urlreverse('ietf.submit.views.api_submission_status', kwargs={'submission_id': '999999'}))
         self.assertEqual(r.status_code, 404)
 
+    def test_upload_blackout(self):
+        """api_submission returns a useful error in the blackout period"""
+        # Put today in the blackout period
+        meeting = Meeting.get_current_meeting()
+        meeting.importantdate_set.create(name_id='idcutoff',date=date_today()-datetime.timedelta(days=2))
+
+        url = urlreverse('ietf.submit.views.api_submission')
+        xml, author = submission_file('draft-somebody-test-00', 'draft-somebody-test-00.xml', None, 'test_submission.xml')
+        data = {
+            'xml': xml,
+            'user': author.user.username,
+        }
+
+        with mock.patch('ietf.submit.views.process_uploaded_submission_task'):
+            r = self.client.post(url, data)
+        self.assertContains(r, 'The last submission time for the I-D submission was', status_code=400)
+
+ 
 
 class SubmissionUploadFormTests(BaseSubmitTestCase):
     def test_check_submission_thresholds(self):