diff --git a/authentication/middleware_test.py b/authentication/middleware_test.py index ca189d7b25..61adf75c22 100644 --- a/authentication/middleware_test.py +++ b/authentication/middleware_test.py @@ -19,12 +19,13 @@ def test_process_exception_no_strategy(rf, settings): assert middleware.process_exception(request, None) is None -def test_process_exception(rf, settings): +def test_process_exception(mocker, rf, settings): """Tests that a process_exception handles auth exceptions correctly""" settings.DEBUG = False request = rf.get(reverse("social:complete", args=("email",))) # social_django depends on request.sesssion, so use the middleware to set that - SessionMiddleware().process_request(request) + get_response = mocker.MagicMock() + SessionMiddleware(get_response).process_request(request) strategy = load_strategy(request) backend = load_backend(strategy, "email", None) request.social_strategy = strategy @@ -39,12 +40,13 @@ def test_process_exception(rf, settings): ) -def test_process_exception_non_auth_error(rf, settings): +def test_process_exception_non_auth_error(mocker, rf, settings): """Tests that a process_exception handles non-auth exceptions correctly""" settings.DEBUG = False request = rf.get(reverse("social:complete", args=("email",))) # social_django depends on request.sesssion, so use the middleware to set that - SessionMiddleware().process_request(request) + get_response = mocker.MagicMock() + SessionMiddleware(get_response).process_request(request) strategy = load_strategy(request) backend = load_backend(strategy, "email", None) request.social_strategy = strategy diff --git a/cms/models_test.py b/cms/models_test.py index 2ad3bf42f7..dd0ec2ff36 100644 --- a/cms/models_test.py +++ b/cms/models_test.py @@ -234,7 +234,7 @@ def test_course_page_context_edx_access( # noqa: PLR0913 patched_get_relevant_run_qset.assert_called_once_with(course=course_page.course) -def generate_flexible_pricing_response(request_user, flexible_pricing_form): +def generate_flexible_pricing_response(mocker, request_user, flexible_pricing_form): """ Generates a fully realized request for the Flexible Pricing tests. @@ -248,8 +248,8 @@ def generate_flexible_pricing_response(request_user, flexible_pricing_form): rf = RequestFactory() request = rf.get("/") request.user = request_user - - middleware = SessionMiddleware() + get_response = mocker.MagicMock() + middleware = SessionMiddleware(get_response) middleware.process_request(request) request.session.save() diff --git a/mail/verification_api_test.py b/mail/verification_api_test.py index f603c7d86b..7f1c5c84af 100644 --- a/mail/verification_api_test.py +++ b/mail/verification_api_test.py @@ -23,7 +23,8 @@ def test_send_verification_email(mocker, rf): email = "test@localhost" request = rf.post(reverse("social:complete", args=("email",)), {"email": email}) # social_django depends on request.session, so use the middleware to set that - SessionMiddleware().process_request(request) + get_response = mocker.MagicMock() + SessionMiddleware(get_response).process_request(request) strategy = load_strategy(request) backend = load_backend(strategy, EmailAuth.name, None) code = mocker.Mock(code="abc") diff --git a/main/test_utils.py b/main/test_utils.py index b4ee3b0b8a..c873bb5be0 100644 --- a/main/test_utils.py +++ b/main/test_utils.py @@ -137,7 +137,7 @@ def list_of_dicts(specialty_dict_iter): return list(map(dict, specialty_dict_iter)) -def set_request_session(request, session_dict): +def set_request_session(mocker, request, session_dict): """ Sets session variables on a RequestFactory object Args: @@ -147,7 +147,8 @@ def set_request_session(request, session_dict): Returns: RequestFactory: The same request object with session variables set """ - middleware = SessionMiddleware() + get_response = mocker.MagicMock() + middleware = SessionMiddleware(get_response) middleware.process_request(request) for key, value in session_dict.items(): request.session[key] = value