Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
e653498d
Commit
e653498d
authored
Jan 26, 2017
by
tvbussel
Browse files
Tests for statistics now also use the lecture year
parent
73a4845b
Changes
1
Hide whitespace changes
Inline
Side-by-side
website/members/tests.py
View file @
e653498d
...
...
@@ -6,6 +6,7 @@ from django.utils import timezone
from
members.models
import
(
Member
,
Membership
,
gen_stats_member_type
,
gen_stats_year
)
from
utils.snippets
import
datetime_to_lectureyear
class
MemberBirthdayTest
(
TestCase
):
...
...
@@ -96,7 +97,7 @@ class StatisticsTest(TestCase):
Testing if active and non-active objects are counted correctly
"""
member_types
=
[
"member"
,
"supporter"
,
"honorary"
]
current_year
=
date
.
today
()
.
year
current_year
=
datetime_to_lectureyear
(
date
.
today
()
)
# Set start date to current year - 1:
for
m
in
Member
.
objects
.
all
():
...
...
@@ -160,7 +161,7 @@ class StatisticsTest(TestCase):
def
test_gen_stats_different_years
(
self
):
member_types
=
[
"member"
,
"supporter"
,
"honorary"
]
current_year
=
date
.
today
()
.
year
current_year
=
datetime_to_lectureyear
(
date
.
today
()
)
# postgres does not define random access directly on unsorted querysets
members
=
[
member
for
member
in
Member
.
objects
.
all
()]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment