修复登录测试

Author: Chise1

Makefile

@@ -2,6 +2,7 @@ checkfiles = fast_tmp/ tests/ conftest.py
 black_opts = -l 100 -t py38
 py_warn = PYTHONDEVMODE=1
 test_settings = SETTINGS_MODULE=tests.settings
+pytest_opts = -n auto --cov=fast_tmp --tb=native -q
 
 help:
 	@echo "fastapi-cli development makefile"
@@ -31,11 +32,11 @@ check: deps
 	mypy fast_tmp/
 
 
-test_sqlite:
-	$(py_warn) FASTAPI_SETTINGS_MODULE=tests.settings TORTOISE_TEST_DB=sqlite://:memory: pytest --cov-report=
+test: deps
+	$(py_warn) FASTAPI_SETTINGS_MODULE=tests.settings TORTOISE_TEST_DB=sqlite://:memory: pytest --cov-report html $(pytest_opts)
 
-test: deps test_sqlite
-	coverage report
+test_sqlite:
+	$(py_warn) FASTAPI_SETTINGS_MODULE=tests.settings TORTOISE_TEST_DB=sqlite://:memory: pytest --cov-report= $(pytest_opts)
 
 publish: check
 	poetry publish

conftest.py

@@ -1,11 +1,3 @@
 import os
 
-import pytest
-from tortoise.contrib.test import finalizer, initializer
-
-
-@pytest.fixture(scope="session", autouse=True)
-def initialize_tests(request):
-    db_url = os.environ.get("TORTOISE_TEST_DB", "sqlite://:memory:")
-    initializer(["tests.testmodels", "fast_tmp.models"], db_url=db_url, app_label="fast_tmp")
-    request.addfinalizer(finalizer)
+os.environ.setdefault("FASTAPI_SETTINGS_MODULE", "tests.settings")

fast_tmp/contrib/auth/hashers.py

@@ -521,7 +521,7 @@ class ScryptPasswordHasher(BasePasswordHasher):
     block_size = 8
     maxmem = 0
     parallelism = 1
-    work_factor = 2 ** 14
+    work_factor = 2**14
 
     def encode(self, password, salt, n=None, r=None, p=None):
         self._check_encode_args(password, salt)

fast_tmp/models.py

@@ -1,7 +1,6 @@
 from typing import Tuple
 
 from tortoise import Model, fields
-from tortoise.expressions import Q
 
 from fast_tmp.conf import settings
 from fast_tmp.contrib.auth.hashers import check_password, make_password
@@ -114,8 +113,8 @@ async def has_perms(self, codenames: Tuple[str, ...]) -> bool:
         for i in perms1:
             s.add(i.codename)
 
-        for i in codenames:
-            if not i in s:
+        for codename in codenames:
+            if not (codename in s):
                 return False
         return True
 

fast_tmp/site/util.py

@@ -5,7 +5,6 @@
 from starlette.requests import Request
 from tortoise import ForeignKeyFieldInstance, ManyToManyFieldInstance, Model, fields
 from tortoise.fields.data import CharEnumFieldInstance, IntEnumFieldInstance
-from tortoise.queryset import QuerySet
 
 from fast_tmp.amis.custom import Custom
 from fast_tmp.amis.forms import Column, ColumnInline, Control, ControlEnum, QuickEdit
@@ -19,7 +18,7 @@
     TransferItem,
 )
 from fast_tmp.amis.response import AmisStructError
-from fast_tmp.responses import ListDataWithPage, NotFoundError, TmpValueError
+from fast_tmp.responses import ListDataWithPage, TmpValueError
 
 from ..amis.actions import DialogAction
 from ..amis.buttons import Operation

fast_tmp/utils/test.py

@@ -17,6 +17,7 @@ cookiecutter = "^2.1.1"
 typer = "^0.6.1"
 fastapi = { extras = ["all"], version = "^0.85.0" }
 python-jose = "^3.3.0"
+asgiref = "^3.5.2"
 
 [tool.poetry.dev-dependencies]
 tortoise-orm = "^0.19.2"
@@ -31,6 +32,10 @@ asynctest = "*"
 bandit = "*"
 mypy = "*"
 
+[tool.poetry.group.dev.dependencies]
+httpx = "^0.23.0"
+toml = "^0.10.2"
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

poetry.lock

@@ -0,0 +1,43 @@
+from httpx import AsyncClient
+from tortoise import Tortoise
+from tortoise.contrib.test import SimpleTestCase
+
+from fast_tmp.conf import settings
+from fast_tmp.factory import create_app
+from fast_tmp.models import User
+
+
+class TestSite(SimpleTestCase):
+    client: AsyncClient
+
+    async def asyncSetUp(self) -> None:
+        app = create_app()
+        self.client = AsyncClient(app=app, base_url="http://test")
+        await self.client.__aenter__()
+        await Tortoise.init(settings.TORTOISE_ORM, _create_db=True)
+        await Tortoise.generate_schemas(False)
+        await self.create_superuser("admin", "admin")
+
+    async def asyncTearDown(self) -> None:
+        await self.client.__aexit__()
+        await Tortoise.close_connections()
+
+    async def create_superuser(self, username, password):
+        if await User.filter(username=username).exists():
+            return
+        user = User(username=username, is_superuser=True)
+        user.set_password(password)
+        await user.save()
+
+    async def test_login(self):
+        response = await self.client.get("/admin/site")
+        assert response.status_code == 302
+        assert response.headers.get("location") == "http://test/admin/login"
+        # 登录
+        response = await self.client.post(
+            "/admin/login",
+            headers={"ContentType": "application/x-www-form-urlencoded"},
+            data={"username": "admin", "password": "admin"},
+        )
+        assert response.status_code == 302
+        assert response.headers.get("location") == "http://test/admin/"