From 53e1d9c6c4363a34bb77d4b69bb456de1cbe184f Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Thu, 10 Aug 2023 11:20:26 +0200 Subject: [PATCH] Tests: Fix improper cleanup of SITE_URL --- src/tests/helpers/test_urls.py | 16 ++++++++-------- src/tests/multidomain/test_middlewares.py | 2 -- src/tests/multidomain/test_plugin_handler.py | 2 -- src/tests/multidomain/test_templatetag.py | 2 -- src/tests/multidomain/test_urlreverse.py | 3 --- src/tests/presale/test_widget.py | 5 ----- 6 files changed, 8 insertions(+), 22 deletions(-) diff --git a/src/tests/helpers/test_urls.py b/src/tests/helpers/test_urls.py index 32782d79e0..300a731e6f 100644 --- a/src/tests/helpers/test_urls.py +++ b/src/tests/helpers/test_urls.py @@ -20,19 +20,19 @@ # . # from django import urls -from django.conf import settings +from django.test import override_settings from pretix.helpers.urls import build_absolute_uri def test_site_url_domain(): - settings.SITE_URL = 'https://example.com' - assert build_absolute_uri('control:auth.login') == 'https://example.com/control/login' + with override_settings(SITE_URL='https://example.com'): + assert build_absolute_uri('control:auth.login') == 'https://example.com/control/login' def test_site_url_subpath(): - 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' - urls.set_script_prefix(old_prefix) + 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' + urls.set_script_prefix(old_prefix) diff --git a/src/tests/multidomain/test_middlewares.py b/src/tests/multidomain/test_middlewares.py index 3b1bd05ef2..f96690bc8a 100644 --- a/src/tests/multidomain/test_middlewares.py +++ b/src/tests/multidomain/test_middlewares.py @@ -20,7 +20,6 @@ # . # import pytest -from django.conf import settings from django.test.utils import override_settings from django.utils.timezone import now @@ -36,7 +35,6 @@ def env(): date_from=now(), live=True ) event.get_cache().clear() - settings.SITE_URL = 'http://example.com' return o, event diff --git a/src/tests/multidomain/test_plugin_handler.py b/src/tests/multidomain/test_plugin_handler.py index 9866a8db80..384765ef35 100644 --- a/src/tests/multidomain/test_plugin_handler.py +++ b/src/tests/multidomain/test_plugin_handler.py @@ -20,7 +20,6 @@ # . # import pytest -from django.conf import settings from django.utils.timezone import now from pretix.base.models import Event, Organizer @@ -33,7 +32,6 @@ def event(): organizer=o, name='MRMCD2015', slug='2015', date_from=now(), ) - settings.SITE_URL = 'http://example.com' return event diff --git a/src/tests/multidomain/test_templatetag.py b/src/tests/multidomain/test_templatetag.py index ba3b24248c..ef7d32c42c 100644 --- a/src/tests/multidomain/test_templatetag.py +++ b/src/tests/multidomain/test_templatetag.py @@ -20,7 +20,6 @@ # . # import pytest -from django.conf import settings from django.template import Context, Template, TemplateSyntaxError from django.urls import NoReverseMatch from django.utils.timezone import now @@ -36,7 +35,6 @@ def env(): organizer=o, name='MRMCD2015', slug='2015', date_from=now() ) - settings.SITE_URL = 'http://example.com' event.get_cache().clear() return o, event diff --git a/src/tests/multidomain/test_urlreverse.py b/src/tests/multidomain/test_urlreverse.py index de30fcfa9b..c323cd4269 100644 --- a/src/tests/multidomain/test_urlreverse.py +++ b/src/tests/multidomain/test_urlreverse.py @@ -20,7 +20,6 @@ # . # import pytest -from django.conf import settings from django.test import override_settings from django.utils.timezone import now from django_scopes import scopes_disabled @@ -38,7 +37,6 @@ def env(): organizer=o, name='MRMCD2015', slug='2015', date_from=now() ) - settings.SITE_URL = 'http://example.com' event.get_cache().clear() return o, event @@ -99,7 +97,6 @@ def test_event_org_domain_keep_port(env): @pytest.mark.django_db def test_event_org_domain_keep_scheme(env): with override_settings(SITE_URL='https://example.com'): - settings.SITE_URL = 'https://example.com' KnownDomain.objects.create(domainname='foobar', organizer=env[0]) assert eventreverse(env[1], 'presale:event.index') == 'https://foobar/2015/' diff --git a/src/tests/presale/test_widget.py b/src/tests/presale/test_widget.py index e04e51fd65..8db0b33b77 100644 --- a/src/tests/presale/test_widget.py +++ b/src/tests/presale/test_widget.py @@ -582,7 +582,6 @@ class WidgetCartTest(CartTestMixin, TestCase): response = self.client.get('/%s/%s/widget/product_list' % (self.orga.slug, self.event.slug)) data = json.loads(response.content.decode()) - settings.SITE_URL = 'http://example.com' assert data == { 'list_type': 'list', 'name': '30C3', @@ -610,7 +609,6 @@ class WidgetCartTest(CartTestMixin, TestCase): self.event.subevents.create(name="Hidden", active=True, is_public=False, date_from=now() + datetime.timedelta(days=3)) response = self.client.get('/%s/%s/widget/product_list?style=calendar' % (self.orga.slug, self.event.slug)) - settings.SITE_URL = 'http://example.com' data = json.loads(response.content.decode()) assert data == { 'list_type': 'calendar', @@ -686,7 +684,6 @@ class WidgetCartTest(CartTestMixin, TestCase): self.event.subevents.create(name="Hidden", active=True, is_public=False, date_from=now() + datetime.timedelta(days=3)) response = self.client.get('/%s/%s/widget/product_list?style=week' % (self.orga.slug, self.event.slug)) - settings.SITE_URL = 'http://example.com' data = json.loads(response.content.decode()) assert data == { 'list_type': 'week', @@ -730,7 +727,6 @@ class WidgetCartTest(CartTestMixin, TestCase): self.event.subevents.create(name="Disabled", active=False, date_from=now() + datetime.timedelta(days=3)) self.event.subevents.create(name="Hidden", active=True, is_public=False, date_from=now() + datetime.timedelta(days=3)) - settings.SITE_URL = 'http://example.com' response = self.client.get('/%s/widget/product_list' % (self.orga.slug,)) data = json.loads(response.content.decode()) assert data == { @@ -773,7 +769,6 @@ class WidgetCartTest(CartTestMixin, TestCase): self.event.subevents.create(name="Hidden", active=True, is_public=False, date_from=now() + datetime.timedelta(days=3)) response = self.client.get('/%s/widget/product_list?style=calendar' % (self.orga.slug,)) - settings.SITE_URL = 'http://example.com' data = json.loads(response.content.decode()) assert data == { 'date': '2019-01-01',