changes in capyc directories

jefer94 · Aug 29, 2024 · 18e226f · 18e226f
1 parent d9b9b48
commit 18e226f
Show file tree

Hide file tree

Showing 30 changed files with 42 additions and 15 deletions.
diff --git a/breathecode/monitoring/tests/management/commands/tests_supervisor.py b/breathecode/monitoring/tests/management/commands/tests_supervisor.py
@@ -4,8 +4,8 @@
 import pytest
 from asgiref.sync import sync_to_async
 
-import capyc.core.pytest.fixtures as cfx
-import capyc.django.pytest.fixtures as dfx
+import capyc.pytest.core.fixtures as cfx
+import capyc.pytest.django.fixtures as dfx
 from breathecode.monitoring.models import Supervisor as SupervisorModel
 from breathecode.monitoring.models import SupervisorIssue
 from breathecode.tests.mixins.breathecode_mixin.breathecode import Breathecode

diff --git a/breathecode/payments/tests/supervisors/tests_supervise_all_consumption_sessions.py b/breathecode/payments/tests/supervisors/tests_supervise_all_consumption_sessions.py
@@ -5,8 +5,8 @@
 import pytest
 from asgiref.sync import sync_to_async
 
-import capyc.core.pytest.fixtures as cfx
-import capyc.django.pytest.fixtures as dfx
+import capyc.pytest.core.fixtures as cfx
+import capyc.pytest.django.fixtures as dfx
 from breathecode.monitoring.models import Supervisor as SupervisorModel
 from breathecode.monitoring.models import SupervisorIssue
 from breathecode.payments.supervisors import supervise_all_consumption_sessions

diff --git a/breathecode/payments/tests/tasks/tests_refund_mentoring_session.py b/breathecode/payments/tests/tasks/tests_refund_mentoring_session.py
@@ -10,7 +10,7 @@
 from django.utils import timezone
 
 from breathecode.tests.mixins.breathecode_mixin.breathecode import Breathecode
-from capyc.django.pytest.fixtures import QuerySet
+from capyc.pytest.django.fixtures import QuerySet
 
 from ...tasks import refund_mentoring_session
 

diff --git a/breathecode/payments/tests/urls/tests_me_service_slug_consumptionsession.py b/breathecode/payments/tests/urls/tests_me_service_slug_consumptionsession.py
@@ -6,7 +6,7 @@
 from rest_framework import status
 
 from breathecode.tests.mixins.breathecode_mixin.breathecode import Breathecode
-from capyc.rest_framework.pytest import fixtures as rfx
+from capyc.pytest.rest_framework import fixtures as rfx
 
 
 @pytest.fixture(autouse=True)

diff --git a/capyc/circuitbreaker/pytest/__init__.py → capyc/pytest/circuitbreaker/__init__.py b/capyc/circuitbreaker/pytest/__init__.py → capyc/pytest/circuitbreaker/__init__.py
diff --git a/...ircuitbreaker/pytest/fixtures/__init__.py → ...ytest/circuitbreaker/fixtures/__init__.py b/...ircuitbreaker/pytest/fixtures/__init__.py → ...ytest/circuitbreaker/fixtures/__init__.py
diff --git a/...pytest/fixtures/dont_close_the_circuit.py → ...reaker/fixtures/dont_close_the_circuit.py b/...pytest/fixtures/dont_close_the_circuit.py → ...reaker/fixtures/dont_close_the_circuit.py
diff --git a/capyc/core/pytest/__init__.py → capyc/pytest/core/__init__.py b/capyc/core/pytest/__init__.py → capyc/pytest/core/__init__.py
diff --git a/capyc/core/pytest/fixtures/__init__.py → capyc/pytest/core/fixtures/__init__.py b/capyc/core/pytest/fixtures/__init__.py → capyc/pytest/core/fixtures/__init__.py
diff --git a/...core/pytest/fixtures/clean_environment.py → ...pytest/core/fixtures/clean_environment.py b/...core/pytest/fixtures/clean_environment.py → ...pytest/core/fixtures/clean_environment.py
diff --git a/capyc/core/pytest/fixtures/fake.py → capyc/pytest/core/fixtures/fake.py b/capyc/core/pytest/fixtures/fake.py → capyc/pytest/core/fixtures/fake.py
diff --git a/capyc/core/pytest/fixtures/format.py → capyc/pytest/core/fixtures/format.py b/capyc/core/pytest/fixtures/format.py → capyc/pytest/core/fixtures/format.py
diff --git a/capyc/core/pytest/fixtures/image.py → capyc/pytest/core/fixtures/image.py b/capyc/core/pytest/fixtures/image.py → capyc/pytest/core/fixtures/image.py
diff --git a/.../core/pytest/fixtures/no_http_requests.py → .../pytest/core/fixtures/no_http_requests.py b/.../core/pytest/fixtures/no_http_requests.py → .../pytest/core/fixtures/no_http_requests.py
diff --git a/capyc/core/pytest/fixtures/random.py → capyc/pytest/core/fixtures/random.py b/capyc/core/pytest/fixtures/random.py → capyc/pytest/core/fixtures/random.py
diff --git a/capyc/core/pytest/fixtures/seed.py → capyc/pytest/core/fixtures/seed.py b/capyc/core/pytest/fixtures/seed.py → capyc/pytest/core/fixtures/seed.py
diff --git a/capyc/django/pytest/__init__.py → capyc/pytest/django/__init__.py b/capyc/django/pytest/__init__.py → capyc/pytest/django/__init__.py
@@ -1,5 +1,5 @@
 """Centralized Breathecode fixtures for all our libraries."""
 
-from capyc.core.pytest import *  # noqa: F401
+from capyc.pytest.core import *  # noqa: F401
 
 from .fixtures import *  # noqa: F401
diff --git a/capyc/django/pytest/fixtures/__init__.py → capyc/pytest/django/fixtures/__init__.py b/capyc/django/pytest/fixtures/__init__.py → capyc/pytest/django/fixtures/__init__.py
diff --git a/capyc/django/pytest/fixtures/database.py → capyc/pytest/django/fixtures/database.py b/capyc/django/pytest/fixtures/database.py → capyc/pytest/django/fixtures/database.py
diff --git a/capyc/django/pytest/fixtures/queryset.py → capyc/pytest/django/fixtures/queryset.py b/capyc/django/pytest/fixtures/queryset.py → capyc/pytest/django/fixtures/queryset.py
diff --git a/capyc/django/pytest/fixtures/signals.py → capyc/pytest/django/fixtures/signals.py b/capyc/django/pytest/fixtures/signals.py → capyc/pytest/django/fixtures/signals.py
diff --git a/capyc/newrelic/pytest/__init__.py → capyc/pytest/newrelic/__init__.py b/capyc/newrelic/pytest/__init__.py → capyc/pytest/newrelic/__init__.py
diff --git a/capyc/newrelic/pytest/fixtures/__init__.py → capyc/pytest/newrelic/fixtures/__init__.py b/capyc/newrelic/pytest/fixtures/__init__.py → capyc/pytest/newrelic/fixtures/__init__.py
diff --git a/...elic/pytest/fixtures/disable_new_relic.py → ...st/newrelic/fixtures/disable_new_relic.py b/...elic/pytest/fixtures/disable_new_relic.py → ...st/newrelic/fixtures/disable_new_relic.py
diff --git a/...ytest/fixtures/disable_newrelic_prints.py → ...relic/fixtures/disable_newrelic_prints.py b/...ytest/fixtures/disable_newrelic_prints.py → ...relic/fixtures/disable_newrelic_prints.py
diff --git a/capyc/pytest/rest_framework/__init__.py b/capyc/pytest/rest_framework/__init__.py
@@ -0,0 +1,5 @@
+"""Centralized Breathecode fixtures for all our libraries."""
+
+from capyc.pytest.django import *  # noqa: F401
+
+from .fixtures import *  # noqa: F401
diff --git a/capyc/pytest/rest_framework/fixtures/__init__.py b/capyc/pytest/rest_framework/fixtures/__init__.py
@@ -0,0 +1,3 @@
+"""Centralized Breathecode fixtures for all our libraries."""
+
+from .client import *  # noqa: F401
diff --git a/capyc/pytest/rest_framework/fixtures/client.py b/capyc/pytest/rest_framework/fixtures/client.py
@@ -0,0 +1,19 @@
+"""
+QuerySet fixtures.
+"""
+
+import pytest
+from adrf.test import AsyncAPIClient as AsyncClient
+from rest_framework.test import APIClient as Client
+
+__all__ = ["client", "aclient", "Client", "AsyncClient"]
+
+
+@pytest.fixture
+def client():
+    return Client()
+
+
+@pytest.fixture
+def aclient():
+    return AsyncClient()
diff --git a/capyc/rest_framework/pytest/__init__.py b/capyc/rest_framework/pytest/__init__.py
@@ -1,5 +1,5 @@
 """Centralized Breathecode fixtures for all our libraries."""
 
-from capyc.django.pytest import *  # noqa: F401
+from capyc.pytest.django import *  # noqa: F401
 
 from .fixtures import *  # noqa: F401
diff --git a/conftest.py b/conftest.py
@@ -10,19 +10,19 @@
 
 from breathecode.notify.utils.hook_manager import HookManagerClass
 from breathecode.utils.exceptions import TestError
-from capyc.core.pytest.fixtures import Random
-from capyc.django.pytest.fixtures.signals import Signals
+from capyc.pytest.core.fixtures import Random
+from capyc.pytest.django.fixtures.signals import Signals
 
 # set ENV as test before run django
 os.environ["ENV"] = "test"
 os.environ["DATABASE_URL"] = "sqlite:///:memory:"
 
 pytest_plugins = (
-    "capyc.core.pytest",
-    "capyc.newrelic.pytest",
-    "capyc.django.pytest",
-    "capyc.rest_framework.pytest",
-    "capyc.circuitbreaker.pytest",
+    "capyc.pytest.core",
+    "capyc.pytest.newrelic",
+    "capyc.pytest.django",
+    "capyc.pytest.rest_framework",
+    "capyc.pytest.circuitbreaker",
 )
 
 from breathecode.tests.mixins.breathecode_mixin import Breathecode
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		"""Centralized Breathecode fixtures for all our libraries."""

		from .client import * # noqa: F401