From 95085f4097f2584d681858a99a50bef460e9f5cd Mon Sep 17 00:00:00 2001 From: Andrew Roberts Date: Tue, 16 Jul 2024 17:42:21 +0100 Subject: [PATCH 1/3] Fix use of global assert_all_requests_are_fired --- responses/__init__.py | 4 +++- responses/tests/test_responses.py | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/responses/__init__.py b/responses/__init__.py index 097e61ee..aa41c930 100644 --- a/responses/__init__.py +++ b/responses/__init__.py @@ -202,6 +202,8 @@ def get_wrapped( Wrapped function """ + if assert_all_requests_are_fired is None: + assert_all_requests_are_fired = mock.assert_all_requests_are_fired assert_mock = std_mock.patch.object( target=responses, attribute="assert_all_requests_are_fired", @@ -1014,7 +1016,7 @@ def activate( func: Optional["_F"] = None, *, registry: Optional[Type[Any]] = None, - assert_all_requests_are_fired: bool = False, + assert_all_requests_are_fired: bool | None = None, ) -> Union[Callable[["_F"], "_F"], "_F"]: if func is not None: return get_wrapped(func, self) diff --git a/responses/tests/test_responses.py b/responses/tests/test_responses.py index 9088ff3f..970bd247 100644 --- a/responses/tests/test_responses.py +++ b/responses/tests/test_responses.py @@ -1192,6 +1192,25 @@ def test_some_second_function(): assert_reset() +def test_assert_all_requests_fired_global(): + try: + old_value = responses.mock.assert_all_requests_are_fired + responses.mock.assert_all_requests_are_fired = True + + @responses.activate + def test_some_function(): + # Not all mocks are called so we'll get an AssertionError + responses.add(responses.GET, "http://other_url", json={}) + responses.add(responses.GET, "http://some_api", json={}) + requests.get("http://some_api") + + with pytest.raises(AssertionError): + test_some_function() + assert_reset() + finally: + responses.mock.assert_all_requests_are_fired = old_value + + def test_allow_redirects_samehost(): redirecting_url = "http://example.com" final_url_path = "/1" From 350cbb611d98d2deed9cbe884fdaf79984f6cd8d Mon Sep 17 00:00:00 2001 From: Andrew Roberts Date: Thu, 18 Jul 2024 16:54:31 +0100 Subject: [PATCH 2/3] Use Optional Co-authored-by: Mark Story --- responses/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/responses/__init__.py b/responses/__init__.py index aa41c930..e5fd5f95 100644 --- a/responses/__init__.py +++ b/responses/__init__.py @@ -1016,7 +1016,7 @@ def activate( func: Optional["_F"] = None, *, registry: Optional[Type[Any]] = None, - assert_all_requests_are_fired: bool | None = None, + assert_all_requests_are_fired: Optional[bool] = None, ) -> Union[Callable[["_F"], "_F"], "_F"]: if func is not None: return get_wrapped(func, self) From 01360a7019e4bb4a2fbd769f01f6529e860d0c95 Mon Sep 17 00:00:00 2001 From: Andrew Roberts Date: Sat, 10 Aug 2024 22:32:08 +0100 Subject: [PATCH 3/3] mock -> responses --- responses/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/responses/__init__.py b/responses/__init__.py index e5fd5f95..c82ff6a8 100644 --- a/responses/__init__.py +++ b/responses/__init__.py @@ -203,7 +203,7 @@ def get_wrapped( """ if assert_all_requests_are_fired is None: - assert_all_requests_are_fired = mock.assert_all_requests_are_fired + assert_all_requests_are_fired = responses.assert_all_requests_are_fired assert_mock = std_mock.patch.object( target=responses, attribute="assert_all_requests_are_fired",