Skip to content

Commit 6b2659e

Browse files
committed
Merged in [14362] from rcross@amsl.com:
Improve test coverage for ietf.secr.sreq. - Legacy-Id: 14364 Note: SVN reference [14362] has been migrated to Git commit bf3a494
2 parents 275af78 + bf3a494 commit 6b2659e

1 file changed

Lines changed: 48 additions & 4 deletions

File tree

ietf/secr/sreq/tests.py

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from ietf.meeting.helpers import get_meeting
88
from ietf.meeting.models import Meeting, Session, ResourceAssociation
99
from ietf.meeting.test_data import make_meeting_test_data
10+
from ietf.meeting.factories import SessionFactory
1011
from ietf.utils.mail import outbox, empty_outbox
1112
from ietf.utils.test_data import make_test_data
1213

@@ -42,6 +43,53 @@ def test_main(self):
4243
self.assertEqual(len(unsched),3)
4344
self.assertEqual(len(sched),2)
4445

46+
def test_approve(self):
47+
meeting = make_meeting_test_data()
48+
mars = Group.objects.get(acronym='mars')
49+
# create session waiting for approval
50+
session = SessionFactory(meeting=meeting, group=mars, status_id='apprw')
51+
url = reverse('ietf.secr.sreq.views.approve', kwargs={'acronym':'mars'})
52+
self.client.login(username="ad", password="ad+password")
53+
r = self.client.get(url)
54+
self.assertRedirects(r,reverse('ietf.secr.sreq.views.view', kwargs={'acronym':'mars'}))
55+
session = Session.objects.get(pk=session.pk)
56+
self.assertEqual(session.status_id,'appr')
57+
58+
def test_cancel(self):
59+
meeting = make_meeting_test_data()
60+
mars = Group.objects.get(acronym='mars')
61+
url = reverse('ietf.secr.sreq.views.cancel', kwargs={'acronym':'mars'})
62+
self.client.login(username="ad", password="ad+password")
63+
r = self.client.get(url)
64+
self.assertRedirects(r,reverse('ietf.secr.sreq.views.main'))
65+
sessions = Session.objects.filter(meeting=meeting, group=mars)
66+
self.assertEqual(sessions[0].status_id,'deleted')
67+
68+
def test_edit(self):
69+
make_meeting_test_data()
70+
url = reverse('ietf.secr.sreq.views.edit', kwargs={'acronym':'mars'})
71+
self.client.login(username="marschairman", password="marschairman+password")
72+
r = self.client.get(url)
73+
self.assertEqual(r.status_code, 200)
74+
post_data = {'num_session':'2',
75+
'length_session1':'3600',
76+
'length_session2':'3600',
77+
'attendees':'10',
78+
'conflict1':'',
79+
'comments':'need lights',
80+
'submit': 'Continue'}
81+
r = self.client.post(url, post_data, HTTP_HOST='example.com')
82+
self.assertRedirects(r,reverse('ietf.secr.sreq.views.view', kwargs={'acronym':'mars'}))
83+
84+
def test_tool_status(self):
85+
make_meeting_test_data()
86+
url = reverse('ietf.secr.sreq.views.tool_status')
87+
self.client.login(username="secretary", password="secretary+password")
88+
r = self.client.get(url)
89+
self.assertEqual(r.status_code, 200)
90+
r = self.client.post(url, {'message':'locked', 'submit':'Lock'})
91+
self.assertRedirects(r,reverse('ietf.secr.sreq.views.main'))
92+
4593
class SubmitRequestCase(TestCase):
4694
def test_submit_request(self):
4795
make_test_data()
@@ -167,12 +215,8 @@ def test_new_request(self):
167215
self.assertEqual(r.status_code, 200)
168216
q = PyQuery(r.content)
169217
self.assertEqual(len(q('#session-request-form')),1)
170-
171-
class EditRequestCase(TestCase):
172-
pass
173218

174219
class NotMeetingCase(TestCase):
175-
176220
def test_not_meeting(self):
177221
make_meeting_test_data()
178222
group = Group.objects.get(acronym='mars')

0 commit comments

Comments
 (0)