Add tests for style generation and propagated settings

src/tests/control/test_events.py

@@ -229,6 +229,37 @@ class EventsTest(SoupTest):
             assert self.event1.settings.get('primary_color') == '#FF0000'
             mocked.assert_any_call(args=(self.event1.pk,))
 
+    def test_display_settings_do_not_override_parent(self):
+        self.orga1.settings.primary_color = '#ff00ff'
+        with mocker_context() as mocker:
+            mocked = mocker.patch('pretix.presale.style.regenerate_css.apply_async')
+
+            doc = self.get_doc('/control/event/%s/%s/settings/display' % (self.orga1.slug, self.event1.slug))
+            data = extract_form_fields(doc.select("form")[0])
+            doc = self.post_doc('/control/event/%s/%s/settings/display' % (self.orga1.slug, self.event1.slug),
+                                data, follow=True)
+            assert doc.select('.alert-success')
+            self.event1.settings.flush()
+            assert 'primary_color' not in self.event1.settings._cache()
+            assert self.event1.settings.primary_color == self.orga1.settings.primary_color
+            mocked.assert_any_call(args=(self.event1.pk,))
+
+    def test_display_settings_explicitly_override_parent(self):
+        self.orga1.settings.primary_color = '#ff00ff'
+        with mocker_context() as mocker:
+            mocked = mocker.patch('pretix.presale.style.regenerate_css.apply_async')
+
+            doc = self.get_doc('/control/event/%s/%s/settings/display' % (self.orga1.slug, self.event1.slug))
+            data = extract_form_fields(doc.select("form")[0])
+            data['decouple'] = 'primary_color'
+            doc = self.post_doc('/control/event/%s/%s/settings/display' % (self.orga1.slug, self.event1.slug),
+                                data, follow=True)
+            assert doc.select('.alert-success')
+            self.event1.settings.flush()
+            assert 'primary_color' in self.event1.settings._cache()
+            assert self.event1.settings.primary_color == self.orga1.settings.primary_color
+            mocked.assert_any_call(args=(self.event1.pk,))
+
     def test_email_settings(self):
         with mocker_context() as mocker:
             mocked = mocker.patch('pretix.base.email.CustomSMTPBackend.test')

src/tests/control/test_organizer.py

@@ -0,0 +1,60 @@
+import datetime
+
+from tests.base import SoupTest, extract_form_fields
+
+from pretix.base.models import Event, Organizer, Team, User
+
+
+class OrganizerTest(SoupTest):
+    def setUp(self):
+        super().setUp()
+        self.user = User.objects.create_user('dummy@dummy.dummy', 'dummy')
+        self.orga1 = Organizer.objects.create(name='CCC', slug='ccc')
+        self.orga2 = Organizer.objects.create(name='MRM', slug='mrm')
+        self.event1 = Event.objects.create(
+            organizer=self.orga1, name='30C3', slug='30c3',
+            date_from=datetime.datetime(2013, 12, 26, tzinfo=datetime.timezone.utc),
+            plugins='pretix.plugins.banktransfer,tests.testdummy'
+        )
+
+        t = Team.objects.create(organizer=self.orga1, can_create_events=True, can_change_event_settings=True,
+                                can_change_items=True, can_change_organizer_settings=True)
+        t.members.add(self.user)
+        t.limit_events.add(self.event1)
+
+        self.client.login(email='dummy@dummy.dummy', password='dummy')
+
+    def test_organizer_list(self):
+        doc = self.get_doc('/control/organizers/')
+        tabletext = doc.select("#page-wrapper .table")[0].text
+        self.assertIn("CCC", tabletext)
+        self.assertNotIn("MRM", tabletext)
+
+    def test_organizer_detail(self):
+        doc = self.get_doc('/control/organizer/ccc/')
+        tabletext = doc.select("#page-wrapper .table")[0].text
+        self.assertIn("30C3", tabletext)
+
+    def test_organizer_settings(self):
+        doc = self.get_doc('/control/organizer/%s/edit' % (self.orga1.slug,))
+        doc.select("[name=name]")[0]['value'] = "CCC e.V."
+
+        doc = self.post_doc('/control/organizer/%s/edit' % (self.orga1.slug,),
+                            extract_form_fields(doc.select('.container-fluid form')[0]))
+        assert len(doc.select(".alert-success")) > 0
+        assert doc.select("[name=name]")[0]['value'] == "CCC e.V."
+        self.orga1.refresh_from_db()
+        assert self.orga1.name == "CCC e.V."
+
+    def test_organizer_display_settings(self):
+        assert not self.orga1.settings.presale_css_checksum
+        doc = self.get_doc('/control/organizer/%s/settings/display' % (self.orga1.slug,))
+        doc.select("[name=primary_color]")[0]['value'] = "#33c33c"
+
+        doc = self.post_doc('/control/organizer/%s/settings/display' % (self.orga1.slug,),
+                            extract_form_fields(doc.select('.container-fluid form')[0]))
+        assert len(doc.select(".alert-success")) > 0
+        assert doc.select("[name=primary_color]")[0]['value'] == "#33c33c"
+        self.orga1.settings.flush()
+        assert self.orga1.settings.primary_color == "#33c33c"
+        assert self.orga1.settings.presale_css_checksum

src/tests/control/test_permissions.py

@@ -96,6 +96,7 @@ event_urls = [
 organizer_urls = [
     'organizer/abc/edit',
     'organizer/abc/',
+    'organizer/abc/settings/display',
     'organizer/abc/teams',
     'organizer/abc/team/1/',
     'organizer/abc/team/1/edit',
@@ -316,6 +317,7 @@ organizer_permission_urls = [
     ("can_change_teams", "organizer/dummy/team/1/edit", 200),
     ("can_change_teams", "organizer/dummy/team/1/delete", 200),
     ("can_change_organizer_settings", "organizer/dummy/edit", 200),
+    ("can_change_organizer_settings", "organizer/dummy/settings/display", 200),
 ]