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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Add PropertyMock to mocker #32

Merged
merged 1 commit into from
Feb 20, 2016
+8 −0
Merged

Add PropertyMock to mocker #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pytest_mock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class MockFixture(object):

Mock = mock_module.Mock
MagicMock = mock_module.MagicMock
PropertyMock = mock_module.PropertyMock
ANY = mock_module.ANY

def __init__(self):
Expand Down
7 changes: 7 additions & 0 deletions test_pytest_mock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,13 @@ def test_mocker_has_magic_mock_class_as_attribute_for_instantiation():
assert isinstance(mocker.MagicMock(), mock_module.MagicMock)


def test_mocker_has_property_mock_class_as_attribute_for_instantiation():
from pytest_mock import mock_module, MockFixture

mocker = MockFixture()
assert isinstance(mocker.PropertyMock(), mock_module.PropertyMock)


def test_mocker_has_mock_class_as_attribute_for_instantiation():
from pytest_mock import mock_module, MockFixture

Expand Down