Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

fix(#1701): Events page displays year for events scheduled to start or end at a future year #2500

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.

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

Merged
merged 15 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Functional Test For Displaying Year Of Event For Future Events Now Im…
…plemented With Unit Tests
  • Loading branch information
alvindera97 committed Apr 8, 2022
commit e0fdf7cf8c11816ce0b4c24e686d5c57a447e626
4 changes: 2 additions & 2 deletions 4 events/tests/test_events_functional_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ def tearDown(self) -> None:
def test_event_starting_and_ending_future_year_displays_year(self):
event = self.event_future_start_following_year
self.browser.get(self.live_server_url + '/events/')
future_event_span_value = self.browser.find_element_by_id(str(event.id))
future_event_span_value = self.browser.find_element_by_id("start-"+str(event.id))
self.assertIn(str(event.next_time.dt_start.year), future_event_span_value.text)

event_2 = Event.objects.get(title="Event Ends Following Year")
future_event_span_value = self.browser.find_element_by_id(str(event_2.id))
future_event_span_value = self.browser.find_element_by_id("end-"+str(event_2.id))
self.assertIn(str(event_2.next_time.dt_end.year), future_event_span_value.text)
54 changes: 49 additions & 5 deletions 54 events/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ def setUpTestData(cls):
cls.event = Event.objects.create(creator=cls.user, calendar=cls.calendar)
cls.event_past = Event.objects.create(title='Past Event', creator=cls.user, calendar=cls.calendar)
cls.event_single_day = Event.objects.create(title="Single Day Event", creator=cls.user, calendar=cls.calendar)
cls.event_starts_at_future_year = Event.objects.create(title='Event Starts Following Year',
creator=cls.user, calendar=cls.calendar)
cls.event_ends_at_future_year = Event.objects.create(title='Event Ends Following Year',
creator=cls.user, calendar=cls.calendar)

cls.now = timezone.now()

Expand All @@ -40,12 +44,26 @@ def setUpTestData(cls):
dt_start=recurring_time_dtstart,
dt_end=recurring_time_dtstart
)
cls.rule_future_start_year = OccurringRule.objects.create(
event=cls.event_starts_at_future_year,
dt_start=recurring_time_dtstart + datetime.timedelta(weeks=52),
dt_end=recurring_time_dtstart + datetime.timedelta(weeks=53),
)
cls.rule_future_end_year = OccurringRule.objects.create(
event=cls.event_ends_at_future_year,
dt_start=recurring_time_dtstart,
dt_end=recurring_time_dtend + datetime.timedelta(weeks=52)
)

def tearDown(self) -> None:
from django.core.cache import cache
cache.clear()

def test_events_homepage(self):
url = reverse('events:events')
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['object_list']), 2)
self.assertEqual(len(response.context['object_list']), 4)
self.assertIn(Event.objects.last().title, response.content.decode())

def test_calendar_list(self):
Expand All @@ -61,7 +79,7 @@ def test_event_list(self):
response = self.client.get(url)

self.assertEqual(response.status_code, 200)
self.assertEqual(len(response.context['object_list']), 2)
self.assertEqual(len(response.context['object_list']), 4)

url = reverse('events:event_list_past', kwargs={"calendar_slug": 'unexisting'})
response = self.client.get(url)
Expand Down Expand Up @@ -121,7 +139,7 @@ def test_event_list_date(self):
response = self.client.get(url)
self.assertEqual(response.status_code, 200)
self.assertEqual(response.context['object'], dt.date())
self.assertEqual(len(response.context['object_list']), 3)
self.assertEqual(len(response.context['object_list']), 5)

def test_eventlocation_list(self):
venue = EventLocation.objects.create(
Expand Down Expand Up @@ -157,13 +175,39 @@ def test_event_detail(self):
self.assertEqual(self.event, response.context['object'])

def test_upcoming_tag(self):
self.assertEqual(len(get_events_upcoming()), 2)
self.assertEqual(len(get_events_upcoming()), 4)
self.assertEqual(len(get_events_upcoming(only_featured=True)), 0)
self.rule.begin = self.now - datetime.timedelta(days=3)
self.rule.finish = self.now - datetime.timedelta(days=2)
self.rule.save()
self.assertEqual(len(get_events_upcoming()), 1)
self.assertEqual(len(get_events_upcoming()), 3)

def test_event_starting_future_year_displays_relevant_year(self):
event = self.event_starts_at_future_year
url = reverse('events:events')
response = self.client.get(url)
self.assertIn(
f'<span id="start-{event.id}">',
response.content.decode()
)

def test_event_ending_future_year_displays_relevant_year(self):
event = self.event_ends_at_future_year
url = reverse('events:events')
response = self.client.get(url)
self.assertIn(
f'<span id="end-{event.id}">',
response.content.decode()
)

def test_events_scheduled_current_year_does_not_display_current_year(self):
event = self.event_single_day
url = reverse('events:events')
response = self.client.get(url)
self.assertIn( # start date
f'<span id="start-{event.id}" class="say-no-more">',
response.content.decode()
)

class EventSubmitTests(TestCase):
event_submit_url = reverse_lazy('events:event_submit')
Expand Down
12 changes: 6 additions & 6 deletions 12 templates/events/includes/time_tag.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% if next_time.single_day %}
<time id="{{ object.id }}" datetime="{{ next_time.dt_start|date:'c' }}">{{ next_time.dt_start|date:"d N" }}
<span {% if scheduled_start_this_year %}class="say-no-more"{% endif %}>
<time datetime="{{ next_time.dt_start|date:'c' }}">{{ next_time.dt_start|date:"d N" }}
<span id="start-{{ object.id }}"{% if scheduled_start_this_year %} class="say-no-more"{% endif %}>
{{ next_time.dt_start|date:"Y" }}
</span>

<span {% if scheduled_end_this_year %}class="say-no-more"{% endif %}>
<span id="start-{{ object.id }}"{% if scheduled_end_this_year %} class="say-no-more"{% endif %}>
{{ next_time.dt_start|date:"Y" }}
</span>

Expand All @@ -16,16 +16,16 @@
{% endif %}
</time>
{% else %}
<time id="{{ object.id }}" datetime="{{ next_time.dt_start|date:'c' }}">{{ next_time.dt_start|date:"d N" }}
<span {% if scheduled_start_this_year %}class="say-no-more"{% endif %}>
<time datetime="{{ next_time.dt_start|date:'c' }}">{{ next_time.dt_start|date:"d N" }}
<span id="start-{{ object.id }}"{% if scheduled_start_this_year %} class="say-no-more"{% endif %}>
{{ next_time.dt_start|date:"Y" }}
</span>

{% if next_time.valid_dt_end %} &ndash;
{{ next_time.dt_end|date:"d N" }}
{% endif %}

<span {% if scheduled_end_this_year %}class="say-no-more"{% endif %}>
<span id="end-{{ object.id }}"{% if scheduled_end_this_year %} class="say-no-more"{% endif %}>
{{ next_time.dt_end|date:"Y" }}
</span>
</time>
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.