diff --git a/ietf/meeting/forms.py b/ietf/meeting/forms.py index 99ee5ba95..3747678aa 100644 --- a/ietf/meeting/forms.py +++ b/ietf/meeting/forms.py @@ -2,6 +2,7 @@ import datetime import re from django import forms +from django.core.validators import ValidationError from django.forms.fields import Field from django.utils.encoding import force_text from django.utils import six diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index c6c899be3..e9cce425d 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -358,20 +358,14 @@ class InterimTests(TestCase): upcoming_url = urlreverse("ietf.meeting.views.upcoming") request_url = urlreverse("ietf.meeting.views.interim_request") r = self.client.get(upcoming_url) - self.assertEqual(r.status_code, 200) - q = PyQuery(r.content) - self.assertEqual(len(q("a.btn:contains('Request new interim meeting')")), 0) + self.assertNotContains(r,'Request new interim meeting') r = self.client.get(request_url) - self.assertEqual(r.status_code, 302) - redirect_url = 'http://testserver' + "/accounts/login/?next=/meeting/interim/request/" - self.assertEqual(r['location'],redirect_url) + self.assertRedirects(r, '/accounts/login/?next=/meeting/interim/request/') # test authorized self.client.login(username="secretary", password="secretary+password") r = self.client.get(upcoming_url) - self.assertEqual(r.status_code, 200) - q = PyQuery(r.content) - self.assertEqual(len(q("a.btn:contains('Request new interim meeting')")), 1) + self.assertContains(r,'Request new interim meeting') r = self.client.get(request_url) self.assertEqual(r.status_code, 200) @@ -413,9 +407,7 @@ class InterimTests(TestCase): r = self.client.post(urlreverse("ietf.meeting.views.interim_request"),data) - self.assertEqual(r.status_code,302) - redirect_url = 'http://testserver' + urlreverse("ietf.meeting.views.upcoming") - self.assertEqual(r['location'],redirect_url) + self.assertRedirects(r,urlreverse('ietf.meeting.views.upcoming')) meeting = Meeting.objects.order_by('id').last() self.assertEqual(meeting.type_id,'interim') self.assertEqual(meeting.date,date) diff --git a/ietf/templates/meeting/interim_request.html b/ietf/templates/meeting/interim_request.html index 8f8d16771..02d53f780 100644 --- a/ietf/templates/meeting/interim_request.html +++ b/ietf/templates/meeting/interim_request.html @@ -9,10 +9,21 @@ {% origin %}