Rename confusingly named helpers for URL generation (#6280)

* Rename confusingly named helpers for URL generation

* new name

* fix old call

* Revert "new name"

This reverts commit a6e9a488b62b9bc7c2800c402e432765a838cbc6.

* New name
This commit is contained in:
Raphael Michel
2026-06-22 09:11:55 +02:00
committed by GitHub
parent 86a51afe9e
commit 5db1a5b8af
40 changed files with 180 additions and 154 deletions
+3 -3
View File
@@ -22,17 +22,17 @@
from django import urls
from django.test import override_settings
from pretix.helpers.urls import build_absolute_uri
from pretix.helpers.urls import mainreverse_absolute
def test_site_url_domain():
with override_settings(SITE_URL='https://example.com'):
assert build_absolute_uri('control:auth.login') == 'https://example.com/control/login'
assert mainreverse_absolute('control:auth.login') == 'https://example.com/control/login'
def test_site_url_subpath():
with override_settings(SITE_URL='https://example.com/presale'):
old_prefix = urls.get_script_prefix()
urls.set_script_prefix('/presale/')
assert build_absolute_uri('control:auth.login') == 'https://example.com/presale/control/login'
assert mainreverse_absolute('control:auth.login') == 'https://example.com/presale/control/login'
urls.set_script_prefix(old_prefix)
+5 -5
View File
@@ -26,7 +26,7 @@ from django_scopes import scopes_disabled
from pretix.base.models import Event, Organizer
from pretix.multidomain.models import KnownDomain
from pretix.multidomain.urlreverse import build_absolute_uri, eventreverse
from pretix.multidomain.urlreverse import eventreverse, eventreverse_absolute
from pretix.testutils.queries import assert_num_queries
@@ -248,20 +248,20 @@ def test_event_custom_domain_cache_clear(env):
@pytest.mark.django_db
def test_event_main_domain_absolute(env):
assert build_absolute_uri(env[1], 'presale:event.index') == 'http://example.com/mrmcd/2015/'
assert eventreverse_absolute(env[1], 'presale:event.index') == 'http://example.com/mrmcd/2015/'
@pytest.mark.django_db
def test_event_custom_domain_absolute(env):
KnownDomain.objects.create(domainname='foobar', organizer=env[0])
KnownDomain.objects.create(domainname='barfoo', organizer=env[0], event=env[1])
assert build_absolute_uri(env[1], 'presale:event.index') == 'http://barfoo/'
assert eventreverse_absolute(env[1], 'presale:event.index') == 'http://barfoo/'
@pytest.mark.django_db
def test_event_org_domain_absolute(env):
KnownDomain.objects.create(domainname='foobar', organizer=env[0])
assert build_absolute_uri(env[1], 'presale:event.index') == 'http://foobar/2015/'
assert eventreverse_absolute(env[1], 'presale:event.index') == 'http://foobar/2015/'
@pytest.mark.django_db
@@ -269,4 +269,4 @@ def test_event_org_alt_domain_absolute(env):
KnownDomain.objects.create(domainname='foobar', organizer=env[0])
d = KnownDomain.objects.create(domainname='altfoo', organizer=env[0], mode=KnownDomain.MODE_ORG_ALT_DOMAIN)
d.event_assignments.create(event=env[1])
assert build_absolute_uri(env[1], 'presale:event.index') == 'http://altfoo/2015/'
assert eventreverse_absolute(env[1], 'presale:event.index') == 'http://altfoo/2015/'