forked from CGM_Public/pretix_original
Replace SCSS compilation with CSS variables (#4191)
* Replace SCSS compilation with CSS variables * Update tests * Update src/pretix/presale/style.py Co-authored-by: Mira <weller@rami.io> * Update src/pretix/presale/context.py Co-authored-by: Mira <weller@rami.io> * Update src/pretix/presale/views/widget.py Co-authored-by: Mira <weller@rami.io> * Update src/pretix/presale/context.py Co-authored-by: Mira <weller@rami.io> * Update src/pretix/static/pretixbase/scss/_variables.scss Co-authored-by: Richard Schreiber <schreiber@rami.io> * Last minor changes * Rename file --------- Co-authored-by: Mira <weller@rami.io> Co-authored-by: Richard Schreiber <schreiber@rami.io>
This commit is contained in:
Raphael Michel
@@ -20,15 +20,11 @@
|
||||
# <https://www.gnu.org/licenses/>.
|
||||
#
|
||||
import datetime
|
||||
import os.path
|
||||
|
||||
from django.conf import settings
|
||||
from django.test import TestCase, override_settings
|
||||
from django.test import TestCase
|
||||
from django_scopes import scopes_disabled
|
||||
|
||||
from pretix.base.models import Event, Organizer
|
||||
from pretix.multidomain.models import KnownDomain
|
||||
from pretix.presale.style import regenerate_css, regenerate_organizer_css
|
||||
|
||||
|
||||
class StyleTest(TestCase):
|
||||
@@ -44,110 +40,19 @@ class StyleTest(TestCase):
|
||||
|
||||
def test_organizer_generate_css_for_inherited_events(self):
|
||||
self.orga.settings.primary_color = "#33c33c"
|
||||
regenerate_organizer_css.apply(args=(self.orga.pk,))
|
||||
self.orga.settings.flush()
|
||||
assert self.orga.settings.presale_css_file
|
||||
with open(os.path.join(settings.MEDIA_ROOT, self.orga.settings.presale_css_file), 'r') as c:
|
||||
assert '#33c33c' in c.read()
|
||||
c = self.client.get("/ccc/theme.css").content.decode()
|
||||
assert '#33c33c' in c
|
||||
|
||||
self.event.settings.flush()
|
||||
assert self.event.settings.presale_css_file
|
||||
with open(os.path.join(settings.MEDIA_ROOT, self.event.settings.presale_css_file), 'r') as c:
|
||||
assert '#33c33c' in c.read()
|
||||
c = self.client.get("/ccc/30c3/theme.css").content.decode()
|
||||
assert '#33c33c' in c
|
||||
|
||||
def test_organizer_generate_css_only_for_inherited_events(self):
|
||||
self.orga.settings.primary_color = "#33c33c"
|
||||
self.event.settings.primary_color = "#34c34c"
|
||||
regenerate_organizer_css.apply(args=(self.orga.pk,))
|
||||
self.orga.settings.flush()
|
||||
assert self.orga.settings.presale_css_file
|
||||
with open(os.path.join(settings.MEDIA_ROOT, self.orga.settings.presale_css_file), 'r') as c:
|
||||
assert '#33c33c' in c.read()
|
||||
|
||||
self.event.settings.flush()
|
||||
assert self.event.settings.presale_css_file
|
||||
with open(os.path.join(settings.MEDIA_ROOT, self.event.settings.presale_css_file), 'r') as c:
|
||||
assert '#34c34c' not in c.read()
|
||||
assert '#33c33c' not in c.read()
|
||||
c = self.client.get("/ccc/theme.css").content.decode()
|
||||
assert '#33c33c' in c
|
||||
|
||||
def test_event_generate_css_individually(self):
|
||||
self.orga.settings.primary_color = "#33c33c"
|
||||
self.event.settings.primary_color = "#34c34c"
|
||||
regenerate_css.apply(args=(self.event.pk,))
|
||||
|
||||
self.event.settings.flush()
|
||||
assert self.event.settings.presale_css_file
|
||||
with open(os.path.join(settings.MEDIA_ROOT, self.event.settings.presale_css_file), 'r') as c:
|
||||
assert '#34c34c' in c.read()
|
||||
assert '#33c33c' not in c.read()
|
||||
|
||||
regenerate_organizer_css.apply(args=(self.orga.pk,))
|
||||
|
||||
self.event.settings.flush()
|
||||
assert self.event.settings.presale_css_file
|
||||
with open(os.path.join(settings.MEDIA_ROOT, self.event.settings.presale_css_file), 'r') as c:
|
||||
assert '#34c34c' in c.read()
|
||||
assert '#33c33c' not in c.read()
|
||||
|
||||
def test_event_generate_css_new_file(self):
|
||||
self.event.settings.primary_color = "#34c34c"
|
||||
regenerate_css.apply(args=(self.event.pk,))
|
||||
|
||||
self.event.settings.flush()
|
||||
fname = self.event.settings.presale_css_file
|
||||
|
||||
self.event.settings.primary_color = "#ff00ff"
|
||||
regenerate_css.apply(args=(self.event.pk,))
|
||||
self.event.settings.flush()
|
||||
assert self.event.settings.presale_css_file != fname
|
||||
|
||||
def test_event_generate_css_cache_file(self):
|
||||
self.event.settings.primary_color = "#34c34c"
|
||||
regenerate_css.apply(args=(self.event.pk,))
|
||||
|
||||
self.event.settings.flush()
|
||||
fname = self.event.settings.presale_css_file
|
||||
|
||||
self.event.settings.primary_color = "#34c34c"
|
||||
regenerate_css.apply(args=(self.event.pk,))
|
||||
self.event.settings.flush()
|
||||
assert self.event.settings.presale_css_file == fname
|
||||
|
||||
@override_settings(
|
||||
MEDIA_URL="https://usercontent.pretix.space/media/",
|
||||
SITE_URL="https://pretix.eu"
|
||||
)
|
||||
def test_seperate_media_domain(self):
|
||||
self.event.settings.primary_color = "#34c34c"
|
||||
regenerate_css.apply(args=(self.event.pk,))
|
||||
self.event.settings.flush()
|
||||
with open(os.path.join(settings.MEDIA_ROOT, self.event.settings.presale_css_file), 'r') as c:
|
||||
assert 'https://pretix.eu/static/' in c.read()
|
||||
|
||||
@override_settings(
|
||||
MEDIA_URL="https://usercontent.pretix.space/media/",
|
||||
SITE_URL="https://pretix.eu"
|
||||
)
|
||||
def test_seperate_media_domain_and_organizer_domain(self):
|
||||
KnownDomain.objects.create(domainname="test.pretix.eu", organizer=self.orga)
|
||||
|
||||
self.event.settings.primary_color = "#34c34c"
|
||||
regenerate_css.apply(args=(self.event.pk,))
|
||||
self.event.settings.flush()
|
||||
with open(os.path.join(settings.MEDIA_ROOT, self.event.settings.presale_css_file), 'r') as c:
|
||||
assert 'https://test.pretix.eu/static/' in c.read()
|
||||
|
||||
@override_settings(
|
||||
STATIC_URL="https://static.pretix.files/static/",
|
||||
MEDIA_URL="https://usercontent.pretix.space/media/",
|
||||
SITE_URL="https://pretix.eu"
|
||||
)
|
||||
def test_seperate_media_domain_and_static_domain(self):
|
||||
KnownDomain.objects.create(domainname="test.pretix.eu", organizer=self.orga)
|
||||
|
||||
self.event.settings.primary_color = "#34c34c"
|
||||
regenerate_css.apply(args=(self.event.pk,))
|
||||
self.event.settings.flush()
|
||||
with open(os.path.join(settings.MEDIA_ROOT, self.event.settings.presale_css_file), 'r') as c:
|
||||
assert 'https://static.pretix.files/static/' in c.read()
|
||||
assert 'https://test.pretix.eu/static/' not in c.read()
|
||||
c = self.client.get("/ccc/30c3/theme.css").content.decode()
|
||||
assert '#34c34c' in c
|
||||
assert '#33c33c' not in c
|
||||
|
||||
@@ -31,7 +31,6 @@ from django_scopes import scopes_disabled
|
||||
from freezegun import freeze_time
|
||||
|
||||
from pretix.base.models import Order, OrderPosition
|
||||
from pretix.presale.style import regenerate_css, regenerate_organizer_css
|
||||
|
||||
from .test_cart import CartTestMixin
|
||||
|
||||
@@ -544,23 +543,23 @@ class WidgetCartTest(CartTestMixin, TestCase):
|
||||
def test_css_customized(self):
|
||||
response = self.client.get('/%s/%s/widget/v1.css' % (self.orga.slug, self.event.slug))
|
||||
c = b"".join(response.streaming_content).decode()
|
||||
assert '#7f5a91' in c
|
||||
assert '#8E44B3' in c
|
||||
assert '#33c33c' not in c
|
||||
assert '#34c34c' not in c
|
||||
|
||||
self.orga.settings.primary_color = "#33c33c"
|
||||
regenerate_organizer_css.apply(args=(self.orga.pk,))
|
||||
self.orga.cache.clear()
|
||||
response = self.client.get('/%s/%s/widget/v1.css' % (self.orga.slug, self.event.slug))
|
||||
c = b"".join(response.streaming_content).decode()
|
||||
assert '#7f5a91' not in c
|
||||
assert '#8E44B3' not in c
|
||||
assert '#33c33c' in c
|
||||
assert '#34c34c' not in c
|
||||
|
||||
self.event.settings.primary_color = "#34c34c"
|
||||
regenerate_css.apply(args=(self.event.pk,))
|
||||
self.event.cache.clear()
|
||||
response = self.client.get('/%s/%s/widget/v1.css' % (self.orga.slug, self.event.slug))
|
||||
c = b"".join(response.streaming_content).decode()
|
||||
assert '#7f5a91' not in c
|
||||
assert '#8E44B3' not in c
|
||||
assert '#33c33c' not in c
|
||||
assert '#34c34c' in c
|
||||
|
||||
|
||||
Reference in New Issue
Block a user