tests refactored

Author: olyapka84

.github/workflows/sonarcloud.yml

@@ -12,24 +12,36 @@ jobs:
     permissions:
       contents: read
       pull-requests: read
+
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+
       - uses: actions/setup-python@v5
         with:
           python-version: '3.11'
+
       - name: Install uv and sync
         run: |
           pip install uv
           uv sync --frozen
           uv pip install pytest pytest-cov pytest-django
+
       - name: Run tests with coverage
         env:
           DJANGO_SETTINGS_MODULE: task_manager.settings
+          SECRET_KEY: test-secret-key
+          DEBUG: "False"
+          DATABASE_URL: sqlite:///./test.sqlite3
+          ALLOWED_HOSTS: testserver,localhost,127.0.0.1
         run: |
           mkdir -p reports
-          uv run pytest --ds=task_manager.settings --cov=task_manager --cov-report=xml:coverage.xml --junitxml=reports/junit.xml
+          uv run pytest --ds=task_manager.settings \
+                        --cov=task_manager \
+                        --cov-report=xml:coverage.xml \
+                        --junitxml=reports/junit.xml
+
       - name: SonarCloud Scan
         uses: SonarSource/sonarcloud-github-action@v2
         env:

task_manager/labels/views.py

@@ -12,15 +12,15 @@ class LabelListView(LoginRequiredMixin, ListView):
     model = Label
     template_name = "labels/index.html"
     context_object_name = "labels"
-    login_url = "users:login"
+    login_url = "login"
 
 
 class LabelCreateView(LoginRequiredMixin, CreateView):
     model = Label
     form_class = LabelForm
     template_name = "labels/form.html"
     success_url = reverse_lazy("labels:index")
-    login_url = "users:login"
+    login_url = "login"
 
     def form_valid(self, form):
         messages.success(self.request, "Метка успешно создана")
@@ -32,7 +32,7 @@ class LabelUpdateView(LoginRequiredMixin, UpdateView):
     form_class = LabelForm
     template_name = "labels/form.html"
     success_url = reverse_lazy("labels:index")
-    login_url = "users:login"
+    login_url = "login"
 
     def form_valid(self, form):
         messages.success(self.request, "Метка успешно изменена")
@@ -43,7 +43,7 @@ class LabelDeleteView(LoginRequiredMixin, DeleteView):
     model = Label
     template_name = "labels/confirm_delete.html"
     success_url = reverse_lazy("labels:index")
-    login_url = "users:login"
+    login_url = "login"
 
     def post(self, request, *args, **kwargs):
         label = self.get_object()

task_manager/settings.py

@@ -142,7 +142,7 @@
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
-LOGIN_URL = '/login/'
+LOGIN_URL = 'login'
 LOGIN_REDIRECT_URL = '/'
 LOGOUT_REDIRECT_URL = '/'
 

task_manager/statuses/views.py

@@ -12,15 +12,15 @@ class StatusListView(LoginRequiredMixin, ListView):
     model = Status
     template_name = "statuses/index.html"
     context_object_name = "statuses"
-    login_url = "users:login"
+    login_url = "login"
 
 
 class StatusCreateView(LoginRequiredMixin, CreateView):
     model = Status
     form_class = StatusForm
     template_name = "statuses/form.html"
     success_url = reverse_lazy("statuses:index")
-    login_url = "users:login"
+    login_url = "login"
 
     def form_valid(self, form):
         messages.success(self.request, "Статус успешно создан")
@@ -32,7 +32,7 @@ class StatusUpdateView(LoginRequiredMixin, UpdateView):
     form_class = StatusForm
     template_name = "statuses/form.html"
     success_url = reverse_lazy("statuses:index")
-    login_url = "users:login"
+    login_url = "login"
 
     def form_valid(self, form):
         messages.success(self.request, "Статус успешно изменен")
@@ -43,7 +43,7 @@ class StatusDeleteView(LoginRequiredMixin, DeleteView):
     model = Status
     template_name = "statuses/confirm_delete.html"
     success_url = reverse_lazy("statuses:index")
-    login_url = "users:login"
+    login_url = "login"
 
     def post(self, request, *args, **kwargs):
         status = self.get_object()

task_manager/tasks/views.py

@@ -14,7 +14,7 @@ class TaskListView(LoginRequiredMixin, FilterView):
     model = Task
     template_name = "tasks/index.html"
     context_object_name = "tasks"
-    login_url = "users:login"
+    login_url = "login"
     filterset_class = TaskFilter
 
     def get_queryset(self):
@@ -30,15 +30,15 @@ class TaskDetailView(LoginRequiredMixin, DetailView):
     model = Task
     template_name = "tasks/detail.html"
     context_object_name = "task"
-    login_url = "users:login"
+    login_url = "login"
 
 
 class TaskCreateView(LoginRequiredMixin, CreateView):
     model = Task
     form_class = TaskForm
     template_name = "tasks/form.html"
     success_url = reverse_lazy("tasks:index")
-    login_url = "users:login"
+    login_url = "login"
 
     def form_valid(self, form):
         form.instance.author = self.request.user
@@ -51,7 +51,7 @@ class TaskUpdateView(LoginRequiredMixin, UpdateView):
     form_class = TaskForm
     template_name = "tasks/form.html"
     success_url = reverse_lazy("tasks:index")
-    login_url = "users:login"
+    login_url = "login"
 
     def form_valid(self, form):
         messages.success(self.request, "Задача успешно изменена")
@@ -62,7 +62,7 @@ class TaskDeleteView(LoginRequiredMixin, UserPassesTestMixin, DeleteView):
     model = Task
     template_name = "tasks/confirm_delete.html"
     success_url = reverse_lazy("tasks:index")
-    login_url = "users:login"
+    login_url = "login"
 
     def test_func(self):
         return self.get_object().author_id == self.request.user.id

task_manager/users/views.py

@@ -93,7 +93,7 @@ class UserDeleteView(OnlySelfMixin, LoginRequiredMixin, DeleteView):
     model = User
     template_name = "users/confirm_delete.html"
     success_url = reverse_lazy("users:list")
-    login_url = "users:login"
+    login_url = "login"
 
     def post(self, request, *args, **kwargs):
         user = self.get_object()

tests/test_labels_crud.py

@@ -4,29 +4,27 @@
 from task_manager.labels.models import Label
 from task_manager.tasks.models import Task, Status
 
-
 @pytest.mark.django_db
 def test_labels_list_requires_login(client):
     url = reverse("labels:index")
     resp = client.get(url)
     assert resp.status_code == 302
-    assert reverse("users:login") in resp["Location"]
+    assert reverse("login") in resp["Location"]
 
 
 @pytest.mark.django_db
 def test_label_create_requires_login(client):
     url = reverse("labels:create")
     resp = client.post(url, {"name": "bug"})
     assert resp.status_code == 302
-    assert reverse("users:login") in resp["Location"]
+    assert reverse("login") in resp["Location"]
     assert not Label.objects.filter(name="bug").exists()
 
 
 @pytest.mark.django_db
 def test_label_create_ok(client, django_user_model):
     django_user_model.objects.create_user(username="u", password="p")
-    client.login(username="u", password="p")
-
+    assert client.login(username="u", password="p")
     url = reverse("labels:create")
     resp = client.post(url, {"name": "bug"})
     assert resp.status_code == 302
@@ -37,31 +35,26 @@ def test_label_create_ok(client, django_user_model):
 @pytest.mark.django_db
 def test_label_update_ok(client, django_user_model):
     django_user_model.objects.create_user(username="u", password="p")
-    client.login(username="u", password="p")
-
+    assert client.login(username="u", password="p")
     label = Label.objects.create(name="old")
     url = reverse("labels:update", args=[label.pk])
     resp = client.post(url, {"name": "new"})
     assert resp.status_code == 302
-
     label.refresh_from_db()
     assert label.name == "new"
 
 
 @pytest.mark.django_db
 def test_label_delete_blocked_when_in_use(client, django_user_model):
     user = django_user_model.objects.create_user(username="u", password="p")
-    client.login(username="u", password="p")
-
+    assert client.login(username="u", password="p")
     label = Label.objects.create(name="bug")
     status = Status.objects.create(name="open")
     task = Task.objects.create(name="t1", author=user, status=status)
     task.labels.add(label)
-
     url = reverse("labels:delete", args=[label.pk])
     resp_get = client.get(url)
     assert resp_get.status_code in (200, 302)
-
     resp_post = client.post(url)
     assert resp_post.status_code == 302
     assert Label.objects.filter(pk=label.pk).exists()
@@ -70,8 +63,7 @@ def test_label_delete_blocked_when_in_use(client, django_user_model):
 @pytest.mark.django_db
 def test_label_delete_when_unused_ok(client, django_user_model):
     django_user_model.objects.create_user(username="u", password="p")
-    client.login(username="u", password="p")
-
+    assert client.login(username="u", password="p")
     label = Label.objects.create(name="orphan")
     url = reverse("labels:delete", args=[label.pk])
     resp = client.post(url)

tests/test_users_crud.py

@@ -71,7 +71,8 @@ def test_update_requires_auth_redirects(client, users):
     url = f"/users/{users['alice'].pk}/update/"
     r = client.get(url)
     assert r.status_code in (302, 301)
-    assert r.url == f"/login/?next={url}"
+    assert "/login/" in r.url
+    assert f"next={url}" in r.url
 
 
 @pytest.mark.django_db
@@ -100,13 +101,12 @@ def test_user_cannot_update_other(auth_client, users):
     assert users["bob"].username == "bob"
 
 
-# ---- DELETE ----
 @pytest.mark.django_db
 def test_delete_requires_auth_redirects(client, users):
     url = f"/users/{users['alice'].pk}/delete/"
     r = client.get(url)
     assert r.status_code in (302, 301)
-    assert r.url.startswith("/users/login/")
+    assert "/login/" in r.url
 
 
 @pytest.mark.django_db