Removed CleanerVersion layer [backwards-incompatible!]

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

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()