altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

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

Browse source 
* test: api_submission returns an error in the blackout period

* fix: change api_submission blackout message to match web ui (#5350)
This commit is contained in:
Paul Selkirk 2023-05-16 10:43:20 -04:00 committed by GitHub
parent 0ff693d077
commit 37118a623a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ietf/submit/forms.py
View file

@ -194,7 +194,7 @@ class SubmissionBaseUploadForm(forms.Form):
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 @@ class DeprecatedSubmissionBaseUploadForm(SubmissionBaseUploadForm):
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)

22
ietf/submit/tests.py
View file

@ -2744,6 +2744,10 @@ Subject: test
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 @@ class ApiSubmissionTests(BaseSubmitTestCase):
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):