From 6f48941bdec1bfbbdfb13964d6065e839cff8b5f Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Thu, 22 Jul 2021 19:37:08 -0400 Subject: [PATCH 1/2] Include a talk in our test schedule --- wafer/schedule/tests/test_views.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/wafer/schedule/tests/test_views.py b/wafer/schedule/tests/test_views.py index ca65acb5..47b411b7 100644 --- a/wafer/schedule/tests/test_views.py +++ b/wafer/schedule/tests/test_views.py @@ -1467,6 +1467,7 @@ def setUp(self): venue2 = Venue.objects.create(order=2, name='Venue 2') venue1.blocks.add(day1) venue2.blocks.add(day1) + venue1.blocks.add(day2) start1 = D.datetime(2013, 9, 22, 10, 0, 0, tzinfo=timezone.utc) start2 = D.datetime(2013, 9, 22, 11, 0, 0, tzinfo=timezone.utc) @@ -1491,6 +1492,13 @@ def setUp(self): for index, item in enumerate(items): item.slots.add(slots[index // 2]) + user = get_user_model().objects.create_user('john', 'best@wafer.test', + 'johnpassword') + talk = Talk.objects.create(title="Test talk", status=ACCEPTED, + corresponding_author_id=user.id) + talk_item = ScheduleItem.objects.create(venue=venue1, talk_id=talk.pk) + talk_item.slots.add(slots[4]) + def test_pentabarf_view(self): # We don't exhaustively test that the pentabarf view is valid pentabarf, # instead we test that the XML is valid, and that we @@ -1543,7 +1551,7 @@ def test_ics_view(self): # No major errors self.assertFalse(calendar.is_broken) # Check number of events - self.assertEqual(len(calendar.walk(name='VEVENT')), 8) + self.assertEqual(len(calendar.walk(name='VEVENT')), 9) # Check we have the right time in places event = calendar.walk(name='VEVENT')[0] self.assertEqual(event['dtstart'].params['value'], 'DATE-TIME') From d851fbd5eecafe0d9b404a4263f9205e9db17cc1 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Thu, 22 Jul 2021 19:11:58 -0400 Subject: [PATCH 2/2] Remove second tag from talks Not sure how we missed that, before. --- wafer/schedule/templates/wafer.schedule/penta_schedule.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/wafer/schedule/templates/wafer.schedule/penta_schedule.xml b/wafer/schedule/templates/wafer.schedule/penta_schedule.xml index 523f3b2f..f83f3ec8 100644 --- a/wafer/schedule/templates/wafer.schedule/penta_schedule.xml +++ b/wafer/schedule/templates/wafer.schedule/penta_schedule.xml @@ -70,7 +70,6 @@ {% endif %} {% endfor %} - {% if talk.video %} false