fixed failing tests proper

Author: eadwinCode

ellar/common/models/controller.py

@@ -33,6 +33,9 @@ def add_router(
         router: t.Union["ControllerBase", "ModuleRouter"],
         prefix: t.Optional[str] = None,
     ) -> None:
+        if prefix:
+            assert prefix.startswith("/"), "'prefix' must start with '/'"
+
         reflect.define_metadata(
             NESTED_ROUTERS_KEY, [NestedRouterInfo(prefix=prefix, router=router)], cls
         )

ellar/common/operations/router.py

@@ -54,6 +54,8 @@ def add_router(
         router: t.Union["ModuleRouter", "ControllerBase"],
         prefix: t.Optional[str] = None,
     ) -> None:
+        if prefix:
+            assert prefix.startswith("/"), "'prefix' must start with '/'"
         reflect.define_metadata(
             NESTED_ROUTERS_KEY,
             [NestedRouterInfo(prefix=prefix, router=router)],

tests/test_controller/test_nested_controllers.py

@@ -1,4 +1,7 @@
+import pytest
 from ellar.common import Controller, get
+from ellar.common.exceptions import ImproperConfiguration
+from ellar.reflect import reflect
 from ellar.testing import Test
 
 
@@ -24,28 +27,30 @@ async def create_cat(self):
 
 
 def test_can_reach_controllers():
-    Cat2Controller.add_router(Cat1Controller)
-    Cat3Controller.add_router(Cat2Controller)
+    with reflect.context():
+        Cat2Controller.add_router(Cat1Controller, prefix="/sr")
+        Cat3Controller.add_router(Cat2Controller)
 
-    tm = Test.create_test_module(controllers=[Cat3Controller])
+        tm = Test.create_test_module(controllers=[Cat3Controller])
 
-    client = tm.get_test_client()
-    res = client.get("cat3/cat2/create")
-    assert res.status_code == 200
-    assert res.json() == {"message": "created from Cat2Controller"}
+        client = tm.get_test_client()
+        res = client.get("cat3/cat2/create")
+        assert res.status_code == 200
+        assert res.json() == {"message": "created from Cat2Controller"}
 
-    res = client.get("cat3/cat2/cat1/create")
-    assert res.status_code == 200
-    assert res.json() == {"message": "created from Cat1Controller"}
+        res = client.get("cat3/cat2/sr/cat1/create")
+        assert res.status_code == 200
+        assert res.json() == {"message": "created from Cat1Controller"}
 
-    res = client.get("cat3/create")
-    assert res.status_code == 200
-    assert res.json() == {"message": "created from Cat3Controller"}
+        res = client.get("cat3/create")
+        assert res.status_code == 200
+        assert res.json() == {"message": "created from Cat3Controller"}
 
 
 def test_circular_exception_works():
-    Cat2Controller.add_router(Cat1Controller)
-    Cat1Controller.add_router(Cat2Controller)
+    with reflect.context():
+        Cat2Controller.add_router(Cat1Controller)
+        Cat1Controller.add_router(Cat2Controller)
 
-    # with pytest.raises(ImproperConfiguration, match="Circular Nested router"):
-    Test.create_test_module(controllers=[Cat2Controller]).create_application()
+        with pytest.raises(ImproperConfiguration, match="Circular Nested router"):
+            Test.create_test_module(controllers=[Cat2Controller]).create_application()

tests/test_routing/test_nested_router.py

@@ -1,4 +1,7 @@
+import pytest
 from ellar.common import ModuleRouter
+from ellar.common.exceptions import ImproperConfiguration
+from ellar.reflect import reflect
 from ellar.testing import Test
 
 router1 = ModuleRouter("/cat1")
@@ -26,28 +29,30 @@ async def create_cat_3():
 
 
 def test_can_reach_routers():
-    router2.add_router(router1)
-    router3.add_router(router2)
+    with reflect.context():
+        router2.add_router(router1, prefix="/sr")
+        router3.add_router(router2)
 
-    tm = Test.create_test_module(routers=[router3])
+        tm = Test.create_test_module(routers=[router3])
 
-    client = tm.get_test_client()
-    res = client.get("cat3/cat2/create")
-    assert res.status_code == 200
-    assert res.json() == {"message": "created from ModuleRouter2"}
+        client = tm.get_test_client()
+        res = client.get("cat3/cat2/create")
+        assert res.status_code == 200
+        assert res.json() == {"message": "created from ModuleRouter2"}
 
-    res = client.get("cat3/cat2/cat1/create")
-    assert res.status_code == 200
-    assert res.json() == {"message": "created from ModuleRouter1"}
+        res = client.get("cat3/cat2/sr/cat1/create")
+        assert res.status_code == 200
+        assert res.json() == {"message": "created from ModuleRouter1"}
 
-    res = client.get("cat3/create")
-    assert res.status_code == 200
-    assert res.json() == {"message": "created from ModuleRouter3"}
+        res = client.get("cat3/create")
+        assert res.status_code == 200
+        assert res.json() == {"message": "created from ModuleRouter3"}
 
 
 def test_circular_exception_works_router_reference():
-    router2.add_router(router1)
-    router1.add_router(router2)
+    with reflect.context():
+        router2.add_router(router1)
+        router1.add_router(router2)
 
-    # with pytest.raises(ImproperConfiguration, match="Circular Nested router"):
-    Test.create_test_module(routers=[router2]).create_application()
+        with pytest.raises(ImproperConfiguration, match="Circular Nested router"):
+            Test.create_test_module(routers=[router2]).create_application()