Merge lp:~mhall119/summit/777171-percentage-problem-tests into lp:summit

[Michael Hall]

Adds test cases to make sure % signs are being properly escaped in render.py

Adds test cases to make sure % signs are being properly escaped in render.py

Once Nigel's branch passes these tests, it'll be ready to land.

[James Westby (james-w)]

Looks good.

I won't overall-approve so that tarmac doesn't waste time on it.

Thanks,

James

review: Approve

=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2011-09-14 01:00:37 +0000
+++ summit/schedule/tests.py	2011-09-14 14:53:23 +0000
@@ -66,6 +66,7 @@
             Meeting.SchedulingError,
             meeting.check_schedule, agenda.slot, agenda.room)
 
+
 class ICalTestCase(djangotest.TestCase):
 
     def test_ical_meeting_without_name(self):
@@ -110,11 +111,11 @@
         meeting = factory.make_one(Meeting, summit=summit, name='test.name')
         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)
+        self.assertEquals(meeting.meeting_page_url, '/uds-test/meeting/%s/test.name/' % meeting.id)
         
         response = self.client.get('/uds-test.ical')
         self.assertEquals(response.status_code, 200)
-        self.assertContains(response, 'URL:http://summit.ubuntu.com/uds-test/meeting/%s/test-name/' % meeting.id, 1)
+        self.assertContains(response, 'URL:http://summit.ubuntu.com/uds-test/meeting/%s/test.name/' % meeting.id, 1)
 
 class MeetingPageTestCase(djangotest.TestCase):
 
@@ -179,6 +180,7 @@
         reverse_url = reverse('summit.schedule.views.meeting', args=rev_args)
         self.assertEquals(reverse_url, '/uds-test/meeting/%s/test.meeting/' % meeting.id)
 
+
     def test_room_name_with_period(self):
         ''' Test the following Room urlconfs
         (r'^(?P<summit_name>[\w-]+)/(?P<room_name>[\w-]+)/$', 'by_room'),
@@ -217,6 +219,55 @@
         reverse_url = reverse('summit.schedule.views.user_ical', args=rev_args)
         self.assertEquals(reverse_url, '/uds-test/participant/test.user.ical')
         
+    def test_meeting_name_with_percent(self):
+        ''' Test the following Meeting urlconf
+        (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[\.\w-]+)/$', 'meeting'),
+        '''
+        meeting = factory.make_one(Meeting, summit=self.summit, name='test.meeting')
+        
+        rev_args = ['uds-test', meeting.id, 'test%meeting']
+        reverse_url = reverse('summit.schedule.views.meeting', args=rev_args)
+        self.assertEquals(reverse_url, '/uds-test/meeting/%s/test%%meeting/' % meeting.id)
+
+    def test_room_name_with_percent(self):
+        ''' Test the following Room urlconfs
+        (r'^(?P<summit_name>[\w-]+)/(?P<room_name>[\.\w-]+)/$', 'by_room'),
+        (r'^(?P<summit_name>[\w-]+)/room/(?P<room_name>[\.\w-]+).ical$', 'room_ical'),
+        '''
+        room = factory.make_one(Room, summit=self.summit, name='test.room')
+
+        rev_args = ['uds-test', 'test%room']
+        reverse_url = reverse('summit.schedule.views.by_room', args=rev_args)
+        self.assertEquals(reverse_url, '/uds-test/test%room/')
+
+        reverse_url = reverse('summit.schedule.views.room_ical', args=rev_args)
+        self.assertEquals(reverse_url, '/uds-test/room/test%room.ical')
+
+    def test_track_name_with_percent(self):
+        ''' Test the following Track urlconfs
+        (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[\.\w-]+)/$', 'by_track'),
+        (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[\.\w-]+).ical$', 'track_ical'),
+        '''
+        track = factory.make_one(Track, summit=self.summit, slug='test.track')
+
+        rev_args = ['uds-test', 'test%track']
+        reverse_url = reverse('summit.schedule.views.by_track', args=rev_args)
+        self.assertEquals(reverse_url, '/uds-test/track/test%track/')
+
+        reverse_url = reverse('summit.schedule.views.track_ical', args=rev_args)
+        self.assertEquals(reverse_url, '/uds-test/track/test%track.ical')
+        
+    def test_participant_name_with_percent(self):
+        ''' Test the following User urlconf
+        (r'^(?P<summit_name>[\w-]+)/participant/(?P<username>[\.\w-]+)\.ical$', 'user_ical'),
+        '''
+        user = factory.make_one(User, username='test.user')
+
+        rev_args = ['uds-test', 'test%user']
+        reverse_url = reverse('summit.schedule.views.user_ical', args=rev_args)
+        self.assertEquals(reverse_url, '/uds-test/participant/test%user.ical')
+        
+
 class EtherpadEditUrl(djangotest.TestCase):
 
     def setUp(self):
@@ -398,4 +449,105 @@
         # Public meeting should be autoscheduled into one of the two open rooms
         self.assertEquals(1, self.public_meeting.agenda_set.count())
         self.assertEquals(1, Agenda.objects.filter(room__type='open').count())
-        
+
+
+class RenderScheduleTestCase(djangotest.TestCase):
+
+    def setUp(self):
+        now = datetime.datetime.utcnow()
+        one_hour = datetime.timedelta(0, 3600)
+        week = datetime.timedelta(days=5)
+        self.summit = factory.make_one(Summit, name='uds-test', timezone='UTC')
+        self.slot = factory.make_one(
+            Slot,
+            start_utc=now+one_hour,
+            end_utc=now+(2*one_hour),
+            type='open',
+            summit=self.summit)
+        
+        self.track1 = factory.make_one(Track, summit=self.summit)
+        self.room1 = factory.make_one(Room, summit=self.summit)
+        self.meeting1 = factory.make_one(Meeting, summit=self.summit, name='meeting1', private=False)
+        self.agenda1 = factory.make_one(Agenda, slot=self.slot, meeting=self.meeting1, room=self.room1)
+
+        self.user = factory.make_one(User, username='testuser', first_name='Test', last_name='User')
+        self.attendee = factory.make_one(Attendee, summit=self.summit, user=self.user, start_utc=now, end_utc=now+week)
+
+    def tearDown(self):
+        # Cached requests cause render.py to return old data, so clear the cache
+        if hasattr(cache, 'clear'):
+            cache.clear()
+        # Older django didn't have .clear, but locmem cache did have ._cull
+        elif hasattr(cache, '_cull'):
+            cache._cull()
+    
+    def test_percent_in_meeting_name(self):
+        self.meeting1.name = 'test%meeting'
+        self.meeting1.save()
+        
+        schedule_args = ['uds-test', self.agenda1.slot.start_utc.date()]
+        schedule_url = reverse('summit.schedule.views.by_date', args=schedule_args)
+        response = self.client.get(schedule_url)
+
+        self.assertContains(response, 'test%meeting', 1)
+
+    def test_percent_in_meeting_title(self):
+        self.meeting1.title = 'test % meeting'
+        self.meeting1.save()
+        
+        schedule_args = ['uds-test', self.agenda1.slot.start_utc.date()]
+        schedule_url = reverse('summit.schedule.views.by_date', args=schedule_args)
+        response = self.client.get(schedule_url)
+
+        self.assertContains(response, 'test % meeting', 1)
+
+    def test_percent_in_room_name(self):
+        self.room1.title = 'test % room'
+        self.room1.save()
+        
+        schedule_args = ['uds-test', self.agenda1.slot.start_utc.date()]
+        schedule_url = reverse('summit.schedule.views.by_date', args=schedule_args)
+        response = self.client.get(schedule_url)
+
+        # Room name is displayed at top and bottom of the schedule, and also
+        # on the meeting div for self.meeting1 which is scheduled for that room
+        self.assertContains(response, 'test % room', 3)
+
+    def test_percent_in_meeting_track_title(self):
+        self.track1.title = 'test % track'
+        self.track1.save()
+        self.meeting1.tracks.add(self.track1)
+        
+        schedule_args = ['uds-test', self.agenda1.slot.start_utc.date()]
+        schedule_url = reverse('summit.schedule.views.by_date', args=schedule_args)
+        response = self.client.get(schedule_url)
+
+        self.assertContains(response, 'test % track', 1)
+
+    def test_percent_in_room_track_title(self):
+        self.track1.title = 'test % track'
+        self.track1.save()
+        self.room1.tracks.add(self.track1)
+        
+        schedule_args = ['uds-test', self.agenda1.slot.start_utc.date()]
+        schedule_url = reverse('summit.schedule.views.by_date', args=schedule_args)
+        response = self.client.get(schedule_url)
+
+        # Displayed above the room name at the top and bottom of the schedule
+        self.assertContains(response, 'test % track', 2)
+    
+    def test_percent_in_attendee_username(self):
+        self.attendee.user.username = 'test%user'
+        self.attendee.user.first_name = 'Test %'
+        self.attendee.user.save()
+        participant = factory.make_one(Participant, meeting=self.meeting1, attendee=self.attendee, required=True)
+        
+        schedule_args = ['uds-test', self.agenda1.slot.start_utc.date()]
+        schedule_url = reverse('summit.schedule.views.by_date', args=schedule_args)
+        response = self.client.get(schedule_url)
+
+        # Displayed inside the self.meeting1 div with LP link
+        self.assertContains(response, 'test%user', 2)
+        self.assertContains(response, 'Test % User', 1)
+    
+

=== modified file 'summit/urls.py'
--- summit/urls.py	2011-09-14 00:31:06 +0000
+++ summit/urls.py	2011-09-14 14:53:23 +0000
@@ -62,14 +62,14 @@
 
     (r'^(?P<summit_name>[\w-]+)/next$', 'next_session'),
     (r'^(?P<summit_name>[\w-]+)/(?P<date>[\d-]+)/$', 'by_date'),
-    (r'^(?P<summit_name>[\w-]+)/(?P<room_name>[\.\w-]+)/$', 'by_room'),
-    (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[\.\w-]+)/$', 'by_track'),
-    (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[\.\w-]+)/$', 'meeting'),
+    (r'^(?P<summit_name>[\w-]+)/(?P<room_name>[%\.\w-]+)/$', 'by_room'),
+    (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[%\.\w-]+)/$', 'by_track'),
+    (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%\.\w-]+)/$', 'meeting'),
     (r'^(?P<summit_name>[\w-]+)\.csv$', 'csv'),
     (r'^(?P<summit_name>[\w-]+)\.ical$', 'ical'),
-    (r'^(?P<summit_name>[\w-]+)/participant/(?P<username>[\.\w-]+)\.ical$', 'user_ical'),
-    (r'^(?P<summit_name>[\w-]+)/room/(?P<room_name>[\.\w-]+).ical$', 'room_ical'),
-    (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[\.\w-]+).ical$', 'track_ical'),
+    (r'^(?P<summit_name>[\w-]+)/participant/(?P<username>[%\.\w-]+)\.ical$', 'user_ical'),
+    (r'^(?P<summit_name>[\w-]+)/room/(?P<room_name>[%\.\w-]+).ical$', 'room_ical'),
+    (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[%\.\w-]+).ical$', 'track_ical'),
 )
 
 if settings.DEBUG or settings.SERVE_STATIC: