Merge lp:~mhall119/summit/fix-personal-ical into lp:summit

[Michael Hall]

Change user_private_ical to use Schedule.from_request, add test case for private ical.

Overview
========
The personal ical view wasn't updated to use Schedule.from_request

Details
=======
Because of the refactoring to use Schedule.from_request, the Schedule constructor no longer has a show_private parameter. However, because the user_private_ical view wasn't updated to use Schedule.from_request, it was still trying to pass that parameter to the constructor, causing an exception to be thrown.

[James Westby (james-w)]

review: Approve

=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2011-09-19 16:26:12 +0000
+++ summit/schedule/tests.py	2011-09-21 12:12:23 +0000
@@ -229,6 +229,33 @@
         response = self.client.get('/uds-test.ical')
         self.assertEquals(response.status_code, 200)
         self.assertContains(response, 'URL:%s/uds-test/meeting/%s/test.name/' % (site_root, meeting.id), 1)
+        
+    def test_private_ical(self):
+        """ Tests that private icals contain private meetings """
+        now = datetime.datetime.utcnow()
+        one_hour = datetime.timedelta(0, 3600)
+        week = datetime.timedelta(days=7)
+        summit = factory.make_one(Summit, name='uds-test')
+        slot = factory.make_one(
+            Slot,
+            start_utc=now,
+            end_utc=now+one_hour,
+            type='open',
+            summit=summit)
+        
+        room = factory.make_one(Room, summit=summit)
+        meeting = factory.make_one(Meeting, summit=summit, name='test.name', private=True)
+        agenda = factory.make_one(Agenda, slot=slot, meeting=meeting, room=room)
+        
+        self.assertEquals(meeting.meeting_page_url, '/uds-test/meeting/%s/test.name/' % meeting.id)
+
+        user = factory.make_one(User, username='testuser', first_name='Test', last_name='User')
+        attendee = factory.make_one(Attendee, summit=summit, user=user, start_utc=now, end_utc=now+week)
+        participant = factory.make_one(Participant, attendee=attendee, meeting=meeting)
+
+        response = self.client.get('/uds-test/participant/my_schedule_%s.ical' % attendee.secret_key)
+        self.assertEquals(response.status_code, 200)
+        self.assertContains(response, 'URL:%s/uds-test/meeting/%s/test.name/' % (site_root, meeting.id), 1)
 
 class MeetingPageTestCase(djangotest.TestCase):
 

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2011-09-17 18:47:47 +0000
+++ summit/schedule/views.py	2011-09-21 12:12:23 +0000
@@ -251,7 +251,7 @@
 def user_private_ical(request, summit, secret_key):
     """Returns a user's registered events as an ical"""
     attendee = get_object_or_404(Attendee, secret_key_id=secret_key)
-    schedule = Schedule(request, summit, show_private=True)
+    schedule = Schedule.from_request(request, summit, show_private=True)
     schedule.calculate()
     
     response = HttpResponse(mimetype='text/calendar')