CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-06 15:24:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Integrate django-scopes (#1319)

Browse Source 
* Install django-scopes

* Fix tests.api

* Update tasks and cronjobs

* Fix remaining tests

* Remove unused import

* Fix tests after rebase

* Disable scopes for get_Events_with_any_permission

* Disable scopes for a management command
This commit is contained in:
Raphael Michel
2019-06-17 10:46:55 +02:00
committed by GitHub
parent b1db5dbb3e
commit d85ddb5bda
130 changed files with 6253 additions and 4509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/tests/plugins/badges/test_control.py
View File

@@ -1,5 +1,6 @@
import datetime
from django_scopes import scopes_disabled
from tests.base import SoupTest, extract_form_fields
from pretix.base.models import Event, Item, Organizer, Team, User
@@ -36,8 +37,9 @@ class BadgeLayoutFormTest(SoupTest):
)
def test_set_default(self):
bl1 = self.event1.badge_layouts.create(name="Layout 1", default=True)
bl2 = self.event1.badge_layouts.create(name="Layout 2")
with scopes_disabled():
bl1 = self.event1.badge_layouts.create(name="Layout 1", default=True)
bl2 = self.event1.badge_layouts.create(name="Layout 2")
self.post_doc('/control/event/%s/%s/badges/%s/default' % (self.orga1.slug, self.event1.slug, bl2.id), {})
bl1.refresh_from_db()
assert not bl1.default
@@ -45,21 +47,24 @@ class BadgeLayoutFormTest(SoupTest):
assert bl2.default
def test_delete(self):
bl1 = self.event1.badge_layouts.create(name="Layout 1", default=True)
bl2 = self.event1.badge_layouts.create(name="Layout 2")
with scopes_disabled():
bl1 = self.event1.badge_layouts.create(name="Layout 1", default=True)
bl2 = self.event1.badge_layouts.create(name="Layout 2")
doc = self.get_doc('/control/event/%s/%s/badges/%s/delete' % (self.orga1.slug, self.event1.slug, bl1.id))
form_data = extract_form_fields(doc.select('.container-fluid form')[0])
doc = self.post_doc('/control/event/%s/%s/badges/%s/delete' % (self.orga1.slug, self.event1.slug, bl1.id),
form_data)
assert doc.select(".alert-success")
self.assertNotIn("Layout 1", doc.select("#page-wrapper")[0].text)
assert self.event1.badge_layouts.count() == 1
with scopes_disabled():
assert self.event1.badge_layouts.count() == 1
bl2.refresh_from_db()
assert bl2.default
def test_set_on_item(self):
self.event1.badge_layouts.create(name="Layout 1", default=True)
bl2 = self.event1.badge_layouts.create(name="Layout 2")
with scopes_disabled():
self.event1.badge_layouts.create(name="Layout 1", default=True)
bl2 = self.event1.badge_layouts.create(name="Layout 2")
self.client.post('/control/event/%s/%s/items/%d/' % (self.orga1.slug, self.event1.slug, self.item1.id), {
'name_0': 'Standard',
'default_price': '23.00',
@@ -69,7 +74,8 @@ class BadgeLayoutFormTest(SoupTest):
'badgeitem-layout': bl2.pk,
'sales_channels': 'web',
})
assert BadgeItem.objects.get(item=self.item1, layout=bl2)
with scopes_disabled():
assert BadgeItem.objects.get(item=self.item1, layout=bl2)
self.client.post('/control/event/%s/%s/items/%d/' % (self.orga1.slug, self.event1.slug, self.item1.id), {
'name_0': 'Standard',
'default_price': '23.00',
@@ -78,11 +84,13 @@ class BadgeLayoutFormTest(SoupTest):
'allow_cancel': 'yes',
'sales_channels': 'web',
})
assert not BadgeItem.objects.filter(item=self.item1, layout=bl2).exists()
with scopes_disabled():
assert not BadgeItem.objects.filter(item=self.item1, layout=bl2).exists()
def test_item_copy(self):
bl2 = self.event1.badge_layouts.create(name="Layout 2")
BadgeItem.objects.create(item=self.item1, layout=bl2)
with scopes_disabled():
bl2 = self.event1.badge_layouts.create(name="Layout 2")
BadgeItem.objects.create(item=self.item1, layout=bl2)
self.client.post('/control/event/%s/%s/items/add' % (self.orga1.slug, self.event1.slug), {
'name_0': 'Intermediate',
'default_price': '23.00',
@@ -90,13 +98,15 @@ class BadgeLayoutFormTest(SoupTest):
'copy_from': str(self.item1.pk),
'has_variations': '1'
})
i_new = Item.objects.get(name__icontains='Intermediate')
assert BadgeItem.objects.get(item=i_new, layout=bl2)
assert BadgeItem.objects.get(item=self.item1, layout=bl2)
with scopes_disabled():
i_new = Item.objects.get(name__icontains='Intermediate')
assert BadgeItem.objects.get(item=i_new, layout=bl2)
assert BadgeItem.objects.get(item=self.item1, layout=bl2)
def test_copy_event(self):
bl2 = self.event1.badge_layouts.create(name="Layout 2")
BadgeItem.objects.create(item=self.item1, layout=bl2)
with scopes_disabled():
bl2 = self.event1.badge_layouts.create(name="Layout 2")
BadgeItem.objects.create(item=self.item1, layout=bl2)
self.post_doc('/control/events/add', {
'event_wizard-current_step': 'foundation',
'event_wizard-prefix': 'event_wizard',
@@ -124,7 +134,8 @@ class BadgeLayoutFormTest(SoupTest):
'copy-copy_from_event': self.event1.pk
})
ev = Event.objects.get(slug='33c3')
i_new = ev.items.first()
bl_new = ev.badge_layouts.first()
assert BadgeItem.objects.get(item=i_new, layout=bl_new)
with scopes_disabled():
ev = Event.objects.get(slug='33c3')
i_new = ev.items.first()
bl_new = ev.badge_layouts.first()
assert BadgeItem.objects.get(item=i_new, layout=bl_new)

44
src/tests/plugins/badges/test_pdf.py
View File

@@ -4,6 +4,7 @@ from io import BytesIO
import pytest
from django.utils.timezone import now
from django_scopes import scope
from PyPDF2 import PdfFileReader
from pretix.base.models import (
@@ -16,27 +17,28 @@ from pretix.plugins.badges.exporters import BadgeExporter
@pytest.fixture
def env():
o = Organizer.objects.create(name='Dummy', slug='dummy')
event = Event.objects.create(
organizer=o, name='Dummy', slug='dummy',
date_from=now(), live=True
)
o1 = Order.objects.create(
code='FOOBAR', event=event, email='dummy@dummy.test',
status=Order.STATUS_PENDING,
datetime=now(), expires=now() + timedelta(days=10),
total=Decimal('13.37'),
)
shirt = Item.objects.create(event=event, name='T-Shirt', default_price=12)
shirt_red = ItemVariation.objects.create(item=shirt, default_price=14, value="Red")
OrderPosition.objects.create(
order=o1, item=shirt, variation=shirt_red,
price=12, attendee_name_parts={}, secret='1234'
)
OrderPosition.objects.create(
order=o1, item=shirt, variation=shirt_red,
price=12, attendee_name_parts={}, secret='5678'
)
return event, o1, shirt
with scope(organizer=o):
event = Event.objects.create(
organizer=o, name='Dummy', slug='dummy',
date_from=now(), live=True
)
o1 = Order.objects.create(
code='FOOBAR', event=event, email='dummy@dummy.test',
status=Order.STATUS_PENDING,
datetime=now(), expires=now() + timedelta(days=10),
total=Decimal('13.37'),
)
shirt = Item.objects.create(event=event, name='T-Shirt', default_price=12)
shirt_red = ItemVariation.objects.create(item=shirt, default_price=14, value="Red")
OrderPosition.objects.create(
order=o1, item=shirt, variation=shirt_red,
price=12, attendee_name_parts={}, secret='1234'
)
OrderPosition.objects.create(
order=o1, item=shirt, variation=shirt_red,
price=12, attendee_name_parts={}, secret='5678'
)
yield event, o1, shirt
@pytest.mark.django_db