aboutsummaryrefslogtreecommitdiff
path: root/test_utils
diff options
context:
space:
mode:
Diffstat (limited to 'test_utils')
-rw-r--r--test_utils/managers/gr/conftest.py2
-rw-r--r--test_utils/managers/thl/conftest.py5
-rw-r--r--test_utils/models/gr/conftest.py14
3 files changed, 15 insertions, 6 deletions
diff --git a/test_utils/managers/gr/conftest.py b/test_utils/managers/gr/conftest.py
index cc1053c..09e08f5 100644
--- a/test_utils/managers/gr/conftest.py
+++ b/test_utils/managers/gr/conftest.py
@@ -29,6 +29,8 @@ if TYPE_CHECKING:
@pytest.fixture(scope="session")
def gr_redis_config_db() -> str:
+ # need to update 'databases' in /etc/redis/redis.conf
+ # or this won't work and you'll have no indication why ...
return str(randint(99, 1_023))
diff --git a/test_utils/managers/thl/conftest.py b/test_utils/managers/thl/conftest.py
index 8ca4383..98dd574 100644
--- a/test_utils/managers/thl/conftest.py
+++ b/test_utils/managers/thl/conftest.py
@@ -93,6 +93,11 @@ def thl_redis_config(
@pytest.fixture(scope="session")
+def thl_redis_client(thl_redis_config):
+ return thl_redis_config.create_redis_client()
+
+
+@pytest.fixture(scope="session")
def thl_web_rr(django_db_factory: Callable[..., PostgresDsn]) -> PostgresConfig:
_dsn = django_db_factory("generalresearch.thl_django")
diff --git a/test_utils/models/gr/conftest.py b/test_utils/models/gr/conftest.py
index 1dbea0c..a48656b 100644
--- a/test_utils/models/gr/conftest.py
+++ b/test_utils/models/gr/conftest.py
@@ -12,7 +12,7 @@ from pydantic_extra_types.phone_numbers import PhoneNumber
from generalresearch.models.custom_types import UUIDStr
if TYPE_CHECKING:
- from generalresearch.managers.gr.authentication import GRTokenManager, GRUserManager
+ from generalresearch.managers.gr.authentication import GRUserManager
from generalresearch.managers.gr.business import (
BusinessAddressManager,
BusinessBankAccountManager,
@@ -289,9 +289,9 @@ def gr_user_token_factory(
gr_user.prefetch_token(pg_config=gr_db)
res = gr_user.token
- assert (
- res is not None
- ), "GRToken should exist after creation and prefetching"
+ assert res is not None, (
+ "GRToken should exist after creation and prefetching"
+ )
return res
else:
@@ -335,8 +335,10 @@ def gr_membership_factory(
@pytest.fixture()
-def gr_membership(gr_membership_factory: Callable[..., Membership]) -> Membership:
- return gr_membership_factory(save=True)
+def gr_membership(
+ gr_membership_factory: Callable[..., Membership], gr_team: Team, gr_user: GRUser
+) -> Membership:
+ return gr_membership_factory(gr_team=gr_team, gr_user=gr_user, save=True)
@pytest.fixture()