- Refactoring: Fixed failing tests due to widget layout changes in

  z3c.form 1.8.2.

CHANGES.txt

@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+Version 1.5.2 (2008-04-24)
+--------------------------
+
+- Refactoring: Fixed failing tests due to widget layout changes in z3c.form
+  1.8.2.
+
 Version 1.5.1 (2007-10-30)
 --------------------------
 

buildout.cfg

@@ -1,7 +1,7 @@
 [buildout]
 develop = .
 parts = demo test coverage eggdeps
-index = http://download.zope.org/zope3.4/
+#index = http://download.zope.org/zope3.4/
 
 [test]
 recipe = zc.recipe.testrunner

setup.py

@@ -23,7 +23,7 @@ def read(*rnames):
 
 setup (
     name='z3c.formdemo',
-    version='1.5.1',
+    version='1.5.2',
     author = "Stephan Richter, Roger Ineichen and the Zope Community",
     author_email = "zope3-dev@zope.org",
     description = "A set of demo applications for z3c.form and z3c.formui",

src/z3c/formdemo/message/README.txt

@@ -51,18 +51,15 @@ is shown:
 
   >>> testing.printElement(user, "//h1")
   <h1>
-    A <span id="form-widgets-what" class="select-widget required choice-field">
-    <span class="selected-option">cool</span>
-  </span>
+    A <span id="form-widgets-what"
+            class="select-widget required choice-field"><span
+            class="selected-option">cool</span></span>
    Hello World
     from <span id="form-widgets-who"
-               class="text-widget required textline-field">
-    Stephan
-  </span>
+               class="text-widget required textline-field">Stephan</span>
   <BLANKLINE>
-    on <span id="form-widgets-when" class="text-widget required date-field">
-    7/1/07
-  </span>
+    on <span id="form-widgets-when"
+             class="text-widget required date-field">7/1/07</span>
   !
   </h1>
 
@@ -98,17 +95,14 @@ Of course, the view shows the latest data:
 
   >>> testing.printElement(user, "//h1")
   <h1>
-    A <span id="form-widgets-what" class="select-widget required choice-field">
-    <span class="selected-option">best</span>
-  </span>
+    A <span id="form-widgets-what"
+            class="select-widget required choice-field"><span
+      class="selected-option">best</span></span>
    Hello World
     from <span id="form-widgets-who"
-               class="text-widget required textline-field">
-    Roger
-  </span>
+               class="text-widget required textline-field">Roger</span>
   <BLANKLINE>
-    on <span id="form-widgets-when" class="text-widget required date-field">
-    7/1/07
-  </span>
+    on <span id="form-widgets-when"
+             class="text-widget required date-field">7/1/07</span>
   !
   </h1>

src/z3c/formdemo/questionnaire/README.txt

@@ -58,50 +58,44 @@ screen. Now the table has an entry:
   >>> testing.printElement(user, "//table/tbody/tr[1]")
   <tr class="odd"><td class="sorted-on">
       <span id="form-widgets-name"
-            class="text-widget required textline-field">
-        Stephan Richter
-      </span>
+            class="text-widget required textline-field">Stephan Richter</span>
     </td>
     <td class="right">
-      <span id="form-widgets-age" class="text-widget required int-field">
-        27
-      </span>
+      <span id="form-widgets-age"
+            class="text-widget required int-field">27</span>
     </td>
     <td class="right">
-      <span id="form-widgets-zope2" class="radio-widget required bool-field">
-        <span class="selected-option">yes</span>
-      </span>
+      <span id="form-widgets-zope2"
+            class="radio-widget required bool-field"><span
+        class="selected-option">yes</span></span>
     </td>
     <td class="right">
-      <span id="form-widgets-plone" class="radio-widget required bool-field">
-        <span class="selected-option">no</span>
-      </span>
+      <span id="form-widgets-plone"
+            class="radio-widget required bool-field"><span
+        class="selected-option">no</span></span>
     </td>
     <td class="right">
-      <span id="form-widgets-zope3" class="radio-widget required bool-field">
-        <span class="selected-option">yes</span>
-      </span>
+      <span id="form-widgets-zope3"
+            class="radio-widget required bool-field"><span
+        class="selected-option">yes</span></span>
     </td>
     <td class="right">
-      <span id="form-widgets-five" class="radio-widget required bool-field">
-        <span class="selected-option">no</span>
-      </span>
+      <span id="form-widgets-five"
+            class="radio-widget required bool-field"><span
+        class="selected-option">no</span></span>
     </td>
     <td class="right">
       <span id="form-widgets-contributor"
-            class="radio-widget required bool-field">
-        <span class="selected-option">yes</span>
-      </span>
+            class="radio-widget required bool-field"><span
+        class="selected-option">yes</span></span>
     </td>
     <td class="right">
-      <span id="form-widgets-years" class="text-widget int-field">
-        5
-      </span>
+      <span id="form-widgets-years"
+            class="text-widget int-field">5</span>
     </td>
     <td class="right">
-      <span id="form-widgets-zopeId" class="text-widget textline-field">
-        srichter
-      </span>
+      <span id="form-widgets-zopeId"
+            class="text-widget textline-field">srichter</span>
     </td>
   </tr>
 

src/z3c/formdemo/spreadsheet/README.txt

@@ -46,20 +46,16 @@ When the page returns, we see a row with the entry of Stephan Richter, ...
   >>> testing.printElement(user, "//table/tbody/tr[2]")
   <tr class="even"><td class="sorted-on">
       <span id="candidate-0-widgets-lastName"
-            class="text-widget required textline-field">
-        Richter
-      </span>
+            class="text-widget required textline-field">Richter</span>
     </td>
     <td class="">
       <span id="candidate-0-widgets-firstName"
-            class="text-widget required textline-field">
-        Stephan
-      </span>
+            class="text-widget required textline-field">Stephan</span>
     </td>
     <td class="">
-      <span id="candidate-0-widgets-rating" class="select-widget choice-field">
-        <span class="selected-option">good</span>
-      </span>
+      <span id="candidate-0-widgets-rating"
+            class="select-widget choice-field"><span
+        class="selected-option">good</span></span>
     </td>
     <td class="">
       <input type="submit" ... value="Edit" /></td>

src/z3c/formdemo/sqlmessage/README.txt

@@ -101,20 +101,15 @@ Clicking on any data item, brings us to the message display screen:
   <h1>
     A
     <span id="form-widgets-what"
-          class="select-widget required choice-field">
-      <span class="selected-option">cool</span>
-    </span>
+          class="select-widget required choice-field"><span
+      class="selected-option">cool</span></span>
     Hello World
     from
     <span id="form-widgets-who"
-          class="text-widget required textline-field">
-      Stephan
-    </span>
+          class="text-widget required textline-field">Stephan</span>
     on
     <span id="form-widgets-when"
-          class="text-widget required date-field">
-      7/1/07
-    </span>
+          class="text-widget required date-field">7/1/07</span>
     !
   </h1>
 
@@ -152,20 +147,15 @@ Of course, the view shows the latest data:
   <h1>
     A
     <span id="form-widgets-what"
-          class="select-widget required choice-field">
-      <span class="selected-option">best</span>
-    </span>
+          class="select-widget required choice-field"><span
+      class="selected-option">best</span></span>
     Hello World
     from
     <span id="form-widgets-who"
-          class="text-widget required textline-field">
-      Roger
-    </span>
+          class="text-widget required textline-field">Roger</span>
     on
     <span id="form-widgets-when"
-          class="text-widget required date-field">
-      7/1/07
-    </span>
+          class="text-widget required date-field">7/1/07</span>
     !
   </h1>