Skip to content

Commit a791415

Browse files
committed
fixed failing tests
1 parent 8ae0e27 commit a791415

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

ninja_extra/controllers/route/route_functions.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ def __call__(
5050
*args,
5151
**kwargs,
5252
)
53+
self.run_permission_check(context)
5354
return self.as_view(request, *args, route_context=context, **kwargs)
5455

5556
def _get_required_api_func_signature(self) -> Tuple:
@@ -222,4 +223,5 @@ async def __call__(
222223
*args,
223224
**kwargs,
224225
)
226+
await self.async_run_check_permissions(context)
225227
return await self.as_view(request, *args, route_context=context, **kwargs)

tests/test_permissions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ async def permission_accept_type_and_instance_async(self):
263263
@pytest.mark.parametrize("route", ["permission/", "index/"])
264264
def test_permission_controller_instance(route):
265265
user = User.objects.create_user(
266-
username="eadwin",
266+
username="eadwin3",
267267
268268
password="password",
269269
is_staff=True,
@@ -283,7 +283,7 @@ def test_permission_controller_instance(route):
283283
@pytest.mark.asyncio
284284
async def test_permission_controller_instance_async():
285285
user = await sync_to_async(User.objects.create_user)(
286-
username="eadwin",
286+
username="eadwin2",
287287
288288
password="password",
289289
is_staff=True,

tests/test_route.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ def setup_method(self):
351351
def get_real_user_request(cls):
352352
_request = Mock()
353353
user = User.objects.create_user(
354-
username="eadwin",
354+
username="eadwin1",
355355
356356
password="password",
357357
is_staff=True,

tests/test_throthling/test_models.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,9 @@ def setup_method(self):
125125
def test_get_cache_key_returns_correct_value_for_authenticated_request(self):
126126
user = User.objects.create(username="test")
127127
self.request.user = user
128-
assert self.throttle.get_cache_key(self.request) == "throttle_user_1"
128+
assert self.throttle.get_cache_key(self.request) == "throttle_user_{}".format(
129+
user.pk
130+
)
129131

130132
def test_get_cache_key_defaults_to_none(self):
131133
cache_key = self.throttle.get_cache_key(self.request)
@@ -165,7 +167,9 @@ def test_get_cache_key_returns_correct_value_for_authenticated_request(
165167
throttle = DynamicRateThrottle(scope="some_scope")
166168
user = User.objects.create(username="test")
167169
self.request.user = user
168-
assert throttle.get_cache_key(self.request) == "throttle_some_scope_1"
170+
assert throttle.get_cache_key(
171+
self.request
172+
) == "throttle_some_scope_{}".format(user.pk)
169173

170174
def test_get_cache_key_defaults_to_none(self, monkeypatch):
171175
with monkeypatch.context() as m:

0 commit comments

Comments
 (0)