Data structures and form elements for internationalized data

src/tests/base/test_models.py

@@ -21,21 +21,19 @@ class ItemVariationsTest(TestCase):
             organizer=o, name='Dummy', slug='dummy',
             date_from=now(),
         )
-        p = Property.objects.create(event=cls.event, name='Size')
-        PropertyValue.objects.create(prop=p, value='S')
-        PropertyValue.objects.create(prop=p, value='M')
-        PropertyValue.objects.create(prop=p, value='L')
-        p = Property.objects.create(event=cls.event, name='Color')
-        PropertyValue.objects.create(prop=p, value='black')
-        PropertyValue.objects.create(prop=p, value='blue')
+        cls.p_size = Property.objects.create(event=cls.event, name='Size')
+        cls.pv_size_s = PropertyValue.objects.create(prop=cls.p_size, value='S')
+        cls.pv_size_m = PropertyValue.objects.create(prop=cls.p_size, value='M')
+        PropertyValue.objects.create(prop=cls.p_size, value='L')
+        cls.p_color = Property.objects.create(event=cls.event, name='Color')
+        cls.pv_color_black = PropertyValue.objects.create(prop=cls.p_color, value='black')
+        PropertyValue.objects.create(prop=cls.p_color, value='blue')
 
     def test_variationdict(self):
         i = Item.objects.create(event=self.event, name='Dummy')
-        p = Property.objects.get(event=self.event, name='Size')
-        i.properties.add(p)
+        i.properties.add(self.p_size)
         iv = ItemVariation.objects.create(item=i)
-        pv = PropertyValue.objects.get(prop=p, value='S')
-        iv.values.add(pv)
+        iv.values.add(self.pv_size_s)
 
         variations = i.get_all_variations()
 
@@ -46,16 +44,16 @@ class ItemVariationsTest(TestCase):
             for v in vd.relevant_values():
                 self.assertIs(type(v), PropertyValue)
 
-            if vd[p.pk] == pv:
+            if vd[self.p_size.pk] == self.pv_size_s:
                 vd1 = vd
 
         vd2 = VariationDict()
-        vd2[p.pk] = pv
+        vd2[self.p_size.pk] = self.pv_size_s
 
         self.assertEqual(vd2.identify(), vd1.identify())
         self.assertEqual(vd2, vd1)
 
-        vd2[p.pk] = PropertyValue.objects.get(prop=p, value='M')
+        vd2[self.p_size.pk] = self.pv_size_m
 
         self.assertNotEqual(vd2.identify(), vd.identify())
         self.assertNotEqual(vd2, vd1)
@@ -63,7 +61,7 @@ class ItemVariationsTest(TestCase):
         vd3 = vd2.copy()
         self.assertEqual(vd3, vd2)
 
-        vd2[p.pk] = pv
+        vd2[self.p_size.pk] = self.pv_size_s
         self.assertNotEqual(vd3, vd2)
 
         vd4 = VariationDict()
@@ -80,22 +78,21 @@ class ItemVariationsTest(TestCase):
         self.assertEqual(v[0], {})
 
         # One property, no variations
-        p = Property.objects.get(event=self.event, name='Size')
-        i.properties.add(p)
+        i.properties.add(self.p_size)
         v = i.get_all_variations()
         self.assertIs(type(v), list)
         self.assertEqual(len(v), 3)
         values = []
         for var in v:
             self.assertIs(type(var), VariationDict)
-            self.assertIn(p.pk, var)
-            self.assertIs(type(var[p.pk]), PropertyValue)
-            values.append(var[p.pk].value)
-        self.assertEqual(sorted(values), sorted(['S', 'M', 'L']))
+            self.assertIn(self.p_size.pk, var)
+            self.assertIs(type(var[self.p_size.pk]), PropertyValue)
+            values.append(var[self.p_size.pk].value)
+        self.assertEqual(sorted([str(V) for V in values]), sorted(['S', 'M', 'L']))
 
         # One property, one variation
         iv = ItemVariation.objects.create(item=i)
-        iv.values.add(PropertyValue.objects.get(prop=p, value='S'))
+        iv.values.add(self.pv_size_s)
         v = i.get_all_variations()
         self.assertIs(type(v), list)
         self.assertEqual(len(v), 3)
@@ -107,16 +104,15 @@ class ItemVariationsTest(TestCase):
                 self.assertEqual(iv.pk, var['variation'].pk)
                 values.append(var['variation'].values.all()[0].value)
                 num_variations += 1
-            elif p.pk in var:
-                self.assertIs(type(var[p.pk]), PropertyValue)
-                values.append(var[p.pk].value)
-        self.assertEqual(sorted(values), sorted(['S', 'M', 'L']))
+            elif self.p_size.pk in var:
+                self.assertIs(type(var[self.p_size.pk]), PropertyValue)
+                values.append(var[self.p_size.pk].value)
+        self.assertEqual(sorted([str(V) for V in values]), sorted(['S', 'M', 'L']))
         self.assertEqual(num_variations, 1)
 
         # Two properties, one variation
-        p2 = Property.objects.get(event=self.event, name='Color')
-        i.properties.add(p2)
-        iv.values.add(PropertyValue.objects.get(prop=p2, value='black'))
+        i.properties.add(self.p_color)
+        iv.values.add(self.pv_color_black)
         v = i.get_all_variations()
         self.assertIs(type(v), list)
         self.assertEqual(len(v), 6)
@@ -126,11 +122,11 @@ class ItemVariationsTest(TestCase):
             self.assertIs(type(var), VariationDict)
             if 'variation' in var:
                 self.assertEqual(iv.pk, var['variation'].pk)
-                values.append(sorted([ivv.value for ivv in iv.values.all()]))
-                self.assertEqual(sorted([ivv.value for ivv in iv.values.all()]), sorted(['S', 'black']))
+                values.append(sorted([str(ivv.value) for ivv in iv.values.all()]))
+                self.assertEqual(sorted([str(ivv.value) for ivv in iv.values.all()]), sorted(['S', 'black']))
                 num_variations += 1
             else:
-                values.append(sorted([pv.value for pv in var.values()]))
+                values.append(sorted([str(pv.value) for pv in var.values()]))
         self.assertEqual(sorted(values), sorted([
             ['S', 'black'],
             ['S', 'blue'],

src/tests/control/test_items.py

@@ -104,15 +104,15 @@ class PropertiesTest(ItemFormTest):
         self.driver.get('%s/control/event/%s/%s/properties/add' % (
             self.live_server_url, self.orga1.slug, self.event1.slug
         ))
-        self.driver.find_element_by_css_selector("#id_name").send_keys('Size')
-        self.driver.find_element_by_name("values-0-value").send_keys('S')
-        self.driver.find_element_by_name("values-1-value").send_keys('M')
+        self.driver.find_element_by_css_selector("#id_name_0").send_keys('Size')
+        self.driver.find_element_by_name("values-0-value_0").send_keys('S')
+        self.driver.find_element_by_name("values-1-value_0").send_keys('M')
         self.scroll_and_click(self.driver.find_element_by_class_name("btn-save"))
         self.driver.find_element_by_class_name("alert-success")
         self.assertIn("Size", self.driver.find_element_by_css_selector("#page-wrapper table").text)
         self.driver.find_element_by_partial_link_text("Size").click()
-        self.assertEqual("S", self.driver.find_element_by_name("values-0-value").get_attribute("value"))
-        self.assertEqual("M", self.driver.find_element_by_name("values-1-value").get_attribute("value"))
+        self.assertEqual("S", self.driver.find_element_by_name("values-0-value_0").get_attribute("value"))
+        self.assertEqual("M", self.driver.find_element_by_name("values-1-value_0").get_attribute("value"))
 
     @unittest.skipIf('TRAVIS' in os.environ, 'See CategoriesTest.test_sort for details.')
     def test_update(self):
@@ -122,18 +122,18 @@ class PropertiesTest(ItemFormTest):
         self.driver.get('%s/control/event/%s/%s/properties/%s/' % (
             self.live_server_url, self.orga1.slug, self.event1.slug, c.identity
         ))
-        self.driver.find_element_by_css_selector("#id_name").clear()
-        self.driver.find_element_by_css_selector("#id_name").send_keys('Color')
+        self.driver.find_element_by_css_selector("#id_name_0").clear()
+        self.driver.find_element_by_css_selector("#id_name_0").send_keys('Color')
         self.driver.find_elements_by_css_selector("div.form-group button.btn-danger")[0].click()
-        self.scroll_into_view(self.driver.find_element_by_name("values-1-value"))
-        self.driver.find_element_by_name("values-1-value").clear()
-        self.driver.find_element_by_name("values-1-value").send_keys('red')
+        self.scroll_into_view(self.driver.find_element_by_name("values-1-value_0"))
+        self.driver.find_element_by_name("values-1-value_0").clear()
+        self.driver.find_element_by_name("values-1-value_0").send_keys('red')
         self.driver.find_element_by_css_selector("button[data-formset-add]").click()
-        self.driver.find_element_by_name("values-2-value").send_keys('blue')
+        self.driver.find_element_by_name("values-2-value_0").send_keys('blue')
         self.driver.find_element_by_class_name("btn-save").click()
         self.driver.find_element_by_class_name("alert-success")
-        self.assertEqual("red", self.driver.find_element_by_name("values-0-value").get_attribute("value"))
-        self.assertEqual("blue", self.driver.find_element_by_name("values-1-value").get_attribute("value"))
+        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"))
 
     def test_delete(self):
         c = Property.objects.create(event=self.event1, name="Size")
@@ -151,7 +151,7 @@ class QuestionsTest(ItemFormTest):
         self.driver.get('%s/control/event/%s/%s/questions/add' % (
             self.live_server_url, self.orga1.slug, self.event1.slug
         ))
-        self.driver.find_element_by_name("question").send_keys('What is your shoe size?')
+        self.driver.find_element_by_name("question_0").send_keys('What is your shoe size?')
         Select(self.driver.find_element_by_name("type")).select_by_value('N')
         self.driver.find_element_by_class_name("btn-save").click()
         self.driver.find_element_by_class_name("alert-success")
@@ -162,8 +162,8 @@ class QuestionsTest(ItemFormTest):
         self.driver.get('%s/control/event/%s/%s/questions/%s/' % (
             self.live_server_url, self.orga1.slug, self.event1.slug, c.identity
         ))
-        self.driver.find_element_by_name("question").clear()
-        self.driver.find_element_by_name("question").send_keys('How old are you?')
+        self.driver.find_element_by_name("question_0").clear()
+        self.driver.find_element_by_name("question_0").send_keys('How old are you?')
         self.scroll_and_click(self.driver.find_element_by_class_name("btn-save"))
         self.driver.find_element_by_class_name("alert-success")
         self.assertIn("How old", self.driver.find_element_by_css_selector("#page-wrapper table").text)

src/tests/presale/test_event.py

@@ -17,7 +17,7 @@ class EventMiddlewareTest(BrowserTest):
 
     def test_event_header(self):
         self.driver.get('%s/%s/%s/' % (self.live_server_url, self.orga.slug, self.event.slug))
-        self.assertIn(self.event.name, self.driver.find_element_by_css_selector("h1").text)
+        self.assertIn(str(self.event.name), self.driver.find_element_by_css_selector("h1").text)
 
     def test_not_found(self):
         resp = self.client.get('%s/%s/%s/' % (self.live_server_url, 'foo', 'bar'))