Skip to content

Expose fixtures to change Django's {Transaction,}TestCase #431

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

Closed
wants to merge 2 commits into from
Closed

Expose fixtures to change Django's {Transaction,}TestCase #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04af063
Expose fixtures to change Django's {Transaction,}TestCase
blueyed Nov 21, 2016
59343a7
Merge branch 'master' into expose-django-testcase
blueyed Oct 10, 2017
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
20 changes: 16 additions & 4 deletions pytest_django/fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from .lazy_django import get_django_version, skip_if_no_django

__all__ = ['django_db_setup', 'db', 'transactional_db', 'admin_user',
'django_db_testcase', 'django_transactional_db_testcase',
'django_user_model', 'django_username_field',
'client', 'admin_client', 'rf', 'settings', 'live_server',
'_live_server_helper', 'django_assert_num_queries']
Expand Down Expand Up @@ -110,6 +111,18 @@ def teardown_database():
request.addfinalizer(teardown_database)


@pytest.fixture
def django_db_testcase(request):
from django.test import TestCase
return TestCase


@pytest.fixture
def django_transactional_db_testcase(request):
from django.test import TransactionTestCase
return TransactionTestCase


def _django_db_fixture_helper(transactional, request, django_db_blocker):
if is_django_unittest(request):
return
Expand All @@ -121,10 +134,9 @@ def _django_db_fixture_helper(transactional, request, django_db_blocker):
django_db_blocker.unblock()
request.addfinalizer(django_db_blocker.restore)

if transactional:
from django.test import TransactionTestCase as django_case
else:
from django.test import TestCase as django_case
testcase_class_fixture = ('django_transactional_db_testcase'
if transactional else 'django_db_testcase')
django_case = getfixturevalue(request, testcase_class_fixture)

test_case = django_case(methodName='__init__')
test_case._pre_setup()
Expand Down
2 changes: 2 additions & 0 deletions pytest_django/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@
from .fixtures import rf # noqa
from .fixtures import settings # noqa
from .fixtures import transactional_db # noqa
from .fixtures import django_db_testcase # noqa
from .fixtures import django_transactional_db_testcase # noqa
from .pytest_compat import getfixturevalue

from .lazy_django import (django_settings_is_configured,
Expand Down