Skip to content

Commit c896138

Browse files
committed
Merged in [14854] from rjsparks@nostrum.com:
Improved test coverage over meeting.views. - Legacy-Id: 14868 Note: SVN reference [14854] has been migrated to Git commit c56cbf6
2 parents 75deb35 + c56cbf6 commit c896138

2 files changed

Lines changed: 35 additions & 2 deletions

File tree

ietf/meeting/tests_views.py

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
from ietf.meeting.helpers import send_interim_approval_request
2525
from ietf.meeting.helpers import send_interim_cancellation_notice
2626
from ietf.meeting.helpers import send_interim_minutes_reminder, populate_important_dates
27-
from ietf.meeting.models import Session, TimeSlot, Meeting, SchedTimeSessAssignment
27+
from ietf.meeting.models import Session, TimeSlot, Meeting, SchedTimeSessAssignment, Schedule
2828
from ietf.meeting.test_data import make_meeting_test_data, make_interim_meeting
2929
from ietf.meeting.utils import finalize
30-
from ietf.name.models import SessionStatusName
30+
from ietf.name.models import SessionStatusName
3131
from ietf.utils.test_utils import TestCase, login_testing_unauthorized, unicontent
3232
from ietf.utils.mail import outbox
3333
from ietf.utils.text import xslugify
@@ -493,6 +493,37 @@ def test_session_draft_pdf(self):
493493
self.assertEqual(response.get('Content-Type'), 'application/pdf')
494494
os.unlink(filename)
495495

496+
def test_current_materials(self):
497+
url = urlreverse('ietf.meeting.views.current_materials')
498+
response = self.client.get(url)
499+
self.assertEqual(response.status_code, 404)
500+
MeetingFactory(type_id='ietf')
501+
response = self.client.get(url)
502+
self.assertEqual(response.status_code, 302)
503+
504+
def test_edit_agenda_properties(self):
505+
self.client.login(username='secretary',password='secretary+password')
506+
url = urlreverse('ietf.meeting.views.edit_agenda_properties',kwargs={'owner':'does@notexist.example','name':'doesnotexist','num':00})
507+
response = self.client.get(url)
508+
self.assertEqual(response.status_code,404)
509+
self.client.logout()
510+
schedule = ScheduleFactory(meeting__type_id='ietf',visible=False,public=False)
511+
url = urlreverse('ietf.meeting.views.edit_agenda_properties',kwargs={'owner':schedule.owner.email(),'name':schedule.name,'num':schedule.meeting.number})
512+
response = self.client.get(url)
513+
self.assertEqual(response.status_code,302)
514+
self.client.login(username='secretary',password='secretary+password')
515+
response = self.client.get(url)
516+
self.assertEqual(response.status_code,200)
517+
response = self.client.post(url, {
518+
'name':schedule.name,
519+
'visible':True,
520+
'public':True,
521+
}
522+
)
523+
self.assertEqual(response.status_code,302)
524+
schedule = Schedule.objects.get(pk=schedule.pk)
525+
self.assertTrue(schedule.visible)
526+
self.assertTrue(schedule.public)
496527

497528
class EditTests(TestCase):
498529
def setUp(self):

ietf/meeting/views.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,8 @@ def edit_agenda(request, num=None, owner=None, name=None):
382382
#
383383
AgendaPropertiesForm = modelform_factory(Schedule, fields=('name','visible', 'public'))
384384

385+
# The meeing urls.py won't allow empy num, owmer, or name values
386+
385387
@role_required('Area Director','Secretariat')
386388
def edit_agenda_properties(request, num=None, owner=None, name=None):
387389
meeting = get_meeting(num)

0 commit comments

Comments
 (0)