Changeset 7802

Timestamp:

8 Mar 2012, 14:26:35 (13 years ago)

Author:

Henrik Bettermann

Message:

We need an itemTag for the list of reserved beds.

Change tests accordingly.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• hostels/tests.py (modified) (1 diff)
• widgets/objectwidget.pt (modified) (1 diff)
• widgets/sequencewidget.py (modified) (1 diff)
• widgets/tests/test_objectwidget.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/hostels/tests.py

@@ -246 +246 @@
         assert self.app['hostels']['hall-1'][
             'hall-1_A_101_D'].bed_type == 'regular_female_reserved'
-        self.assertTrue('<li>A_101_A</li>' in self.browser.contents)
+        self.assertTrue('<div>A_101_A</div>' in self.browser.contents)
+
         # Change hostel configuration
         hall.beds_for_all = ['D']

main/waeup.sirp/trunk/src/waeup/sirp/widgets/objectwidget.pt

@@ -1 @@
-<div>
-  <span tal:repeat="widget context/subwidgets">
-    <span tal:define="error widget/error"
-      tal:replace="structure error" tal:condition="error" />
-    <span tal:replace="structure widget" />
-  </span>
-</div>
+<span tal:repeat="widget context/subwidgets">
+  <span tal:define="error widget/error"
+    tal:replace="structure error" tal:condition="error" />
+  <span tal:replace="structure widget" />
+</span>

main/waeup.sirp/trunk/src/waeup/sirp/widgets/sequencewidget.py

@@ -45 +45 @@
 
     tag = None
-    itemTag = None
+    itemTag = 'div'
 
 # Register our sequence widgets as default for lists.

main/waeup.sirp/trunk/src/waeup/sirp/widgets/tests/test_objectwidget.py

@@ -217 +217 @@
 
         check_list = [
-            '<div', 'class=', 'row',
             '<span',
             'Foo Name',
             '</span>', '<span',
-            'foo@foo.test',
-            '</div>']
+            'foo@foo.test']
         self.verifyResult(widget(), check_list, inorder=True)