From d130d06948b8d62631d5ca360fbd12670e510417 Mon Sep 17 00:00:00 2001
From: Ryan Cross <rcross@amsl.com>
Date: Sat, 31 Oct 2015 06:34:25 +0000
Subject: [PATCH] Fixes Ticket #1794.  The session request form validation
 needs to check that durations have been entered for each requested session. 
 Commit ready for merge  - Legacy-Id: 10342

---
 ietf/secr/sreq/forms.py |  8 ++++----
 ietf/secr/sreq/tests.py | 35 +++++++++++++++++++++--------------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/ietf/secr/sreq/forms.py b/ietf/secr/sreq/forms.py
index 02c6b9859..d35546a74 100644
--- a/ietf/secr/sreq/forms.py
+++ b/ietf/secr/sreq/forms.py
@@ -121,13 +121,13 @@ class SessionForm(forms.Form):
         
         # verify session_length and num_session correspond
         # if default (empty) option is selected, cleaned_data won't include num_session key
-        if data.get('num_session','') == 2:
+        if data.get('num_session','') == '2':
             if not data['length_session2']:
-                raise forms.ValidationError('You must enter a length for session 2')
+                raise forms.ValidationError('You must enter a length for all sessions')
         
         if data.get('third_session',False):
-            if not data.get('length_session3',None):
-                raise forms.ValidationError('Length of third session not selected')
+            if not data['length_session2'] or not data.get('length_session3',None):
+                raise forms.ValidationError('You must enter a length for all sessions')
         
         return data
         
diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py
index 2d0d0cca2..98809774b 100644
--- a/ietf/secr/sreq/tests.py
+++ b/ietf/secr/sreq/tests.py
@@ -44,23 +44,30 @@ class SubmitRequestCase(TestCase):
         make_test_data()
         acronym = Group.objects.all()[0].acronym
         url = reverse('sessions_new',kwargs={'acronym':acronym})
-        post_data = {'id_num_session':'1',
-                     'id_length_session1':'3600',
-                     'id_attendees':'10',
-                     'id_conflict1':'',
-                     'id_comments':'need projector'}
+        post_data = {'num_session':'1',
+                     'length_session1':'3600',
+                     'attendees':'10',
+                     'conflict1':'',
+                     'comments':'need projector'}
+        self.client.login(username="secretary", password="secretary+password")
+        r = self.client.post(url,post_data)
+        self.assertEqual(r.status_code, 302)
+
+    def test_submit_request_invalid(self):
+        make_test_data()
+        group = Group.objects.filter(type='wg').first()
+        url = reverse('sessions_new',kwargs={'acronym':group.acronym})
+        post_data = {'num_session':'2',
+                     'length_session1':'3600',
+                     'attendees':'10',
+                     'conflict1':'',
+                     'comments':'need projector'}
         self.client.login(username="secretary", password="secretary+password")
         r = self.client.post(url,post_data)
         self.assertEqual(r.status_code, 200)
-"""
-        #assert False, self.client.session..__dict__
-        
-        url = reverse('sessions_confirm',kwargs={'acronym':acronym})
-        #s = self.client.session
-        #s['session_form'] = post_data
-        r = self.client.get(url)
-        assert False, r.content
-"""
+        q = PyQuery(r.content)
+        self.assertEqual(len(q('#session-request-form')),1)
+        self.assertTrue('You must enter a length for all sessions' in r.content)
 
 class LockAppTestCase(TestCase):
     def test_edit_request(self):