refactor folder unittests out of demoapp

Author: jrief

.coveragerc

@@ -2,10 +2,8 @@
 branch = True
 source =
     finder
-    demoapp/unittests
 omit =
     migrations/*
-    tests/*
 
 [report]
 exclude_lines =

.github/workflows/unittests.yml .github/workflows/unit-tests.yml.github/workflows/unittests.yml renamed to .github/workflows/unit-tests.yml

@@ -23,29 +23,22 @@ jobs:
       matrix:
         python-version: ["3.11", "3.12"]
         django-version: ["5.2.*"]
-        node-version: ["18.x"]
+        with-cte: [true, false]
 
     steps:
     - uses: actions/checkout@v3
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
-      with:
-        node-version: ${{ matrix.node-version }}
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        npm install --include=dev
         python -m pip install --upgrade pip
         python -m pip install https://github.com/django/django/archive/refs/heads/main.zip
-        python -m pip install django-cte django-entangled ffmpeg-python pillow reportlab svglib
+        python -m pip install django-entangled ffmpeg-python pillow reportlab svglib
         python -m pip install beautifulsoup4 coverage Faker lxml pytest pytest-django pytest-cov
-    - name: Build Client
-      run: |
-        npm run compilescss
-        npm run esbuild
+    - if: ${{ matrix.with-cte }}
+      run: python -m pip install django-cte
     - name: Test with pytest
       run: |
-        python -m pytest -v demoapp/unittests
+        python -m pytest -v unittests

demoapp/unittests/test_folder_admin.py

@@ -5,7 +5,7 @@
 from django.db.models import QuerySet, Subquery
 
 from django.forms.widgets import Media
-from django.http.response import HttpResponse, HttpResponseBadRequest, HttpResponseNotFound, JsonResponse
+from django.http.response import HttpResponse, HttpResponseNotAllowed, HttpResponseNotFound, JsonResponse
 from django.templatetags.static import static
 from django.urls import path, reverse
 from django.utils.translation import gettext
@@ -175,8 +175,12 @@ def get_model_admin(self, mime_type):
         return self._model_admin_cache[mime_type]
 
     def fetch_inodes(self, request, folder_id):
-        if not (current_folder := self.get_object(request, folder_id)):
-            return HttpResponseNotFound(f"Folder {folder_id} not found.")
+        if request.method != 'GET':
+            return HttpResponseNotAllowed(f"Method {request.method} not allowed. Only GET requests are allowed.")
+        try:
+            current_folder = self.get_object(request, folder_id)
+        except ObjectDoesNotExist:
+            return HttpResponseNotFound(f"FolderModel<{folder_id}> not found.")
         if search_query := request.GET.get('q'):
             inode_qs = self.search_for_inodes(request, current_folder, search_query)
         else:
@@ -204,11 +208,13 @@ def search_for_inodes(self, request, current_folder, search_query, **lookup):
 
     def upload_file(self, request, folder_id):
         if request.method != 'POST':
-            return HttpResponseBadRequest(f"Method {request.method} not allowed. Only POST requests are allowed.")
-        if not (folder := self.get_object(request, folder_id)):
-            return HttpResponseNotFound(f"Folder {folder_id} not found.")
+            return HttpResponseNotAllowed(f"Method {request.method} not allowed. Only POST requests are allowed.")
+        try:
+            folder = self.get_object(request, folder_id)
+        except ObjectDoesNotExist:
+            return HttpResponseNotFound(f"FolderModel<{folder_id}> not found.")
         if request.content_type != 'multipart/form-data' or 'upload_file' not in request.FILES:
-            return HttpResponseBadRequest("Bad encoding type or missing payload.")
+            return HttpResponse("Bad encoding type or missing payload.", status=415)
         model = FileModel.objects.get_model_for(request.FILES['upload_file'].content_type)
         new_file = model.objects.create_from_upload(
             request.FILES['upload_file'],
@@ -223,33 +229,27 @@ def update_inode(self, request, folder_id):
         body = json.loads(request.body)
         try:
             obj = self.get_object(request, body['id'])
-        except (InodeModel.DoesNotExist, KeyError):
-            return HttpResponseNotFound(f"Inode(id={body.get('id', '<missing>')}) not found.")
+        except (ObjectDoesNotExist, KeyError):
+            return HttpResponseNotFound(f"InodeModel<id={body.get('id', '<missing>')}> not found.")
         current_folder = self.get_object(request, folder_id)
         inode_name = body['name']
         try:
             filename_validator(inode_name)
         except ValidationError as exc:
-            return HttpResponseBadRequest(exc.messages[0], status=409)
+            return HttpResponse(exc.messages[0], status=409)
         if current_folder.listdir(name=inode_name, is_folder=True).exists():
             msg = gettext("A folder named “{name}” already exists.")
-            return HttpResponseBadRequest(msg.format(name=inode_name), status=409)
+            return HttpResponse(msg.format(name=inode_name), status=409)
         update_values = {}
         for field in self.get_fields(request, obj):
             if field in body and body[field] != getattr(obj, field):
                 setattr(obj, field, body[field])
                 update_values[field] = body[field]
         if update_values:
             obj.save(update_fields=list(update_values.keys()))
-        favorite_folders = self.get_favorite_folders(request, current_folder)
-        if update_values:
-            for folder in favorite_folders:
-                if folder['id'] == obj.id:
-                    folder.update(update_values)
-                    break
         return JsonResponse({
             'new_inode': self.serialize_inode(obj),
-            'favorite_folders': favorite_folders,
+            'favorite_folders': self.get_favorite_folders(request, current_folder),
         })
 
     def copy_inodes(self, request, folder_id):
@@ -263,7 +263,7 @@ def copy_inodes(self, request, folder_id):
             try:
                 inode.copy_to(current_folder, owner=request.user)
             except RecursionError as exc:
-                return HttpResponseBadRequest(str(exc), status=409)
+                return HttpResponse(str(exc), status=409)
         return JsonResponse({
             'inodes': list(self.get_inodes(request, parent=current_folder)),
         })
@@ -291,7 +291,7 @@ def move_inodes(self, request, folder_id):
                 proxy_obj.validate_constraints()
                 proxy_obj._meta.model.objects.filter(id=entry['id']).update(parent=target_folder)
         except ValidationError as exc:
-            return HttpResponseBadRequest(exc.messages[0], status=409)
+            return HttpResponse(exc.messages[0], status=409)
         return JsonResponse({
             'inodes': list(self.get_inodes(request, parent=target_folder)),
         })
@@ -303,7 +303,7 @@ def delete_inodes(self, request, folder_id):
         current_folder = self.get_object(request, folder_id)
         trash_folder = self.get_trash_folder(request)
         if current_folder.id == trash_folder.id:
-            return HttpResponseBadRequest("Cannot move inodes from trash folder into itself.")
+            return HttpResponse("Cannot move inodes from trash folder into itself.", status=409)
         inode_ids = body.get('inode_ids', [])
         for entry in FolderModel.objects.filter_unified(id__in=inode_ids):
             inode = FolderModel.objects.get_inode(id=entry['id'])
@@ -324,7 +324,7 @@ def delete_inodes(self, request, folder_id):
 
     def undo_discarded_inodes(self, request):
         if request.method != 'POST':
-            return HttpResponseBadRequest(f"Method {request.method} not allowed. Only POST requests are allowed.")
+            return HttpResponseNotAllowed(f"Method {request.method} not allowed. Only POST requests are allowed.")
         body = json.loads(request.body)
         trash_folder = self.get_trash_folder(request)
         discarded_inodes = DiscardedInode.objects.filter(inode__in=body.get('inode_ids', []))
@@ -337,7 +337,7 @@ def undo_discarded_inodes(self, request):
 
     def erase_trash_folder(self, request):
         if request.method != 'DELETE':
-            return HttpResponseBadRequest(f"Method {request.method} not allowed. Only DELETE requests are allowed.")
+            return HttpResponseNotAllowed(f"Method {request.method} not allowed. Only DELETE requests are allowed.")
         trash_folder_entries = self.get_trash_folder(request).listdir()
         DiscardedInode.objects.filter(inode__in=list(trash_folder_entries.values_list('id', flat=True))).delete()
         for entry in trash_folder_entries:
@@ -360,7 +360,7 @@ def add_folder(self, request, folder_id):
         body = json.loads(request.body)
         if parent_folder.listdir(name=body['name'], is_folder=True).exists():
             msg = gettext("A folder named “{name}” already exists.")
-            return HttpResponseBadRequest(msg.format(name=body['name']), status=409)
+            return HttpResponse(msg.format(name=body['name']), status=409)
         new_folder = FolderModel.objects.create(
             name=body['name'],
             parent=parent_folder,

finder/admin/folder.py

@@ -1,10 +1,15 @@
 import json
 
+from django.core.exceptions import ObjectDoesNotExist
+
 from django.contrib import admin
 from django.contrib.sites.shortcuts import get_current_site
 from django.db.models.expressions import F, Value
 from django.db.models.fields import BooleanField
-from django.http.response import HttpResponseBadRequest, HttpResponseNotFound, HttpResponseRedirect, JsonResponse
+from django.http.response import (
+    HttpResponse, HttpResponseBadRequest, HttpResponseNotAllowed, HttpResponseNotFound, HttpResponseRedirect,
+    JsonResponse,
+)
 from django.middleware.csrf import get_token
 from django.template.response import TemplateResponse
 from django.urls import path, reverse
@@ -32,10 +37,15 @@ def get_object(self, request, inode_id, *args):
 
     def check_for_valid_post_request(self, request, folder_id):
         if request.method != 'POST':
-            return HttpResponseBadRequest(f"Method {request.method} not allowed. Only POST requests are allowed.")
+            return HttpResponseNotAllowed(f"Method {request.method} not allowed. Only POST requests are allowed.")
         if request.content_type != 'application/json':
-            return HttpResponseBadRequest(f"Invalid content-type {request.content_type}. Only application/json is allowed.")
-        if self.get_object(request, folder_id) is None:
+            return HttpResponse(
+                f"Invalid content-type {request.content_type}. Only application/json is allowed.",
+                status=415,
+            )
+        try:
+            self.get_object(request, folder_id)
+        except ObjectDoesNotExist:
             return HttpResponseNotFound(f"Folder with id “{folder_id}” not found.")
 
     def toggle_pin(self, request, folder_id):

finder/admin/inode.py

@@ -1,4 +1,4 @@
 [pytest]
-DJANGO_SETTINGS_MODULE = demoapp.settings
+DJANGO_SETTINGS_MODULE = unittests.settings
 django_find_project = false
 addopts = --tb=native