Prefix all fixtures with "django_"

Author: blueyed

Diff for: pytest_django/fixtures.py

@@ -15,17 +15,17 @@
 
 __all__ = [
     "django_db_setup",
-    "db",
-    "transactional_db",
+    "django_db",
+    "django_transactional_db",
     "django_db_reset_sequences",
-    "admin_user",
+    "django_admin_user",
     "django_user_model",
     "django_username_field",
-    "client",
-    "admin_client",
-    "rf",
-    "settings",
-    "live_server",
+    "django_client",
+    "django_admin_client",
+    "django_rf",
+    "django_settings",
+    "django_live_server",
     "_live_server_helper",
     "django_assert_num_queries",
     "django_assert_max_num_queries",
@@ -157,7 +157,7 @@ def _disable_native_migrations():
 
 
 @pytest.fixture(scope="function")
-def db(request, django_db_setup, django_db_blocker):
+def django_db(request, django_db_setup, django_db_blocker):
     """Require a django test database.
 
     This database will be setup with the default fixtures and will have
@@ -183,7 +183,7 @@ def db(request, django_db_setup, django_db_blocker):
 
 
 @pytest.fixture(scope="function")
-def transactional_db(request, django_db_setup, django_db_blocker):
+def django_transactional_db(request, django_db_setup, django_db_blocker):
     """Require a django test database with transaction support.
 
     This will re-initialise the django database for each test and is
@@ -220,7 +220,7 @@ def django_db_reset_sequences(request, django_db_setup, django_db_blocker):
 
 
 @pytest.fixture()
-def client():
+def django_client():
     """A Django test client instance."""
     skip_if_no_django()
 
@@ -244,7 +244,7 @@ def django_username_field(django_user_model):
 
 
 @pytest.fixture()
-def admin_user(db, django_user_model, django_username_field):
+def django_admin_user(db, django_user_model, django_username_field):
     """A Django admin user.
 
     This uses an existing user with username "admin", or creates a new one with
@@ -267,7 +267,7 @@ def admin_user(db, django_user_model, django_username_field):
 
 
 @pytest.fixture()
-def admin_client(db, admin_user):
+def django_admin_client(db, admin_user):
     """A Django test client logged in as an admin user."""
     from django.test.client import Client
 
@@ -277,7 +277,7 @@ def admin_client(db, admin_user):
 
 
 @pytest.fixture()
-def rf():
+def django_rf():
     """RequestFactory instance"""
     skip_if_no_django()
 
@@ -320,7 +320,7 @@ def finalize(self):
 
 
 @pytest.yield_fixture()
-def settings():
+def django_settings():
     """A Django settings object which restores changes after the testrun"""
     skip_if_no_django()
 
@@ -330,7 +330,7 @@ def settings():
 
 
 @pytest.fixture(scope="session")
-def live_server(request):
+def django_live_server(request):
     """Run a live Django server in the background during tests
 
     The address the server is started from is taken from the

Diff for: pytest_django/plugin.py

@@ -24,17 +24,18 @@
 from .fixtures import django_db_modify_db_settings  # noqa
 from .fixtures import django_db_modify_db_settings_xdist_suffix  # noqa
 from .fixtures import _live_server_helper  # noqa
-from .fixtures import admin_client  # noqa
-from .fixtures import admin_user  # noqa
-from .fixtures import client  # noqa
-from .fixtures import db  # noqa
+from .fixtures import django_admin_client  # noqa
+from .fixtures import django_admin_user  # noqa
+from .fixtures import django_client  # noqa
+from .fixtures import django_db  # noqa
 from .fixtures import django_user_model  # noqa
 from .fixtures import django_username_field  # noqa
-from .fixtures import live_server  # noqa
+from .fixtures import django_live_server  # noqa
 from .fixtures import django_db_reset_sequences  # noqa
-from .fixtures import rf  # noqa
-from .fixtures import settings  # noqa
-from .fixtures import transactional_db  # noqa
+from .fixtures import django_rf  # noqa
+from .fixtures import django_settings
+from .fixtures import django_transactional_db  # noqa
+
 
 from .lazy_django import django_settings_is_configured, skip_if_no_django
 
@@ -44,6 +45,17 @@
     import pathlib2 as pathlib
 
 
+# For backward compatibility.
+admin_client = django_admin_client
+admin_user = django_admin_user
+client = django_client
+db = django_db
+live_server = django_live_server
+rf = django_rf
+settings = django_settings
+transactional_db = django_transactional_db
+
+
 SETTINGS_MODULE_ENV = "DJANGO_SETTINGS_MODULE"
 CONFIGURATION_ENV = "DJANGO_CONFIGURATION"
 INVALID_TEMPLATE_VARS_ENV = "FAIL_INVALID_TEMPLATE_VARS"