CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Removed CleanerVersion layer [backwards-incompatible!]

Browse Source
This commit is contained in:
Raphael Michel
2015-12-12 13:08:33 +01:00
parent 0c9c9dd22c
commit d133d2abff
85 changed files with 712 additions and 1089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tests/control/test_events.py
View File

@@ -26,16 +26,9 @@ class EventsTest(BrowserTest):
organizer=self.orga2, name='MRMCD14', slug='mrmcd14',
date_from=datetime.datetime(2014, 9, 5, tzinfo=datetime.timezone.utc),
)
self.event4 = Event.objects.create(
organizer=self.orga2, name='MRMCD00', slug='mrmcd00',
date_from=datetime.datetime(2000, 9, 5, tzinfo=datetime.timezone.utc),
)
self.event4.delete()
OrganizerPermission.objects.create(organizer=self.orga1, user=self.user)
EventPermission.objects.create(event=self.event1, user=self.user, can_change_items=True,
can_change_settings=True)
EventPermission.objects.create(event=self.event4, user=self.user, can_change_items=True,
can_change_settings=True)
self.driver.implicitly_wait(10)
self.driver.get('%s%s' % (self.live_server_url, '/control/login'))
username_input = self.driver.find_element_by_name("email")
@@ -51,7 +44,6 @@ class EventsTest(BrowserTest):
self.assertIn("30C3", tabletext)
self.assertNotIn("31C3", tabletext)
self.assertNotIn("MRMCD14", tabletext)
self.assertNotIn("MRMCD00", tabletext)
def test_settings(self):
self.driver.get('%s/control/event/%s/%s/settings/' % (self.live_server_url, self.orga1.slug,

63
src/tests/control/test_items.py
View File

@@ -49,9 +49,8 @@ class CategoriesTest(ItemFormTest):
def test_update(self):
c = ItemCategory.objects.create(event=self.event1, name="Entry tickets")
t1 = now()
self.driver.get('%s/control/event/%s/%s/categories/%s/' % (
self.live_server_url, self.orga1.slug, self.event1.slug, c.identity
self.live_server_url, self.orga1.slug, self.event1.slug, c.id
))
self.driver.find_element_by_name("name_0").clear()
self.driver.find_element_by_name("name_0").send_keys('T-Shirts')
@@ -59,8 +58,7 @@ class CategoriesTest(ItemFormTest):
self.driver.find_element_by_class_name("alert-success")
self.assertIn("T-Shirts", self.driver.find_element_by_css_selector("#page-wrapper table").text)
self.assertNotIn("Entry tickets", self.driver.find_element_by_css_selector("#page-wrapper table").text)
assert str(ItemCategory.objects.as_of(t1).get(identity=c.identity).name) == 'Entry tickets'
assert str(ItemCategory.objects.current.get(identity=c.identity).name) == 'T-Shirts'
assert str(ItemCategory.objects.get(id=c.id).name) == 'T-Shirts'
@unittest.skipIf('TRAVIS' in os.environ, 'See docstring for details.')
def test_sort(self):
@@ -98,15 +96,13 @@ class CategoriesTest(ItemFormTest):
def test_delete(self):
c = ItemCategory.objects.create(event=self.event1, name="Entry tickets")
t1 = now()
self.driver.get('%s/control/event/%s/%s/categories/%s/delete' % (
self.live_server_url, self.orga1.slug, self.event1.slug, c.identity
self.live_server_url, self.orga1.slug, self.event1.slug, c.id
))
self.driver.find_element_by_class_name("btn-danger").click()
self.driver.find_element_by_class_name("alert-success")
self.assertNotIn("Entry tickets", self.driver.find_element_by_css_selector("#page-wrapper table").text)
assert ItemCategory.objects.as_of(t1).filter(identity=c.identity).exists()
assert not ItemCategory.objects.current.filter(identity=c.identity).exists()
assert not ItemCategory.objects.filter(id=c.id).exists()
class PropertiesTest(ItemFormTest):
@@ -134,9 +130,8 @@ class PropertiesTest(ItemFormTest):
c = Property.objects.create(event=self.event1, name="Size")
p1 = PropertyValue.objects.create(prop=c, position=0, value="S")
p2 = PropertyValue.objects.create(prop=c, position=1, value="M")
t1 = now()
self.driver.get('%s/control/event/%s/%s/properties/%s/' % (
self.live_server_url, self.orga1.slug, self.event1.slug, c.identity
self.live_server_url, self.orga1.slug, self.event1.slug, c.id
))
self.driver.find_element_by_css_selector("#id_name_0").clear()
self.driver.find_element_by_css_selector("#id_name_0").send_keys('Color')
@@ -150,25 +145,20 @@ class PropertiesTest(ItemFormTest):
self.driver.find_element_by_class_name("alert-success")
self.assertEqual("red", self.driver.find_element_by_name("values-0-value_0").get_attribute("value"))
self.assertEqual("blue", self.driver.find_element_by_name("values-1-value_0").get_attribute("value"))
assert str(Property.objects.current.get(identity=c.identity).name) == 'Color'
assert str(PropertyValue.objects.as_of(t1).get(identity=p2.identity).value) == 'M'
assert str(PropertyValue.objects.current.get(identity=p2.identity).value) == 'red'
assert str(PropertyValue.objects.as_of(t1).get(identity=p1.identity).value) == 'S'
assert not PropertyValue.objects.current.filter(identity=p1.identity).exists()
assert str(Property.objects.as_of(t1).get(identity=c.identity).name) == 'Size'
assert str(Property.objects.get(id=c.id).name) == 'Color'
assert str(PropertyValue.objects.get(id=p2.id).value) == 'red'
assert not PropertyValue.objects.filter(id=p1.id).exists()
@unittest.skip
def test_delete(self):
c = Property.objects.create(event=self.event1, name="Size")
t1 = now()
self.driver.get('%s/control/event/%s/%s/properties/%s/delete' % (
self.live_server_url, self.orga1.slug, self.event1.slug, c.identity
self.live_server_url, self.orga1.slug, self.event1.slug, c.id
))
self.driver.find_element_by_class_name("btn-danger").click()
self.driver.find_element_by_class_name("alert-success")
self.assertNotIn("Size", self.driver.find_element_by_css_selector("#page-wrapper table").text)
assert Property.objects.as_of(t1).filter(identity=c.identity).exists()
assert not Property.objects.current.filter(identity=c.identity).exists()
assert not Property.objects.filter(id=c.id).exists()
class QuestionsTest(ItemFormTest):
@@ -185,9 +175,8 @@ class QuestionsTest(ItemFormTest):
def test_update(self):
c = Question.objects.create(event=self.event1, question="What is your shoe size?", type="N", required=True)
t1 = now()
self.driver.get('%s/control/event/%s/%s/questions/%s/' % (
self.live_server_url, self.orga1.slug, self.event1.slug, c.identity
self.live_server_url, self.orga1.slug, self.event1.slug, c.id
))
self.driver.find_element_by_name("question_0").clear()
self.driver.find_element_by_name("question_0").send_keys('How old are you?')
@@ -195,22 +184,19 @@ class QuestionsTest(ItemFormTest):
self.driver.find_element_by_class_name("alert-success")
self.assertIn("How old", self.driver.find_element_by_css_selector("#page-wrapper table").text)
self.assertNotIn("shoe size", self.driver.find_element_by_css_selector("#page-wrapper table").text)
c = Question.objects.current.get(identity=c.identity)
c = Question.objects.get(id=c.id)
self.assertTrue(c.required)
assert str(Question.objects.current.get(identity=c.identity).question) == 'How old are you?'
assert str(Question.objects.as_of(t1).get(identity=c.identity).question) == 'What is your shoe size?'
assert str(Question.objects.get(id=c.id).question) == 'How old are you?'
def test_delete(self):
c = Question.objects.create(event=self.event1, question="What is your shoe size?", type="N", required=True)
t1 = now()
self.driver.get('%s/control/event/%s/%s/questions/%s/delete' % (
self.live_server_url, self.orga1.slug, self.event1.slug, c.identity
self.live_server_url, self.orga1.slug, self.event1.slug, c.id
))
self.driver.find_element_by_class_name("btn-danger").click()
self.driver.find_element_by_class_name("alert-success")
self.assertNotIn("shoe size", self.driver.find_element_by_css_selector("#page-wrapper table").text)
assert Question.objects.as_of(t1).filter(identity=c.identity).exists()
assert not Question.objects.current.filter(identity=c.identity).exists()
assert not Question.objects.filter(id=c.id).exists()
class QuotaTest(ItemFormTest):
@@ -232,36 +218,31 @@ class QuotaTest(ItemFormTest):
prop1 = Property.objects.create(event=self.event1, name="Level", item=item2)
PropertyValue.objects.create(prop=prop1, value="Silver")
PropertyValue.objects.create(prop=prop1, value="Gold")
t1 = now()
self.driver.get('%s/control/event/%s/%s/quotas/%s/' % (
self.live_server_url, self.orga1.slug, self.event1.slug, c.identity
self.live_server_url, self.orga1.slug, self.event1.slug, c.id
))
self.driver.find_element_by_name("size").clear()
self.driver.find_element_by_name("size").send_keys('350')
# self.scroll_and_click(self.driver.find_element_by_css_selector('.panel-group .panel:nth-child(1)
# .panel-title a'))
# time.sleep(1)
self.scroll_and_click(self.driver.find_element_by_name("item_%s" % item1.identity))
self.scroll_and_click(self.driver.find_element_by_name("item_%s" % item1.id))
# self.driver.find_element_by_css_selector('.panel-group .panel:nth-child(2) .panel-title a').click()
# time.sleep(1)
self.scroll_and_click(self.driver.find_elements_by_css_selector("input[name=item_%s]" % item2.identity)[1])
self.scroll_and_click(self.driver.find_elements_by_css_selector("input[name=item_%s]" % item2.id)[1])
self.scroll_and_click(self.driver.find_element_by_class_name("btn-save"))
self.driver.find_element_by_class_name("alert-success")
self.assertIn("350", self.driver.find_element_by_css_selector("#page-wrapper table").text)
self.assertNotIn("500", self.driver.find_element_by_css_selector("#page-wrapper table").text)
assert Quota.objects.current.get(identity=c.identity).size == 350
assert Quota.objects.as_of(t1).get(identity=c.identity).size == 500
assert item1 in Quota.objects.current.get(identity=c.identity).items.all()
assert item1 not in Quota.objects.as_of(t1).get(identity=c.identity).items.all()
assert Quota.objects.get(id=c.id).size == 350
assert item1 in Quota.objects.get(id=c.id).items.all()
def test_delete(self):
c = Quota.objects.create(event=self.event1, name="Full house", size=500)
t1 = now()
self.driver.get('%s/control/event/%s/%s/quotas/%s/delete' % (
self.live_server_url, self.orga1.slug, self.event1.slug, c.identity
self.live_server_url, self.orga1.slug, self.event1.slug, c.id
))
self.driver.find_element_by_class_name("btn-danger").click()
self.driver.find_element_by_class_name("alert-success")
self.assertNotIn("Full house", self.driver.find_element_by_css_selector("#page-wrapper table").text)
assert Quota.objects.as_of(t1).filter(identity=c.identity).exists()
assert not Quota.objects.current.filter(identity=c.identity).exists()
assert not Quota.objects.filter(id=c.id).exists()

46
src/tests/control/test_orders.py
View File

@@ -60,7 +60,7 @@ def test_order_list(client, env):
assert 'FOO' in response.rendered_content
response = client.get('/control/event/dummy/dummy/orders/?item=15')
assert 'FOO' not in response.rendered_content
response = client.get('/control/event/dummy/dummy/orders/?item=%s' % env[3].identity)
response = client.get('/control/event/dummy/dummy/orders/?item=%s' % env[3].id)
assert 'FOO' in response.rendered_content
@@ -80,13 +80,13 @@ def test_order_transition_to_paid_in_time_success(client, env):
client.post('/control/event/dummy/dummy/orders/FOO/transition', {
'status': 'p'
})
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
assert o.status == Order.STATUS_PAID
@pytest.mark.django_db
def test_order_transition_to_paid_expired_quota_left(client, env):
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
o.expires = now() - timedelta(days=2)
o.save()
q = Quota.objects.create(event=env[0], size=10)
@@ -95,13 +95,13 @@ def test_order_transition_to_paid_expired_quota_left(client, env):
client.post('/control/event/dummy/dummy/orders/FOO/transition', {
'status': 'p'
})
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
assert o.status == Order.STATUS_PAID
@pytest.mark.django_db
def test_order_transition_to_paid_expired_quota_full(client, env):
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
o.expires = now() - timedelta(days=2)
o.save()
q = Quota.objects.create(event=env[0], size=0)
@@ -110,7 +110,7 @@ def test_order_transition_to_paid_expired_quota_full(client, env):
client.post('/control/event/dummy/dummy/orders/FOO/transition', {
'status': 'p'
})
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
assert o.status == Order.STATUS_PENDING
@@ -134,14 +134,14 @@ def test_order_transition_to_paid_expired_quota_full(client, env):
(Order.STATUS_REFUNDED, Order.STATUS_PENDING, False)
])
def test_order_transition(client, env, process):
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
o.status = process[0]
o.save()
client.login(email='dummy@dummy.dummy', password='dummy')
client.post('/control/event/dummy/dummy/orders/FOO/transition', {
'status': process[1]
})
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
if process[2]:
assert o.status == process[1]
else:
@@ -150,7 +150,7 @@ def test_order_transition(client, env, process):
@pytest.mark.django_db
def test_order_detail_download_buttons_hidden_if_not_paid(client, env):
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
o.status = Order.STATUS_PENDING
o.save()
env[0].settings.set('ticket_download', True)
@@ -163,7 +163,7 @@ def test_order_detail_download_buttons_hidden_if_not_paid(client, env):
@pytest.mark.django_db
def test_order_detail_download_buttons_visible(client, env):
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
o.status = Order.STATUS_PAID
o.save()
env[0].settings.set('ticket_download', True)
@@ -176,7 +176,7 @@ def test_order_detail_download_buttons_visible(client, env):
@pytest.mark.django_db
def test_order_detail_download_buttons_hidden_of(client, env):
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
o.status = Order.STATUS_PAID
o.save()
env[0].settings.set('ticket_download', False)
@@ -189,7 +189,7 @@ def test_order_detail_download_buttons_hidden_of(client, env):
@pytest.mark.django_db
def test_order_detail_download_buttons_visible_before_date(client, env):
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
o.status = Order.STATUS_PAID
o.save()
env[0].settings.set('ticket_download', True)
@@ -202,7 +202,7 @@ def test_order_detail_download_buttons_visible_before_date(client, env):
@pytest.mark.django_db
def test_order_detail_download_buttons_hidden_if_provider_disabled(client, env):
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
o.status = Order.STATUS_PAID
o.save()
env[0].settings.set('ticket_download', True)
@@ -225,7 +225,7 @@ def test_order_download_unpaid(client, env):
@pytest.mark.django_db
def test_order_download_unknown_provider(client, env):
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
o.status = Order.STATUS_PAID
o.save()
env[0].settings.set('ticket_download', True)
@@ -237,7 +237,7 @@ def test_order_download_unknown_provider(client, env):
@pytest.mark.django_db
def test_order_download_disabled_provider(client, env):
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
o.status = Order.STATUS_PAID
o.save()
env[0].settings.set('ticket_download', True)
@@ -252,7 +252,7 @@ def test_order_download_disabled_provider(client, env):
def test_order_download_success(client, env, mocker):
from pretix.base.services import tickets
mocker.patch('pretix.base.services.tickets.generate')
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
o.status = Order.STATUS_PAID
o.save()
env[0].settings.set('ticket_download', True)
@@ -261,7 +261,7 @@ def test_order_download_success(client, env, mocker):
client.login(email='dummy@dummy.dummy', password='dummy')
response = client.get('/control/event/dummy/dummy/orders/FOO/download/testdummy')
assert response.status_code == 302
tickets.generate.assert_any_call(o.identity, 'testdummy')
tickets.generate.assert_any_call(o.id, 'testdummy')
assert 'download' in response['Location']
dl = response['Location']
assert CachedTicket.objects.filter(order=o, provider='testdummy').exists()
@@ -276,7 +276,7 @@ def test_order_download_success(client, env, mocker):
@pytest.mark.django_db
def test_order_extend_not_pending(client, env):
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
o.status = Order.STATUS_PAID
o.save()
client.login(email='dummy@dummy.dummy', password='dummy')
@@ -296,13 +296,13 @@ def test_order_extend_not_expired(client, env):
'expires': newdate
}, follow=True)
assert 'alert-success' in response.rendered_content
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
assert o.expires.strftime("%Y-%m-%d %H:%M:%S") == newdate
@pytest.mark.django_db
def test_order_extend_expired_quota_left(client, env):
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
o.expires = now() - timedelta(days=5)
o.save()
q = Quota.objects.create(event=env[0], size=3)
@@ -313,13 +313,13 @@ def test_order_extend_expired_quota_left(client, env):
'expires': newdate
}, follow=True)
assert 'alert-success' in response.rendered_content
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
assert o.expires.strftime("%Y-%m-%d %H:%M:%S") == newdate
@pytest.mark.django_db
def test_order_extend_expired_quota_empty(client, env):
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
o.expires = now() - timedelta(days=5)
olddate = o.expires
o.save()
@@ -331,7 +331,7 @@ def test_order_extend_expired_quota_empty(client, env):
'expires': newdate
}, follow=True)
assert 'alert-danger' in response.rendered_content
o = Order.objects.current.get(identity=env[2].identity)
o = Order.objects.get(id=env[2].id)
assert o.expires.strftime("%Y-%m-%d %H:%M:%S") == olddate.strftime("%Y-%m-%d %H:%M:%S")

36
src/tests/control/test_permissions.py
View File

@@ -33,22 +33,22 @@ event_urls = [
"settings/tickets",
"items/",
"items/add",
"items/abc/",
"items/abc/variations",
"items/abc/properties",
"items/1/",
"items/1/variations",
"items/1/properties",
"categories/",
"categories/add",
"categories/abc/",
"categories/abc/up",
"categories/abc/down",
"categories/abc/delete",
"categories/2/",
"categories/2/up",
"categories/2/down",
"categories/2/delete",
"questions/",
"questions/abc/delete",
"questions/abc/",
"questions/2/delete",
"questions/2/",
"questions/add",
"quotas/",
"quotas/abc/delete",
"quotas/abc/",
"quotas/2/delete",
"quotas/2/",
"quotas/add",
"orders/ABC/transition",
"orders/ABC/extend",
@@ -56,7 +56,6 @@ event_urls = [
"orders/",
]
organizer_urls = [
'organizer/abc/edit',
'event/abc/add'
@@ -101,16 +100,16 @@ event_permission_urls = [
# We don't have to create categories and similar objects
# for testing this, it is enough to test that a 404 error
# is returned instead of a 403 one.
("can_change_items", "categories/abc/", 404),
("can_change_items", "categories/abc/delete", 404),
("can_change_items", "categories/2/", 404),
("can_change_items", "categories/2/delete", 404),
("can_change_items", "categories/add", 200),
# ("can_change_items", "questions/", 200),
("can_change_items", "questions/abc/", 404),
("can_change_items", "questions/abc/delete", 404),
("can_change_items", "questions/2/", 404),
("can_change_items", "questions/2/delete", 404),
("can_change_items", "questions/add", 200),
# ("can_change_items", "quotas/", 200),
("can_change_items", "quotas/abc/", 404),
("can_change_items", "quotas/abc/delete", 404),
("can_change_items", "quotas/2/", 404),
("can_change_items", "quotas/2/delete", 404),
("can_change_items", "quotas/add", 200),
("can_view_orders", "orders/overview/", 200),
("can_view_orders", "orders/", 200),
@@ -143,7 +142,6 @@ def test_current_permission(client, env):
client.login(email='dummy@dummy.dummy', password='dummy')
response = client.get('/control/event/dummy/dummy/settings/')
assert response.status_code == 200
ep = ep.clone()
setattr(ep, 'can_change_settings', False)
ep.save()
response = client.get('/control/event/dummy/dummy/settings/')