@@ -19,10 +19,6 @@ def setUpTestData(cls):
19
19
cls .event = Event .objects .create (creator = cls .user , calendar = cls .calendar )
20
20
cls .event_past = Event .objects .create (title = 'Past Event' , creator = cls .user , calendar = cls .calendar )
21
21
cls .event_single_day = Event .objects .create (title = "Single Day Event" , creator = cls .user , calendar = cls .calendar )
22
- cls .event_future_start_following_year = Event .objects .create (title = 'Event Starts Following Year' ,
23
- creator = cls .user , calendar = cls .calendar )
24
- cls .event_future_end_following_year = Event .objects .create (title = 'Event Ends Following Year' ,
25
- creator = cls .user , calendar = cls .calendar )
26
22
27
23
cls .now = timezone .now ()
28
24
@@ -44,21 +40,12 @@ def setUpTestData(cls):
44
40
dt_start = recurring_time_dtstart ,
45
41
dt_end = recurring_time_dtstart
46
42
)
47
- cls .rule_future_start_year = OccurringRule .objects .create (
48
- event = cls .event_future_start_following_year ,
49
- dt_start = recurring_time_dtstart + datetime .timedelta (weeks = 52 ),
50
- dt_end = recurring_time_dtstart + datetime .timedelta (weeks = 53 ),
51
- )
52
- cls .rule_future_end_year = OccurringRule .objects .create (
53
- event = cls .event_future_end_following_year ,
54
- dt_start = recurring_time_dtstart ,
55
- dt_end = recurring_time_dtend + datetime .timedelta (weeks = 52 )
56
- )
43
+
57
44
def test_events_homepage (self ):
58
45
url = reverse ('events:events' )
59
46
response = self .client .get (url )
60
47
self .assertEqual (response .status_code , 200 )
61
- self .assertEqual (len (response .context ['object_list' ]), 4 )
48
+ self .assertEqual (len (response .context ['object_list' ]), 2 )
62
49
self .assertIn (Event .objects .last ().title , response .content .decode ())
63
50
64
51
def test_calendar_list (self ):
@@ -74,7 +61,7 @@ def test_event_list(self):
74
61
response = self .client .get (url )
75
62
76
63
self .assertEqual (response .status_code , 200 )
77
- self .assertEqual (len (response .context ['object_list' ]), 4 )
64
+ self .assertEqual (len (response .context ['object_list' ]), 2 )
78
65
79
66
url = reverse ('events:event_list_past' , kwargs = {"calendar_slug" : 'unexisting' })
80
67
response = self .client .get (url )
@@ -134,7 +121,7 @@ def test_event_list_date(self):
134
121
response = self .client .get (url )
135
122
self .assertEqual (response .status_code , 200 )
136
123
self .assertEqual (response .context ['object' ], dt .date ())
137
- self .assertEqual (len (response .context ['object_list' ]), 5 )
124
+ self .assertEqual (len (response .context ['object_list' ]), 3 )
138
125
139
126
def test_eventlocation_list (self ):
140
127
venue = EventLocation .objects .create (
@@ -170,12 +157,12 @@ def test_event_detail(self):
170
157
self .assertEqual (self .event , response .context ['object' ])
171
158
172
159
def test_upcoming_tag (self ):
173
- self .assertEqual (len (get_events_upcoming ()), 4 )
160
+ self .assertEqual (len (get_events_upcoming ()), 2 )
174
161
self .assertEqual (len (get_events_upcoming (only_featured = True )), 0 )
175
162
self .rule .begin = self .now - datetime .timedelta (days = 3 )
176
163
self .rule .finish = self .now - datetime .timedelta (days = 2 )
177
164
self .rule .save ()
178
- self .assertEqual (len (get_events_upcoming ()), 3 )
165
+ self .assertEqual (len (get_events_upcoming ()), 1 )
179
166
180
167
181
168
class EventSubmitTests (TestCase ):
0 commit comments