From 247b9d46e6fdfc696257c4daade9c08a195c45aa Mon Sep 17 00:00:00 2001 From: Will Frey Date: Tue, 27 Sep 2022 13:13:38 -0400 Subject: [PATCH 1/3] Expose NonCallableMagicMock in MockerFixture --- src/pytest_mock/plugin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pytest_mock/plugin.py b/src/pytest_mock/plugin.py index 0d9b95b..9554750 100644 --- a/src/pytest_mock/plugin.py +++ b/src/pytest_mock/plugin.py @@ -54,6 +54,7 @@ def __init__(self, config: Any) -> None: self.Mock = mock_module.Mock self.MagicMock = mock_module.MagicMock self.NonCallableMock = mock_module.NonCallableMock + self.NonCallableMagicMock = mock_module.NonCallableMagicMock self.PropertyMock = mock_module.PropertyMock if hasattr(mock_module, "AsyncMock"): self.AsyncMock = mock_module.AsyncMock From 4e31630aad7dca66258f232e6b62754dadd79f2b Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Wed, 28 Sep 2022 08:51:48 -0300 Subject: [PATCH 2/3] Add test for NonCallableMagicMock --- tests/test_pytest_mock.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py index 1842d6c..8033475 100644 --- a/tests/test_pytest_mock.py +++ b/tests/test_pytest_mock.py @@ -160,6 +160,7 @@ def test_mock_patch_dict_resetall(mocker: MockerFixture) -> None: "MagicMock", "Mock", "mock_open", + "NonCallableMagicMock", "NonCallableMock", "PropertyMock", "sentinel", From 64a34f64215d779dc0384acc3cdd5a164544a60a Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Wed, 28 Sep 2022 08:56:38 -0300 Subject: [PATCH 3/3] Update CHANGELOG for 3.9.0 --- CHANGELOG.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index fdca16a..e9d30b7 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,13 @@ Releases ======== +3.9.0 (2022-09-28) +------------------ + +* Expose ``NonCallableMagicMock`` via the ``mocker`` fixture (`#318`_). + +.. _#318: https://github.com/pytest-dev/pytest-mock/pull/318 + 3.8.2 (2022-07-05) ------------------