Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Remove keyword only argument for RequestsMiddleware #113

Merged
merged 3 commits into from Dec 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion google/cloud/logging_v2/handlers/middleware/request.py
Expand Up @@ -42,7 +42,7 @@ def _get_django_request():
class RequestMiddleware(MiddlewareMixin):
"""Saves the request in thread local"""

def __init__(self, *, get_response=None):
def __init__(self, get_response):
self.get_response = get_response

def process_request(self, request):
Expand Down
13 changes: 13 additions & 0 deletions tests/unit/handlers/middleware/test_request.py
Expand Up @@ -41,6 +41,9 @@ def _get_target_class(self):
return request.RequestMiddleware

def _make_one(self, *args, **kw):
if not args and "get_response" not in kw:
kw["get_response"] = None

return self._get_target_class()(*args, **kw)

def test_process_request(self):
Expand All @@ -54,6 +57,16 @@ def test_process_request(self):
django_request = request._get_django_request()
self.assertEqual(django_request, mock_request)

def test_can_instantiate_middleware_without_kwargs(self):
handler = mock.Mock()
middleware = self._make_one(handler)
self.assertEqual(middleware.get_response, handler)

def test_can_instantiate_middleware_with_kwargs(self):
handler = mock.Mock()
middleware = self._make_one(get_response=handler)
self.assertEqual(middleware.get_response, handler)


class Test__get_django_request(DjangoBase):
@staticmethod
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/handlers/test__helpers.py
Expand Up @@ -87,7 +87,7 @@ def test_no_context_header(self):

django_request = RequestFactory().get("/")

middleware = request.RequestMiddleware()
middleware = request.RequestMiddleware(None)
middleware.process_request(django_request)
trace_id = self._call_fut()
self.assertIsNone(trace_id)
Expand All @@ -104,7 +104,7 @@ def test_valid_context_header(self):
"/", **{django_trace_header: django_trace_id}
)

middleware = request.RequestMiddleware()
middleware = request.RequestMiddleware(None)
middleware.process_request(django_request)
trace_id = self._call_fut()

Expand Down