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
Porkepix
memopol
Commits
5553bbfe
Commit
5553bbfe
authored
Oct 09, 2016
by
Nicolas Joyard
Browse files
Fix tests and add custom header tests
parent
f1d6180d
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/memopol/settings.py
View file @
5553bbfe
...
...
@@ -99,6 +99,10 @@ MIDDLEWARE_CLASSES = (
'django.contrib.sites.middleware.CurrentSiteMiddleware'
,
)
if
'debug_toolbar'
in
INSTALLED_APPS
:
MIDDLEWARE_CLASSES
+=
(
'debug_toolbar.middleware.DebugToolbarMiddleware'
,
)
#
# Sessions
#
...
...
src/memopol/tests/base.py
View file @
5553bbfe
...
...
@@ -8,6 +8,7 @@ class BaseTest(ResponseDiffTestMixin, test.TestCase):
"""
Common queries
- 1 for settings
- 5 for search forms
- 1 for chambers
- 1 for countries
...
...
@@ -18,7 +19,7 @@ class BaseTest(ResponseDiffTestMixin, test.TestCase):
- 1 for representatives
- 1 for themes
"""
left_pane_queries
=
7
left_pane_queries
=
8
def
setUp
(
self
):
RepresentativeScore
.
refresh
()
...
...
src/memopol/tests/test_navigation_pane.py
deleted
100644 → 0
View file @
f1d6180d
from
.base
import
BaseTest
class
NavigationPaneTest
(
BaseTest
):
url
=
'/'
def
test_queries
(
self
):
# First query to set session variables
self
.
client
.
get
(
self
.
url
)
with
self
.
assertNumQueries
(
self
.
left_pane_queries
):
self
.
client
.
get
(
self
.
url
)
def
test_rep_search_chambers
(
self
):
self
.
selector_test
(
'#form-rep #chamber-rep option'
)
def
test_rep_search_countries
(
self
):
self
.
selector_test
(
'#form-rep #country option'
)
def
test_rep_search_parties
(
self
):
self
.
selector_test
(
'#form-rep #party option'
)
def
test_rep_search_committee
(
self
):
self
.
selector_test
(
'#form-rep #committee option'
)
def
test_rep_search_delegation
(
self
):
self
.
selector_test
(
'#form-rep #delegation option'
)
def
test_dossier_search_chambers
(
self
):
self
.
selector_test
(
'#form-dossier #chamber-dossier option'
)
src/memopol/views/home.py
View file @
5553bbfe
...
...
@@ -29,6 +29,7 @@ class HomeView(PositionFormMixin, RepresentativeViewMixin,
qs
=
qs
.
filter
(
Q
(
representative_score__score__lt
=
0
)
|
Q
(
representative_score__score__gt
=
0
))
qs
=
self
.
prefetch_for_representative_country_and_main_mandate
(
qs
)
qs
=
qs
.
select_related
(
'representative_score'
)
random
.
seed
(
datetime
.
date
.
today
().
isoformat
())
index
=
random
.
randint
(
0
,
qs
.
count
()
-
1
)
...
...
@@ -52,6 +53,9 @@ class HomeView(PositionFormMixin, RepresentativeViewMixin,
num
=
int
(
Setting
.
objects
.
get
(
pk
=
'HOMEPAGE_LATEST_VOTES'
).
value
)
c
[
'latest_votes'
]
=
Proposal
.
objects
\
.
filter
(
recommendation__isnull
=
False
)
\
.
select_related
(
'dossier'
,
'recommendation'
)
\
.
prefetch_related
(
'themes'
,
'dossier__themes'
,
'dossier__documents__chamber'
)
\
.
order_by
(
'-datetime'
)[
0
:
num
]
return
c
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