Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Double <abstract> tag #610

Merged
merged 2 commits into from
Jul 23, 2021
Merged

Double <abstract> tag #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f48941
Include a talk in our test schedule
stefanor Jul 22, 2021
d851fbd
Remove second <abstract> tag from talks
stefanor Jul 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion wafer/schedule/templates/wafer.schedule/penta_schedule.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
{% endif %}
{% endfor %}
</persons>
<abstract/>
<recording>
{% if talk.video %}
<optout>false</optout>
Expand Down
10 changes: 9 additions & 1 deletion wafer/schedule/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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', '[email protected]',
'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])

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have this logic scattered across a few different schedule tests now. We really should unify that at some point - probably by using the helpers we have for the talk tests.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll take a shot at it in a follow-up.

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
Expand Down Expand Up @@ -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')
Expand Down