Skip to content

Refactor dummy_region fixture as function #3950

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

Merged
JoeyStk merged 1 commit into from
Oct 22, 2025
Merged

Refactor dummy_region fixture as function #3950

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
65 changes: 30 additions & 35 deletions tests/cms/views/utils/test_hix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,38 +27,35 @@

if TYPE_CHECKING:
from pytest_django.fixtures import SettingsWrapper
from pytest_django.plugin import _DatabaseBlocker # type: ignore[attr-defined]


@pytest.fixture(scope="session")
def dummy_region(django_db_setup: None, django_db_blocker: _DatabaseBlocker) -> Region:
def create_dummy_region() -> tuple[Language, Region]:
"""
Fixture to create a hix enabled dummy region, along with a dummy language.
Function to create a hix enabled dummy region, along with a dummy language.
"""
with django_db_blocker.unblock():
dummy_language = Language.objects.create(
slug="du",
bcp47_tag="du_DU",
primary_country_code="de",
)
dummy_language.save()
dummy_region = Region.objects.create(
name="HIX Test",
slug="hix-test",
status=ACTIVE,
administrative_division=MUNICIPALITY,
postal_code="12345",
admin_mail="admin@example.com",
hix_enabled=True,
)
dummy_region.save()
dummy_tree_node = LanguageTreeNode.add_root(
language=dummy_language,
region=dummy_region,
)
dummy_tree_node.save()
dummy_language = Language.objects.create(
slug="du",
bcp47_tag="du_DU",
primary_country_code="de",
)
dummy_language.save()
dummy_region = Region.objects.create(
name="HIX Test",
slug="hix-test",
status=ACTIVE,
administrative_division=MUNICIPALITY,
postal_code="12345",
admin_mail="admin@example.com",
hix_enabled=True,
)
dummy_region.save()
dummy_tree_node = LanguageTreeNode.add_root(
language=dummy_language,
region=dummy_region,
)
dummy_tree_node.save()

return dummy_region
return (dummy_language, dummy_region)


def test_hix_rounding(settings: SettingsWrapper) -> None:
Expand Down Expand Up @@ -88,9 +85,8 @@ def test_hix_rounding(settings: SettingsWrapper) -> None:
@pytest.mark.django_db
def test_disregard_archived_pages(
settings: SettingsWrapper,
dummy_region: Region,
) -> None:
dummy_language = dummy_region.default_language
dummy_language, dummy_region = create_dummy_region()
settings.TEXTLAB_API_LANGUAGES = [dummy_language.slug]

with disable_hix_post_save_signal():
Expand Down Expand Up @@ -151,9 +147,8 @@ def test_disregard_archived_pages(
@pytest.mark.django_db
def test_disregard_pages_with_hix_ignore(
settings: SettingsWrapper,
dummy_region: Region,
) -> None:
dummy_language = dummy_region.default_language
dummy_language, dummy_region = create_dummy_region()
settings.TEXTLAB_API_LANGUAGES = [dummy_language.slug]

with disable_hix_post_save_signal():
Expand Down Expand Up @@ -217,8 +212,8 @@ def test_disregard_pages_with_hix_ignore(


@pytest.mark.django_db
def test_hix_values(settings: SettingsWrapper, dummy_region: Region) -> None:
dummy_language = dummy_region.default_language
def test_hix_values(settings: SettingsWrapper) -> None:
dummy_language, dummy_region = create_dummy_region()
settings.TEXTLAB_API_LANGUAGES = [dummy_language.slug]

HIX_ROUNDING_PRECISION = 0.01
Expand Down Expand Up @@ -295,8 +290,8 @@ def test_hix_values(settings: SettingsWrapper, dummy_region: Region) -> None:


@pytest.mark.django_db
def test_versions_of_hix_page(settings: SettingsWrapper, dummy_region: Region) -> None:
dummy_language = dummy_region.default_language
def test_versions_of_hix_page(settings: SettingsWrapper) -> None:
dummy_language, dummy_region = create_dummy_region()
settings.TEXTLAB_API_LANGUAGES = [dummy_language.slug]

with disable_hix_post_save_signal():
Expand Down
Loading