alex/django-todo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Исправлены недочеты в оформлении

Browse Source
This commit is contained in:
Derinhelm
2021-04-28 00:47:56 +03:00
parent fdd40d4592
commit 9152cc9772
5 changed files with 88 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -56,5 +56,5 @@ docker-compose exec web python manage.py makemigrations backend
Для запуска тестов использовать Для запуска тестов использовать
```bash ```bash
docker-compose run web pytest --cov=backend docker-compose run -e DJANGO_SETTINGS_MODULE=backend.settings web pytest --cov=backend
``` ```

16
backend/backend/urls.py
View File

@@ -13,13 +13,13 @@ from drf_yasg import openapi
from .api import router from .api import router
schema_view = get_schema_view( schema_view = get_schema_view(
openapi.Info( openapi.Info(
title="ToDo List", title="ToDo List",
default_version='v1', default_version="v1",
description="Swagger Interface for ToDo List", description="Swagger Interface for ToDo List",
), ),
public=True, public=True,
permission_classes=(permissions.AllowAny,), permission_classes=(permissions.AllowAny,),
) )
urlpatterns = [ urlpatterns = [
@@ -28,5 +28,5 @@ urlpatterns = [
path("api/token/refresh/", TokenRefreshView.as_view(), name="token_refresh"), path("api/token/refresh/", TokenRefreshView.as_view(), name="token_refresh"),
path("api/", include(router.urls)), path("api/", include(router.urls)),
path("api-auth/", include("rest_framework.urls", namespace="rest_framework")), path("api-auth/", include("rest_framework.urls", namespace="rest_framework")),
path('swagger/', schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'), path("swagger/", schema_view.with_ui("swagger", cache_timeout=0), name="schema-swagger-ui"),
] ]

3
backend/tests/__init__.py
View File

@@ -0,0 +1,3 @@
from django.core.wsgi import get_wsgi_application
application = get_wsgi_application()

107
backend/tests/test_item.py
View File

@@ -1,83 +1,75 @@
import os
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "backend.settings")
from django.core.wsgi import get_wsgi_application
application = get_wsgi_application()
from django.urls import reverse from django.urls import reverse
from rest_framework import status from rest_framework import status
from rest_framework.test import APITestCase from rest_framework.test import APITestCase
from rest_framework.test import APIClient
from django.contrib.auth.models import User from django.contrib.auth.models import User
from backend.api import router
from .test_todo import create_todo from .test_todo import create_todo
class ItemTest(APITestCase): class ItemTest(APITestCase):
'''Tests API for items.''' """Tests API for items."""
def prepare(self): def prepare(self):
user = User.objects.create_user('test_user4', 'test@test.com', 'test_password') user = User.objects.create_user("test_user4", "test@test.com", "test_password")
self.client.force_authenticate(user=user) self.client.force_authenticate(user=user)
to_do_id_1 = create_todo(self.client, "ToDoList1").data['id'] to_do_id_1 = create_todo(self.client, "ToDoList1").data["id"]
to_do_id_2 = create_todo(self.client, "ToDoList2").data['id'] to_do_id_2 = create_todo(self.client, "ToDoList2").data["id"]
return to_do_id_1, to_do_id_2 return to_do_id_1, to_do_id_2
def get(self, expected_titles, todo_id=None, finished=None): def get(self, expected_titles, todo_id=None, finished=None):
url = reverse('ToDoItems-list') url = reverse("ToDoItems-list")
data = {} data = {}
if finished is not None: if finished is not None:
data["finished"] = finished data["finished"] = finished
if todo_id is not None: if todo_id is not None:
data["parent"] = todo_id data["parent"] = todo_id
response = self.client.get(url, data, format='json') response = self.client.get(url, data, format="json")
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
real_titles = [(d['text'], d['parent']) for d in response.data['results']] real_titles = [(d["text"], d["parent"]) for d in response.data["results"]]
self.assertEqual(real_titles, expected_titles) self.assertEqual(real_titles, expected_titles)
if finished is not None: if finished is not None:
item_status = [data['finished'] for data in response.data['results']] item_status = [data["finished"] for data in response.data["results"]]
self.assertEqual(finished, all(item_status)) self.assertEqual(finished, all(item_status))
def post(self, item_text, todo_id, finished=None): def post(self, item_text, todo_id, finished=None):
url = reverse('ToDoItems-list') url = reverse("ToDoItems-list")
if finished is not None: if finished is not None:
data = {"text": item_text, "parent": todo_id, "finished": finished} data = {"text": item_text, "parent": todo_id, "finished": finished}
else: else:
data = {"text": item_text, "parent": todo_id} data = {"text": item_text, "parent": todo_id}
response = self.client.post(url, data, format='json') response = self.client.post(url, data, format="json")
self.assertEqual(response.status_code, status.HTTP_201_CREATED) self.assertEqual(response.status_code, status.HTTP_201_CREATED)
check_finished = False if (finished is None) else finished check_finished = False if (finished is None) else finished
self.assertEqual(response.data['text'], item_text) self.assertEqual(response.data["text"], item_text)
self.assertEqual(response.data['parent'], todo_id) self.assertEqual(response.data["parent"], todo_id)
self.assertEqual(response.data['finished'], check_finished) self.assertEqual(response.data["finished"], check_finished)
return response.data['id'], response.data['finished'] return response.data["id"], response.data["finished"]
def get_by_id(self, id, text, finished, parent): def get_by_id(self, id, text, finished, parent):
url_with_id = reverse('ToDoItems-detail', args=(id,)) url_with_id = reverse("ToDoItems-detail", args=(id,))
response = self.client.get(url_with_id, {id: id}, format='json') response = self.client.get(url_with_id, {id: id}, format="json")
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['text'], text) self.assertEqual(response.data["text"], text)
self.assertEqual(response.data['finished'], finished) self.assertEqual(response.data["finished"], finished)
self.assertEqual(response.data['parent'], parent) self.assertEqual(response.data["parent"], parent)
def put(self, id, text, parent, finished=None): def put(self, id, text, parent, finished=None):
url_with_id = reverse('ToDoItems-detail', args=(id,)) url_with_id = reverse("ToDoItems-detail", args=(id,))
data = {"text": text, "parent": parent} data = {"text": text, "parent": parent}
if finished is not None: if finished is not None:
data["finished"] = finished data["finished"] = finished
response = self.client.put(url_with_id, data, format='json') response = self.client.put(url_with_id, data, format="json")
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['text'], text) self.assertEqual(response.data["text"], text)
self.assertEqual(response.data['parent'], parent) self.assertEqual(response.data["parent"], parent)
if finished is not None: if finished is not None:
self.assertEqual(response.data['finished'], finished) self.assertEqual(response.data["finished"], finished)
def patch(self, id, text=None, finished=None, parent=None): def patch(self, id, text=None, finished=None, parent=None):
url_with_id = reverse('ToDoItems-detail', args=(id,)) url_with_id = reverse("ToDoItems-detail", args=(id,))
data = {} data = {}
if text is not None: if text is not None:
data["text"] = text data["text"] = text
@@ -85,21 +77,21 @@ class ItemTest(APITestCase):
data["finished"] = finished data["finished"] = finished
if parent is not None: if parent is not None:
data["parent"] = parent data["parent"] = parent
response = self.client.patch(url_with_id, data, format='json') response = self.client.patch(url_with_id, data, format="json")
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
if text is not None: if text is not None:
self.assertEqual(response.data['text'], text) self.assertEqual(response.data["text"], text)
if finished is not None: if finished is not None:
self.assertEqual(response.data['finished'], finished) self.assertEqual(response.data["finished"], finished)
if parent is not None: if parent is not None:
self.assertEqual(response.data['parent'], parent) self.assertEqual(response.data["parent"], parent)
def delete(self, id, title, finished, to_do_id): def delete(self, id, title, finished, to_do_id):
self.get_by_id(id, title, finished, to_do_id) self.get_by_id(id, title, finished, to_do_id)
url_with_id = reverse('ToDoItems-detail', args=(id,)) url_with_id = reverse("ToDoItems-detail", args=(id,))
response = self.client.delete(url_with_id, {}, format='json') response = self.client.delete(url_with_id, {}, format="json")
self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
def test_create_delete(self): def test_create_delete(self):
""" """
/todo_items/: get, post (create) /todo_items/: get, post (create)
@@ -113,13 +105,24 @@ class ItemTest(APITestCase):
item_id_2, item_finished_2 = self.post(item_text_2, to_do_id_1, finished=False) item_id_2, item_finished_2 = self.post(item_text_2, to_do_id_1, finished=False)
self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1)], to_do_id_1) self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1)], to_do_id_1)
item_id_3, item_finished_3 = self.post(item_text_3, to_do_id_1, finished=True) item_id_3, item_finished_3 = self.post(item_text_3, to_do_id_1, finished=True)
self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1), \ self.get(
(item_text_3, to_do_id_1)], to_do_id_1) [(item_text_1, to_do_id_1), (item_text_2, to_do_id_1), (item_text_3, to_do_id_1)],
item_id_4, item_finished_4 = self.post(item_text_4, to_do_id_2, finished=False) to_do_id_1,
self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1), \ )
(item_text_3, to_do_id_1), (item_text_4, to_do_id_2)]) item_id_4, item_finished_4 = self.post(item_text_4, to_do_id_2, finished=False)
self.get(
[
(item_text_1, to_do_id_1),
(item_text_2, to_do_id_1),
(item_text_3, to_do_id_1),
(item_text_4, to_do_id_2),
]
)
self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1), (item_text_3, to_do_id_1)], to_do_id_1) self.get(
[(item_text_1, to_do_id_1), (item_text_2, to_do_id_1), (item_text_3, to_do_id_1)],
to_do_id_1,
)
self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1)], to_do_id_1, finished=False) self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1)], to_do_id_1, finished=False)
self.get([(item_text_3, to_do_id_1)], to_do_id_1, finished=True) self.get([(item_text_3, to_do_id_1)], to_do_id_1, finished=True)
@@ -149,9 +152,3 @@ class ItemTest(APITestCase):
self.patch(item_id_1, parent=to_do_id_1) self.patch(item_id_1, parent=to_do_id_1)
self.patch(item_id_1, finished=True) self.patch(item_id_1, finished=True)
self.patch(item_id_1, text=item_text_1_3) self.patch(item_id_1, text=item_text_1_3)

58
backend/tests/test_todo.py
View File

@@ -1,65 +1,57 @@
import os
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "backend.settings")
from django.core.wsgi import get_wsgi_application
application = get_wsgi_application()
from django.urls import reverse from django.urls import reverse
from rest_framework import status from rest_framework import status
from rest_framework.test import APITestCase from rest_framework.test import APITestCase
from rest_framework.test import APIClient
from django.contrib.auth.models import User from django.contrib.auth.models import User
from backend.api import router
from collections import OrderedDict
def create_todo(client, title): def create_todo(client, title):
url = reverse('ToDoLists-list') url = reverse("ToDoLists-list")
response = client.post(url, {"title": title}, format='json') response = client.post(url, {"title": title}, format="json")
return response return response
class ToDoTest(APITestCase): class ToDoTest(APITestCase):
'''Tests API for todo.''' """Tests API for todo."""
def get(self, expected_titles): def get(self, expected_titles):
url = reverse('ToDoLists-list') url = reverse("ToDoLists-list")
response = self.client.get(url, {}, format='json') response = self.client.get(url, {}, format="json")
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
real_titles = [data['title'] for data in response.data['results']] real_titles = [data["title"] for data in response.data["results"]]
self.assertEqual((response.data['count'], real_titles), \ self.assertEqual(real_titles, expected_titles)
(len(expected_titles), expected_titles))
def post(self, to_do_title): def post(self, to_do_title):
response = create_todo(self.client, to_do_title) response = create_todo(self.client, to_do_title)
self.assertEqual(response.status_code, status.HTTP_201_CREATED) self.assertEqual(response.status_code, status.HTTP_201_CREATED)
self.assertEqual(response.data['title'], to_do_title) self.assertEqual(response.data["title"], to_do_title)
return response.data['id'] return response.data["id"]
def get_by_id(self, id, expected_title): def get_by_id(self, id, expected_title):
url_with_id = reverse('ToDoLists-detail', args=(id,)) url_with_id = reverse("ToDoLists-detail", args=(id,))
response = self.client.get(url_with_id, {id: id}, format='json') response = self.client.get(url_with_id, {id: id}, format="json")
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['title'], expected_title) self.assertEqual(response.data["title"], expected_title)
def put(self, id, new_title): def put(self, id, new_title):
url_with_id = reverse('ToDoLists-detail', args=(id,)) url_with_id = reverse("ToDoLists-detail", args=(id,))
response = self.client.put(url_with_id, {"title": new_title}, format='json') response = self.client.put(url_with_id, {"title": new_title}, format="json")
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['title'], new_title) self.assertEqual(response.data["title"], new_title)
def patch(self, id, new_title): def patch(self, id, new_title):
url_with_id = reverse('ToDoLists-detail', args=(id,)) url_with_id = reverse("ToDoLists-detail", args=(id,))
response = self.client.patch(url_with_id, {"title": new_title}, format='json') response = self.client.patch(url_with_id, {"title": new_title}, format="json")
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data['title'], new_title) self.assertEqual(response.data["title"], new_title)
def delete(self, id, title): def delete(self, id, title):
self.get_by_id(id, title) self.get_by_id(id, title)
url_with_id = reverse('ToDoLists-detail', args=(id,)) url_with_id = reverse("ToDoLists-detail", args=(id,))
response = self.client.delete(url_with_id, {}, format='json') response = self.client.delete(url_with_id, {}, format="json")
self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
def prepare(self): def prepare(self):
user = User.objects.create_user('test_user', 'test@test.com', 'test_password') user = User.objects.create_user("test_user", "test@test.com", "test_password")
self.client.force_authenticate(user=user) self.client.force_authenticate(user=user)
def test_create_delete(self): def test_create_delete(self):
@@ -72,7 +64,6 @@ class ToDoTest(APITestCase):
self.put(to_do_id1, "ToDoList11") self.put(to_do_id1, "ToDoList11")
self.patch(to_do_id1, "ToDoList12") self.patch(to_do_id1, "ToDoList12")
def test_todo(self): def test_todo(self):
""" """
lists/: get, post lists/: get, post
@@ -92,4 +83,3 @@ class ToDoTest(APITestCase):
self.delete(to_do_id2, to_do_title_2) self.delete(to_do_id2, to_do_title_2)
self.get([to_do_title_1]) self.get([to_do_title_1])