diff --git a/.gitignore b/.gitignore index 247236f..27cc7f2 100644 --- a/.gitignore +++ b/.gitignore @@ -65,6 +65,5 @@ target/ *.jsl *.db tmp* -test_* .env* venv* diff --git a/README.md b/README.md index ec2c1c7..e886902 100644 --- a/README.md +++ b/README.md @@ -53,3 +53,8 @@ docker-compose up ```bash docker-compose exec web python manage.py makemigrations backend ``` + +Для запуска тестов использовать +```bash +docker-compose run -e DJANGO_SETTINGS_MODULE=backend.settings web pytest --cov=backend +``` diff --git a/backend/.coveragerc b/backend/.coveragerc new file mode 100644 index 0000000..455c6de --- /dev/null +++ b/backend/.coveragerc @@ -0,0 +1,3 @@ +[run] +omit = + backend/migrations/* diff --git a/backend/backend/settings.py b/backend/backend/settings.py index 32b39d6..e00523f 100644 --- a/backend/backend/settings.py +++ b/backend/backend/settings.py @@ -28,7 +28,7 @@ DEBUG = True ALLOWED_HOSTS = [] if DEBUG: - ALLOWED_HOSTS = ["0.0.0.0", "localhost", "127.0.0.1"] + ALLOWED_HOSTS = ["0.0.0.0", "localhost", "127.0.0.1", "ALLOWED_HOSTS", "testserver"] # Application definition diff --git a/backend/backend/urls.py b/backend/backend/urls.py index d123db5..cdcbc7f 100644 --- a/backend/backend/urls.py +++ b/backend/backend/urls.py @@ -13,13 +13,13 @@ from drf_yasg import openapi from .api import router schema_view = get_schema_view( - openapi.Info( - title="ToDo List", - default_version='v1', - description="Swagger Interface for ToDo List", - ), - public=True, - permission_classes=(permissions.AllowAny,), + openapi.Info( + title="ToDo List", + default_version="v1", + description="Swagger Interface for ToDo List", + ), + public=True, + permission_classes=(permissions.AllowAny,), ) urlpatterns = [ @@ -28,5 +28,5 @@ urlpatterns = [ path("api/token/refresh/", TokenRefreshView.as_view(), name="token_refresh"), path("api/", include(router.urls)), 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"), ] diff --git a/backend/requirements.txt b/backend/requirements.txt index 2c9488b..7385760 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -1,3 +1,5 @@ +pytest==6.2.3 +pytest-cov==2.11.1 djangorestframework==3.12.4 django-filter==2.4.0 markdown==3.3.4 diff --git a/backend/tests/__init__.py b/backend/tests/__init__.py new file mode 100644 index 0000000..8435af2 --- /dev/null +++ b/backend/tests/__init__.py @@ -0,0 +1,3 @@ +from django.core.wsgi import get_wsgi_application + +application = get_wsgi_application() diff --git a/backend/tests/test_item.py b/backend/tests/test_item.py new file mode 100644 index 0000000..783dcff --- /dev/null +++ b/backend/tests/test_item.py @@ -0,0 +1,154 @@ +from django.urls import reverse +from rest_framework import status +from rest_framework.test import APITestCase +from django.contrib.auth.models import User +from .test_todo import create_todo + + +class ItemTest(APITestCase): + """Tests API for items.""" + + def prepare(self): + user = User.objects.create_user("test_user4", "test@test.com", "test_password") + self.client.force_authenticate(user=user) + to_do_id_1 = create_todo(self.client, "ToDoList1").data["id"] + to_do_id_2 = create_todo(self.client, "ToDoList2").data["id"] + return to_do_id_1, to_do_id_2 + + def get(self, expected_titles, todo_id=None, finished=None): + url = reverse("ToDoItems-list") + data = {} + if finished is not None: + data["finished"] = finished + if todo_id is not None: + data["parent"] = todo_id + + response = self.client.get(url, data, format="json") + self.assertEqual(response.status_code, status.HTTP_200_OK) + real_titles = [(d["text"], d["parent"]) for d in response.data["results"]] + self.assertEqual(real_titles, expected_titles) + + if finished is not None: + item_status = [data["finished"] for data in response.data["results"]] + self.assertEqual(finished, all(item_status)) + + def post(self, item_text, todo_id, finished=None): + url = reverse("ToDoItems-list") + if finished is not None: + data = {"text": item_text, "parent": todo_id, "finished": finished} + else: + data = {"text": item_text, "parent": todo_id} + response = self.client.post(url, data, format="json") + + self.assertEqual(response.status_code, status.HTTP_201_CREATED) + check_finished = False if (finished is None) else finished + self.assertEqual(response.data["text"], item_text) + self.assertEqual(response.data["parent"], todo_id) + self.assertEqual(response.data["finished"], check_finished) + + return response.data["id"], response.data["finished"] + + def get_by_id(self, id, text, finished, parent): + url_with_id = reverse("ToDoItems-detail", args=(id,)) + response = self.client.get(url_with_id, {id: id}, format="json") + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data["text"], text) + self.assertEqual(response.data["finished"], finished) + self.assertEqual(response.data["parent"], parent) + + def put(self, id, text, parent, finished=None): + url_with_id = reverse("ToDoItems-detail", args=(id,)) + data = {"text": text, "parent": parent} + if finished is not None: + data["finished"] = finished + response = self.client.put(url_with_id, data, format="json") + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data["text"], text) + self.assertEqual(response.data["parent"], parent) + if finished is not None: + self.assertEqual(response.data["finished"], finished) + + def patch(self, id, text=None, finished=None, parent=None): + url_with_id = reverse("ToDoItems-detail", args=(id,)) + data = {} + if text is not None: + data["text"] = text + if finished is not None: + data["finished"] = finished + if parent is not None: + data["parent"] = parent + response = self.client.patch(url_with_id, data, format="json") + self.assertEqual(response.status_code, status.HTTP_200_OK) + if text is not None: + self.assertEqual(response.data["text"], text) + if finished is not None: + self.assertEqual(response.data["finished"], finished) + if parent is not None: + self.assertEqual(response.data["parent"], parent) + + def delete(self, id, title, finished, to_do_id): + self.get_by_id(id, title, finished, to_do_id) + url_with_id = reverse("ToDoItems-detail", args=(id,)) + response = self.client.delete(url_with_id, {}, format="json") + self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) + + def test_create_delete(self): + """ + /todo_items/: get, post (create) + /todo_items/{id}/: get (read), delete + """ + to_do_id_1, to_do_id_2 = self.prepare() + self.get([], to_do_id_1) + item_text_1, item_text_2, item_text_3, item_text_4 = "Item1", "Item2", "Item3", "Item4" + item_id_1, item_finished_1 = self.post(item_text_1, to_do_id_1) + self.get([(item_text_1, to_do_id_1)], to_do_id_1) + 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) + 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), (item_text_3, to_do_id_1)], + to_do_id_1, + ) + 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)], to_do_id_1, finished=False) + self.get([(item_text_3, to_do_id_1)], to_do_id_1, finished=True) + + self.get_by_id(item_id_1, item_text_1, item_finished_1, to_do_id_1) + self.get_by_id(item_id_2, item_text_2, item_finished_2, to_do_id_1) + self.get_by_id(item_id_3, item_text_3, item_finished_3, to_do_id_1) + + self.delete(item_id_3, item_text_3, item_finished_3, to_do_id_1) + self.get([(item_text_1, to_do_id_1), (item_text_2, to_do_id_1)], to_do_id_1) + + def test_update(self): + """ + /todo_items/{id}/: put (update), patch (partial_update) + """ + + to_do_id_1, to_do_id_2 = self.prepare() + + item_text_1 = "Item1" + item_id_1, item_finished_1 = self.post(item_text_1, to_do_id_1) + + item_text_1_2 = "Item5" + self.put(item_id_1, item_text_1_2, to_do_id_2) + self.put(item_id_1, item_text_1_2, to_do_id_2, finished=False) + self.put(item_id_1, item_text_1_2, to_do_id_2, finished=True) + + item_text_1_3 = "Item6" + self.patch(item_id_1, parent=to_do_id_1) + self.patch(item_id_1, finished=True) + self.patch(item_id_1, text=item_text_1_3) diff --git a/backend/tests/test_todo.py b/backend/tests/test_todo.py new file mode 100644 index 0000000..a8b260f --- /dev/null +++ b/backend/tests/test_todo.py @@ -0,0 +1,85 @@ +from django.urls import reverse +from rest_framework import status +from rest_framework.test import APITestCase +from django.contrib.auth.models import User + + +def create_todo(client, title): + url = reverse("ToDoLists-list") + response = client.post(url, {"title": title}, format="json") + return response + + +class ToDoTest(APITestCase): + """Tests API for todo.""" + + def get(self, expected_titles): + url = reverse("ToDoLists-list") + response = self.client.get(url, {}, format="json") + self.assertEqual(response.status_code, status.HTTP_200_OK) + real_titles = [data["title"] for data in response.data["results"]] + self.assertEqual(real_titles, expected_titles) + + def post(self, to_do_title): + response = create_todo(self.client, to_do_title) + self.assertEqual(response.status_code, status.HTTP_201_CREATED) + self.assertEqual(response.data["title"], to_do_title) + return response.data["id"] + + def get_by_id(self, id, expected_title): + url_with_id = reverse("ToDoLists-detail", args=(id,)) + response = self.client.get(url_with_id, {id: id}, format="json") + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data["title"], expected_title) + + def put(self, id, new_title): + url_with_id = reverse("ToDoLists-detail", args=(id,)) + response = self.client.put(url_with_id, {"title": new_title}, format="json") + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data["title"], new_title) + + def patch(self, id, new_title): + url_with_id = reverse("ToDoLists-detail", args=(id,)) + response = self.client.patch(url_with_id, {"title": new_title}, format="json") + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(response.data["title"], new_title) + + def delete(self, id, title): + self.get_by_id(id, title) + url_with_id = reverse("ToDoLists-detail", args=(id,)) + response = self.client.delete(url_with_id, {}, format="json") + self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT) + + def prepare(self): + user = User.objects.create_user("test_user", "test@test.com", "test_password") + self.client.force_authenticate(user=user) + + def test_create_delete(self): + """ + lists/{id}/: put (update), patch (partial_update) + """ + self.prepare() + to_do_title_1 = "ToDoList1" + to_do_id1 = self.post(to_do_title_1) + self.put(to_do_id1, "ToDoList11") + self.patch(to_do_id1, "ToDoList12") + + def test_todo(self): + """ + lists/: get, post + lists/{id}/: get, delete + """ + + self.prepare() + self.get([]) + to_do_title_1, to_do_title_2 = "ToDoList1", "ToDoList2" + to_do_id1 = self.post(to_do_title_1) + self.get([to_do_title_1]) + to_do_id2 = self.post(to_do_title_2) + self.get([to_do_title_1, to_do_title_2]) + + self.get_by_id(to_do_id1, to_do_title_1) + self.get_by_id(to_do_id2, to_do_title_2) + + self.delete(to_do_id2, to_do_title_2) + self.get([to_do_title_1])