[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ Doctests added and action updated in views_support extension profile.

[Charlie Clark]

Log message for revision 116958:
  Doctests added and action updated in views_support extension profile.

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/portal/config.pt
  A   Products.CMFDefault/trunk/Products/CMFDefault/browser/portal/tests/
  A   Products.CMFDefault/trunk/Products/CMFDefault/browser/portal/tests/__init__.py
  A   Products.CMFDefault/trunk/Products/CMFDefault/browser/portal/tests/portal_config.txt
  A   Products.CMFDefault/trunk/Products/CMFDefault/browser/portal/tests/test_config.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/actions.xml

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/portal/config.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/portal/config.pt	2010-09-26 20:42:46 UTC (rev 116957)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/portal/config.pt	2010-09-26 20:43:25 UTC (rev 116958)
@@ -4,9 +4,10 @@
 
 <metal:slot metal:fill-slot="body" i18n:domain="cmf_default">
 
-<p class="errors" tal:condition="view/errors"
-                  tal:repeat="error view/errors" 
-                  tal:content="error">Error Message</p>
+<ul class="errors" tal:condition="view/errors">
+ <li tal:repeat="error view/error_views"
+     tal:content="structure error">Error Message</li>
+</ul>
 
 <h1 i18n:translate="">Portal Configuration</h1>
 
@@ -17,6 +18,8 @@
       <label tal:attributes="for widget/name" tal:content="widget/label"></label>
       <tal:block replace="structure widget" />
       <legend tal:content="widget/hint"></legend>
+      <tal:block condition="widget/error"
+          replace="structure widget/error" />
     </fieldset>
 
 


Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/portal/tests/__init__.py
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: Products.CMFDefault/trunk/Products/CMFDefault/browser/portal/tests/portal_config.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/portal/tests/portal_config.txt	                        (rev 0)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/portal/tests/portal_config.txt	2010-09-26 20:43:25 UTC (rev 116958)
@@ -0,0 +1,48 @@
+Portal configuration form
+-------------------------
+
+Set up Zope manager.
+
+    >>> from urllib import quote
+    >>> uf = app.acl_users
+    >>> uf._doAddUser('mbr', 'mbrpw', ['Manager'], [])
+    >>> mbr_credentials = quote('mbr:mbrpw'.encode('base64').rstrip())
+
+Create the browser object we'll be using.
+
+    # BBB for Zope 2.12
+    >>> try:
+    ...     from Testing.testbrowser import Browser
+    ... except ImportError:
+    ...     from Products.Five.testbrowser import Browser
+    >>> browser = Browser()
+
+Log the user in
+    >>> browser.open('http://localhost/site/@@login.html')
+    >>> browser.getControl(name="__ac_name").value = 'mbr'
+    >>> browser.getControl(name="__ac_password").value = 'mbrpw'
+    >>> browser.getControl(name="actions.login").click()
+    >>> '[[cmf_default][Login success]]' in browser.contents
+    True
+    
+Open configuration form
+    >>> browser.open("http://localhost/site/@@configure.html")
+    >>> "[[cmf_default][Portal Configuration]]" in browser.contents
+    True
+    
+    >>> browser.getControl(name="form.email_from_name").value = "The man behind the curtain"
+    >>> browser.getControl(name="form.actions.change").click()
+    >>> "[[cmf_default][Portal settings changed]" in browser.contents
+    True
+
+Make sure we get open the view not the PythonScript reconfig_portal
+    >>> browser.open("http://localhost/site/@@configure.html")
+    >>> browser.getControl(name="form.email_from_name").value == "The man behind the curtain"
+    True
+    
+Test for error handling, default_charset must be ASCII onlye
+    >>> browser.open("http://localhost/site/@@configure.html")
+    >>> browser.getControl(name="form.default_charset").value = "Caché"
+    >>> browser.getControl(name="form.actions.change").click()
+    >>> "[[cmf_default][[[zope][There were errors]" in browser.contents
+    True
\ No newline at end of file

Added: Products.CMFDefault/trunk/Products/CMFDefault/browser/portal/tests/test_config.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/portal/tests/test_config.py	                        (rev 0)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/portal/tests/test_config.py	2010-09-26 20:43:25 UTC (rev 116958)
@@ -0,0 +1,29 @@
+##############################################################################
+#
+# Copyright (c) 2008 Zope Foundation and Contributors.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Tests for portal configuration form"""
+
+import unittest
+
+from Testing import ZopeTestCase
+
+from Products.CMFDefault.testing import FunctionalLayer
+
+ftest_suite = ZopeTestCase.FunctionalDocFileSuite('portal_config.txt',
+                        )
+
+ftest_suite.layer = FunctionalLayer
+
+def test_suite():
+    suite = unittest.TestSuite()
+    suite.addTest(unittest.TestSuite((ftest_suite,)))
+    return suite
\ No newline at end of file


Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/portal/tests/test_config.py
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Modified: Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/actions.xml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/actions.xml	2010-09-26 20:42:46 UTC (rev 116957)
+++ Products.CMFDefault/trunk/Products/CMFDefault/profiles/views_support/actions.xml	2010-09-26 20:43:25 UTC (rev 116958)
@@ -242,7 +242,7 @@
    <property name="title" i18n:translate="">Reconfigure Portal</property>
    <property name="description"
       i18n:translate="">Reconfigure the portal</property>
-   <property name="url_expr">string:${portal_url}/reconfig_form</property>
+   <property name="url_expr">string:${portal_url}/@@configure.html</property>
    <property name="link_target"></property>
    <property name="icon_expr">string:${portal_url}/tool_icon.png</property>
    <property name="available_expr"></property>