Added more tests

eadwinCode · eadwinCode · commit 8fa2eb3f7950 · 2022-12-29T19:07:03.000+01:00
diff --git a/tests/test_application/test_application_functions.py b/tests/test_application/test_application_functions.py
@@ -162,7 +162,23 @@ async def lifespan(app):
         assert startup_complete
         assert cleanup_complete
 
-    def test_app_debug(self):
+    def test_app_debug_return_html(self):
+        @get("/")
+        async def homepage(request: Request):
+            raise RuntimeError()
+
+        app = AppFactory.create_app()
+        app.router.append(homepage)
+        app.debug = True
+
+        client = TestClient(app, raise_server_exceptions=False)
+        response = client.get("/", headers={"accept": "text/html"})
+        assert response.status_code == 500
+        assert "<head>" in response.text
+        assert ".traceback-container" in response.text
+        assert app.debug
+
+    def test_app_debug_plain_text(self):
         @get("/")
         async def homepage(request: Request):
             raise RuntimeError()
@@ -174,10 +190,8 @@ async def homepage(request: Request):
         client = TestClient(app, raise_server_exceptions=False)
         response = client.get("/")
         assert response.status_code == 500
-        assert response.json() == {
-            "detail": "Internal server error",
-            "status_code": 500,
-        }
+        assert "test_application_functions.py" in response.text
+        assert "line 184" in response.text
         assert app.debug
 
 
diff --git a/tests/test_exceptions/test_custom_exceptions.py b/tests/test_exceptions/test_custom_exceptions.py
@@ -133,8 +133,7 @@ def homepage():
 
     tm = TestClientFactory.create_test_module()
     tm.app.router.append(homepage)
-    tm.app.config.EXCEPTION_HANDLERS += [NewExceptionHandler()]
-    tm.app.rebuild_middleware_stack()
+    tm.app.add_exception_handler(NewExceptionHandler())
 
     client = tm.get_client()
     res = client.get("/")
@@ -149,8 +148,7 @@ def homepage():
 
     tm = TestClientFactory.create_test_module()
     tm.app.router.append(homepage)
-    tm.app.config.EXCEPTION_HANDLERS += [OverrideAPIExceptionHandler()]
-    tm.app.rebuild_middleware_stack()
+    tm.app.add_exception_handler(OverrideAPIExceptionHandler())
 
     client = tm.get_client()
     res = client.get("/")
@@ -174,8 +172,7 @@ def homepage():
 
     tm = TestClientFactory.create_test_module()
     tm.app.router.append(homepage)
-    tm.app.config.EXCEPTION_HANDLERS += [exception_handler]
-    tm.app.rebuild_middleware_stack()
+    tm.app.add_exception_handler(exception_handler)
 
     client = tm.get_client(raise_server_exceptions=False)
     res = client.get("/")
@@ -220,7 +217,7 @@ async def app(scope, receive, send):
     app = ExceptionMiddleware(
         app,
         debug=True,
-        exception_middleware_service=ExceptionMiddlewareService(config=Config()),
+        exception_middleware_service=ExceptionMiddlewareService(),
     )
     client = test_client_factory(app)
     with pytest.raises(RuntimeError):
diff --git a/tests/test_routing/sample.py b/tests/test_routing/sample.py
@@ -1,6 +1,6 @@
 from datetime import datetime
 from enum import IntEnum
-from typing import Optional
+from typing import List, Optional
 
 from pydantic import Field
 
@@ -36,3 +36,16 @@ class Filter(Schema):
 class Data(Schema):
     an_int: int = Field(alias="int", default=0)
     a_float: float = Field(alias="float", default=1.5)
+
+
+class NonPrimitiveSchema(Schema):
+    # The schema can only work for Body
+    # And will fail for Path, Cookie, Query, Header, Form
+    filter: Filter
+
+
+class ListOfPrimitiveSchema(Schema):
+    # The schema can only work for Body, Query, Header and Form
+    # And will fail for Path, Cookie
+    an_int: List[int] = Field(alias="int")
+    a_float: List[float] = Field(alias="float")
diff --git a/tests/test_routing/test_cookie_schema.py b/tests/test_routing/test_cookie_schema.py
@@ -1,11 +1,14 @@
-from ellar.common import Cookie
+import pytest
+
+from ellar.common import Cookie, get
 from ellar.core import TestClientFactory
 from ellar.core.connection import Request
+from ellar.core.exceptions import ImproperConfiguration
 from ellar.core.routing import ModuleRouter
 from ellar.openapi import OpenAPIDocumentBuilder
 from ellar.serializer import serialize_object
 
-from .sample import Data, Filter
+from .sample import Data, Filter, ListOfPrimitiveSchema, NonPrimitiveSchema
 
 router = ModuleRouter("")
 
@@ -105,3 +108,30 @@ def test_cookie_schema():
             "in": "cookie",
         },
     ]
+
+
+def test_invalid_schema_cookie():
+    with pytest.raises(ImproperConfiguration) as ex:
+
+        @get("/test")
+        def invalid_path_parameter(cookie: NonPrimitiveSchema = Cookie()):
+            pass
+
+    assert (
+        str(ex.value)
+        == "field: 'filter' with annotation:'<class 'tests.test_routing.sample.Filter'>' in "
+        "'<class 'tests.test_routing.sample.NonPrimitiveSchema'>'can't be processed. "
+        "Field type is not a primitive type"
+    )
+
+    with pytest.raises(ImproperConfiguration) as ex:
+
+        @get("/test")
+        def invalid_path_parameter(cookie: ListOfPrimitiveSchema = Cookie()):
+            pass
+
+    assert (
+        str(ex.value) == "field: 'an_int' with annotation:'typing.List[int]' in "
+        "'<class 'tests.test_routing.sample.ListOfPrimitiveSchema'>'can't be processed. "
+        "Field type is not a primitive type"
+    )
diff --git a/tests/test_routing/test_form_schema.py b/tests/test_routing/test_form_schema.py
@@ -0,0 +1,81 @@
+import pytest
+
+from ellar.common import Form, post
+from ellar.core import TestClientFactory
+from ellar.core.connection import Request
+from ellar.core.exceptions import ImproperConfiguration
+from ellar.core.routing import ModuleRouter
+from ellar.openapi import OpenAPIDocumentBuilder
+from ellar.serializer import serialize_object
+
+from .sample import Filter, NonPrimitiveSchema
+
+mr = ModuleRouter("")
+
+
+@mr.post("/form-schema")
+def form_params_schema(
+    request: Request,
+    filters: Filter = Form(..., alias="will_not_work_for_schema_with_many_field"),
+):
+    return filters.dict()
+
+
+test_module = TestClientFactory.create_test_module(routers=(mr,))
+
+
+def test_request():
+    client = test_module.get_client()
+    response = client.post("/form-schema", data={"from": "1", "to": "2", "range": "20"})
+    assert response.json() == {
+        "to_datetime": "1970-01-01T00:00:02+00:00",
+        "from_datetime": "1970-01-01T00:00:01+00:00",
+        "range": 20,
+    }
+
+    response = client.post(
+        "/form-schema", data={"from": "1", "to": "2", "range": "100"}
+    )
+    assert response.status_code == 422
+    json = response.json()
+    assert json == {
+        "detail": [
+            {
+                "loc": ["body", "range"],
+                "msg": "value is not a valid enumeration member; permitted: 20, 50, 200",
+                "type": "type_error.enum",
+                "ctx": {"enum_values": [20, 50, 200]},
+            }
+        ]
+    }
+
+
+def test_schema():
+    document = serialize_object(
+        OpenAPIDocumentBuilder().build_document(test_module.app)
+    )
+    params = document["paths"]["/form-schema"]["post"]["requestBody"]
+    assert params == {
+        "content": {
+            "application/x-www-form-urlencoded": {
+                "schema": {"$ref": "#/components/schemas/Filter"}
+            }
+        },
+        "required": True,
+    }
+
+
+def test_for_invalid_schema():
+    with pytest.raises(ImproperConfiguration) as ex:
+
+        @post("/test")
+        def invalid_path_parameter(path: NonPrimitiveSchema = Form()):
+            pass
+
+    assert (
+        str(ex.value)
+        == "field: 'filter' with annotation:'<class 'tests.test_routing.sample.Filter'>' in "
+        "'<class 'tests.test_routing.sample.NonPrimitiveSchema'>'can't be processed. "
+        "Field type should belong to (<class 'list'>, <class 'set'>, <class 'tuple'>) "
+        "or any primitive type"
+    )
diff --git a/tests/test_routing/test_header_schema.py b/tests/test_routing/test_header_schema.py
@@ -1,11 +1,14 @@
-from ellar.common import Header
+import pytest
+
+from ellar.common import Header, get
 from ellar.core import TestClientFactory
 from ellar.core.connection import Request
+from ellar.core.exceptions import ImproperConfiguration
 from ellar.core.routing import ModuleRouter
 from ellar.openapi import OpenAPIDocumentBuilder
 from ellar.serializer import serialize_object
 
-from .sample import Data, Filter
+from .sample import Data, Filter, NonPrimitiveSchema
 
 mr = ModuleRouter("")
 
@@ -105,3 +108,19 @@ def test_header_schema():
             "in": "header",
         },
     ]
+
+
+def test_invalid_schema_header():
+    with pytest.raises(ImproperConfiguration) as ex:
+
+        @get("/test")
+        def invalid_path_parameter(cookie: NonPrimitiveSchema = Header()):
+            pass
+
+    assert (
+        str(ex.value)
+        == "field: 'filter' with annotation:'<class 'tests.test_routing.sample.Filter'>' in "
+        "'<class 'tests.test_routing.sample.NonPrimitiveSchema'>'can't be processed. "
+        "Field type should belong to (<class 'list'>, <class 'set'>, <class 'tuple'>) "
+        "or any primitive type"
+    )
diff --git a/tests/test_routing/test_path_with_schema.py b/tests/test_routing/test_path_with_schema.py
@@ -0,0 +1,100 @@
+import pytest
+
+from ellar.common import Path, get
+from ellar.core import TestClientFactory
+from ellar.core.connection import Request
+from ellar.core.exceptions import ImproperConfiguration
+from ellar.core.routing import ModuleRouter
+from ellar.openapi import OpenAPIDocumentBuilder
+from ellar.serializer import serialize_object
+
+from .sample import Filter, ListOfPrimitiveSchema, NonPrimitiveSchema
+
+mr = ModuleRouter("")
+
+
+@mr.get("/path-with-schema/{from}/{to}/{range}")
+def path_params_schema(
+    request: Request,
+    filters: Filter = Path(..., alias="will_not_work_for_schema_with_many_field"),
+):
+    return filters.dict()
+
+
+test_module = TestClientFactory.create_test_module(routers=(mr,))
+
+
+def test_request():
+    client = test_module.get_client()
+    response = client.get("/path-with-schema/1/2/20")
+    assert response.json() == {
+        "to_datetime": "1970-01-01T00:00:02+00:00",
+        "from_datetime": "1970-01-01T00:00:01+00:00",
+        "range": 20,
+    }
+
+    response = client.get("/path-with-schema/1/2/100")
+    assert response.status_code == 422
+    assert response.json() == {
+        "detail": [
+            {
+                "loc": ["path", "range"],
+                "msg": "value is not a valid enumeration member; permitted: 20, 50, 200",
+                "type": "type_error.enum",
+                "ctx": {"enum_values": [20, 50, 200]},
+            }
+        ]
+    }
+
+
+def test_schema():
+    document = serialize_object(
+        OpenAPIDocumentBuilder().build_document(test_module.app)
+    )
+    params = document["paths"]["/path-with-schema/{from}/{to}/{range}"]["get"][
+        "parameters"
+    ]
+    assert params == [
+        {
+            "required": True,
+            "schema": {"title": "To", "type": "string", "format": "date-time"},
+            "name": "to",
+            "in": "path",
+        },
+        {
+            "required": True,
+            "schema": {"title": "From", "type": "string", "format": "date-time"},
+            "name": "from",
+            "in": "path",
+        },
+        {
+            "required": True,
+            "schema": {"$ref": "#/components/schemas/Range"},
+            "name": "range",
+            "in": "path",
+        },
+    ]
+
+
+def test_for_invalid_schema():
+    with pytest.raises(ImproperConfiguration) as ex:
+
+        @get("/{filter}")
+        def invalid_path_parameter(path: NonPrimitiveSchema = Path()):
+            pass
+
+    assert (
+        str(ex.value)
+        == "Path params must be of one of the supported types. Only primitive types"
+    )
+
+    with pytest.raises(ImproperConfiguration) as ex:
+
+        @get("/{int}/{float}")
+        def invalid_path_parameter(path: ListOfPrimitiveSchema = Path()):
+            pass
+
+    assert (
+        str(ex.value)
+        == "Path params must be of one of the supported types. Only primitive types"
+    )
diff --git a/tests/test_routing/test_query_schema.py b/tests/test_routing/test_query_schema.py
