diff --git a/partitions/templates/partitions/liste.html b/partitions/templates/partitions/liste.html
index 8f0d31b..48b8d63 100644
--- a/partitions/templates/partitions/liste.html
+++ b/partitions/templates/partitions/liste.html
@@ -9,7 +9,7 @@
{% endif %}
{% if user.is_authenticated %}
-
+
{% endif %}
{% for category in categories %}
@@ -20,11 +20,11 @@
{% if not user.is_authenticated %}
{{ partition.nom }} - {{ partition.auteur }}
{% else %}
- {{ partition.nom }} - {{ partition.auteur }}
{% endif %}
{% if user.profile.is_chef %}
- Supprimer
{% endif %}
diff --git a/partitions/tests/test_views.py b/partitions/tests/test_views.py
index 4c5bfa6..221d809 100644
--- a/partitions/tests/test_views.py
+++ b/partitions/tests/test_views.py
@@ -4,14 +4,19 @@ from django.template.defaultfilters import urlencode
from django.test import Client, TestCase
from gestion.models import ErnestoUser
-from ..models import Partition, PartitionSet
+from ..models import Category, Partition, PartitionSet
User = get_user_model()
def new_user(username, ernesto=False, chef=False):
u = User.objects.create_user(username=username)
- ErnestoUser.objects.create(user=u, slug=username, is_chef=chef, is_ernesto=ernesto)
+ ErnestoUser.objects.create(
+ user=u,
+ slug=username,
+ is_chef=chef,
+ is_ernesto=ernesto
+ )
return u
@@ -33,7 +38,11 @@ class TestViews(TestCase):
(None, Client())
]
# A Partition set with 1 partition
- self.pset = PartitionSet.objects.create(nom="My PSet", auteur="PSet author")
+ self.pset = PartitionSet.objects.create(
+ category=Category.objects.first(),
+ nom="My PSet",
+ auteur="PSet author"
+ )
file = File(open("media/test_file.txt"), "test file")
Partition.objects.create(nom="part1", part=file, morceau=self.pset)
@@ -43,7 +52,10 @@ class TestViews(TestCase):
partition.delete()
def _get_restricted_page(self, url):
- """Shorthand for testing wether a page in only accessible by ernesto members"""
+ """
+ Shorthand for testing wether a page in only accessible by ernesto
+ members
+ """
for user, client in self.client_matrix:
# If user is not None, it is an ernesto member
resp = client.get(url)
@@ -51,7 +63,8 @@ class TestViews(TestCase):
self.assertEqual(200, resp.status_code)
else:
encoded_url = urlencode(urlencode(url))
- self.assertRedirects(resp, "/login?next={}".format(encoded_url))
+ redirection_url = "/login?next={}".format(encoded_url)
+ self.assertRedirects(resp, redirection_url)
def test_get_partition_sets(self):
"""The list of all partition sets can be fetched by everyone"""
@@ -60,20 +73,26 @@ class TestViews(TestCase):
self.assertEqual(200, resp.status_code)
def test_get_partitions(self):
- """Only ernesto members can see the partitions inside of a partition set"""
+ """
+ Only ernesto members can see the partitions inside of a partition set
+ """
url = "/partitions/{}/{}".format(self.pset.nom, self.pset.auteur)
self._get_restricted_page(url)
def test_see(self):
"""Only ernesto members can see partitions"""
part = self.pset.partition_set.first()
- url = "/partitions/{}/{}/see/{}".format(self.pset.nom, self.pset.auteur, part.id)
+ url = "/partitions/{}/{}/see/{}".format(
+ self.pset.nom, self.pset.auteur, part.id
+ )
self._get_restricted_page(url)
def test_download(self):
"""Only ernesto members can download partitions"""
part = self.pset.partition_set.first()
- url = "/partitions/{}/{}/{}".format(self.pset.nom, self.pset.auteur, part.id)
+ url = "/partitions/{}/{}/{}".format(
+ self.pset.nom, self.pset.auteur, part.id
+ )
self._get_restricted_page(url)
def test_new(self):
diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index 2860a6f..0000000
--- a/tox.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[flake8]
-max-line-length = 119
-exclude =
- .git,
- __pycache__,
- venv