[Erp5-report] r45270 gabriel - in /erp5/trunk/bt5/erp5_web_ung_ui_test: PathTemplateItem/po...

nobody at svn.erp5.org nobody at svn.erp5.org
Sat Apr 9 01:04:22 CEST 2011


Author: gabriel
Date: Sat Apr  9 01:04:22 2011
New Revision: 45270

URL: http://svn.erp5.org?rev=45270&view=rev
Log:
Refactor tests to use only erp5 user instead of zope user

Added:
    erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/ERP5Site_createUNGUser.xml
Removed:
    erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGDocsWithERP5User.xml
Modified:
    erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testGadgetInUNGDocs.xml
    erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGLogin.xml
    erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/Zuite_CommonTemplateForUNG.xml
    erp5/trunk/bt5/erp5_web_ung_ui_test/bt/revision

Modified: erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testGadgetInUNGDocs.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testGadgetInUNGDocs.xml?rev=45270&r1=45269&r2=45270&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testGadgetInUNGDocs.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testGadgetInUNGDocs.xml [utf8] Sat Apr  9 01:04:22 2011
@@ -48,22 +48,7 @@
       <tr><td rowspan="1" colspan="3" tal:content="template/getId"/></tr>\n
     </thead><tbody>\n
       <tal:block metal:use-macro="here/Zuite_CommonTemplateForUNG/macros/init" />\n
-      <tal:block metal:use-macro="here/Zuite_CommonTemplateForUNG/macros/create-user" />\n
-      <tr>\n
-        <td>type</td>\n
-        <td>__ac_name</td>\n
-        <td>ung_user</td>\n
-      </tr>\n
-      <tr>\n
-        <td>type</td>\n
-        <td>__ac_password</td>\n
-        <td>1234</td>\n
-      </tr>\n
-      <tr>\n
-        <td>clickAndWait</td>\n
-        <td>//input[@type="submit"]</td>\n
-        <td></td>\n
-      </tr>\n
+      <tal:block metal:use-macro="here/Zuite_CommonTemplateForUNG/macros/login" />\n
       <tr>\n
         <td>verifyTextPresent</td>\n
         <td>Please wait while your home area is being prepared.</td>\n

Removed: erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGDocsWithERP5User.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGDocsWithERP5User.xml?rev=45269&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGDocsWithERP5User.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGDocsWithERP5User.xml (removed)
@@ -1,256 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>_bind_names</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>_asgns</string> </key>
-                        <value>
-                          <dictionary>
-                            <item>
-                                <key> <string>name_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <unicode encoding="cdata"><![CDATA[
-
-<html xmlns:tal="http://xml.zope.org/namespaces/tal"\n
-      xmlns:metal="http://xml.zope.org/namespaces/metal">\n
-<head>\n
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">\n
-  <title tal:content="template/getId"/>\n
-</head>\n
-<body>\n
-  <table cellpadding="1" cellspacing="1" border="1">\n
-    <thead>\n
-      <tr><td rowspan="1" colspan="3" tal:content="template/getId"/></tr>\n
-    </thead><tbody>\n
-      <tal:block metal:use-macro="here/Zuite_CommonTemplateForUNG/macros/init" />\n
-      <tal:block metal:use-macro="here/Zuite_CommonTemplateForUNG/macros/create-user" />\n
-      <tr>\n
-        <td>type</td>\n
-        <td>__ac_name</td>\n
-        <td>ung_user</td>\n
-      </tr>\n
-      <tr>\n
-        <td>type</td>\n
-        <td>__ac_password</td>\n
-        <td>1234</td>\n
-      </tr>\n
-      <tr>\n
-        <td>clickAndWait</td>\n
-        <td>//input[@type="submit"]</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>openAndWait</td>\n
-        <td>${ung_url}/ERP5Site_createNewWebDocument?template=web_page_template</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>verifyText</td>\n
-        <td>//a[@name="document_title"]</td>\n
-        <td>Web Page</td>\n
-      </tr>\n
-      <tr>\n
-        <td>clickAndWait</td>\n
-        <td>//a[@class="ung_docs"]</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>click</td>\n
-        <td>//input[@class="listbox-check-all"]</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>clickAndWait</td>\n
-        <td>//button[@class="delete"]</td>\n
-        <td></td>\n
-      </tr>\n
-      <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities"/>\n
-      <tr>\n
-        <td>openAndWait</td>\n
-        <td>${ung_url}</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>verifyText</td>\n
-        <td>//tbody/tr[@class="your_listbox-data-line-0 DataA"]/td[3]/a</td>\n
-        <td>Web Page</td>\n
-      </tr>\n
-      <tr>\n
-        <td>verifyText</td>\n
-        <td>//tbody/tr[@class="your_listbox-data-line-0 DataA"]/td[4]/a</td>\n
-        <td>Draft</td>\n
-      </tr>\n
-      <tr>\n
-        <td>click</td>\n
-        <td>//input[@class="listbox-check-all"]</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>clickAndWait</td>\n
-        <td>//button[@class="delete"]</td>\n
-        <td></td>\n
-      </tr>\n
-      <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities"/>\n
-      <tr>\n
-        <td>openAndWait</td>\n
-        <td>${ung_url}</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>clickAndWait</td>\n
-        <td>//table[@class="your_listbox-table-domain-tree"]/tbody/tr[11]/td/a</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>click</td>\n
-        <td>//input[@class="listbox-check-all"]</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>clickAndWait</td>\n
-        <td>//button[@class="delete"]</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>verifyText</td>\n
-        <td>//td[@class="listbox-table-no-result-row"]/span</td>\n
-        <td>No result.</td>\n
-      </tr>\n
-      <tr>\n
-        <td>openAndWait</td>\n
-        <td>${ung_url}/ERP5Site_createNewWebDocument?template=web_table_template</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>verifyText</td>\n
-        <td>//a[@name="document_title"]</td>\n
-        <td>Web Table</td>\n
-      </tr>\n
-      <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities"/>\n
-      <tr>\n
-        <td>openAndWait</td>\n
-        <td>${ung_url}</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>clickAndWait</td>\n
-        <td>//table[@class="your_listbox-table-domain-tree"]/tbody/tr[3]/td[2]/a</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>verifyText</td>\n
-        <td>//td[@class="listbox-table-no-result-row"]/span</td>\n
-        <td>No result.</td>\n
-      </tr>\n
-      <tr>\n
-        <td>clickAndWait</td>\n
-        <td>//table[@class="your_listbox-table-domain-tree"]/tbody/tr[4]/td[2]/a</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>verifyText</td>\n
-        <td>//tbody/tr[@class="your_listbox-data-line-0 DataA"]/td[3]/a</td>\n
-        <td>Web Table</td>\n
-      </tr>\n
-      <tr>\n
-        <td>verifyText</td>\n
-        <td>//tbody/tr[@class="your_listbox-data-line-0 DataA"]/td[4]/a</td>\n
-        <td>Draft</td>\n
-      </tr>\n
-      <tr>\n
-        <td>click</td>\n
-        <td>//td[@class="listbox-table-select-cell"]/input</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>clickAndWait</td>\n
-        <td>//button[@class="delete"]</td>\n
-        <td></td>\n
-      </tr>\n
-      <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities"/>\n
-      <tr>\n
-        <td>openAndWait</td>\n
-        <td>${ung_url}</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>clickAndWait</td>\n
-        <td>//table[@class="your_listbox-table-domain-tree"]/tbody/tr[11]/td/a</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>verifyTextNotPresent</td>\n
-        <td>No result.</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>click</td>\n
-        <td>//td[@class="listbox-table-select-cell"]/input</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>clickAndWait</td>\n
-        <td>//button[@class="delete"]</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>verifyText</td>\n
-        <td>//td[@class="listbox-table-no-result-row"]/span</td>\n
-        <td>No result.</td>\n
-      </tr>\n
-    </tbody>\n
-  </table>\n
-</body>\n
-</html>
-
-]]></unicode> </value>
-        </item>
-        <item>
-            <key> <string>content_type</string> </key>
-            <value> <string>text/html</string> </value>
-        </item>
-        <item>
-            <key> <string>expand</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>testUNGDocsWithERP5User</string> </value>
-        </item>
-        <item>
-            <key> <string>output_encoding</string> </key>
-            <value> <string>utf-8</string> </value>
-        </item>
-        <item>
-            <key> <string>title</string> </key>
-            <value> <unicode></unicode> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>

Modified: erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGLogin.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGLogin.xml?rev=45270&r1=45269&r2=45270&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGLogin.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_ui_test/PathTemplateItem/portal_tests/ung_zuite/testUNGLogin.xml [utf8] Sat Apr  9 01:04:22 2011
@@ -76,7 +76,7 @@
       </tr>\n
       <tr>\n
         <td>verifyTextPresent</td>\n
-        <td>zope</td>\n
+        <td>test_user</td>\n
         <td></td>\n
       </tr>\n
       <tr>\n

Added: erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/ERP5Site_createUNGUser.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/ERP5Site_createUNGUser.xml?rev=45270&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/ERP5Site_createUNGUser.xml (added)
+++ erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/ERP5Site_createUNGUser.xml [utf8] Sat Apr  9 01:04:22 2011
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>portal = context.getPortalObject()\n
+\n
+user = portal.portal_catalog.getResultValue(portal_type="Person", reference="test_user")\n
+\n
+if not user:\n
+  person = portal.person_module.newContent(portal_type="Person")\n
+  person.edit(first_name="UNG User",\n
+              password="test_user",\n
+              reference="test_user")\n
+\n
+  assignment = person.newContent(portal_type=\'Assignment\')\n
+  assignment.setFunction("function/ung_user")\n
+  assignment.open()\n
+\n
+return True\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>_proxy_roles</string> </key>
+            <value>
+              <tuple>
+                <string>Manager</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>ERP5Site_createUNGUser</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Modified: erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/Zuite_CommonTemplateForUNG.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/Zuite_CommonTemplateForUNG.xml?rev=45270&r1=45269&r2=45270&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/Zuite_CommonTemplateForUNG.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_ui_test/SkinTemplateItem/portal_skins/erp5_web_ung_ui_test/Zuite_CommonTemplateForUNG.xml [utf8] Sat Apr  9 01:04:22 2011
@@ -47,9 +47,15 @@
     </tr>\n
     <tr>\n
       <td>openAndWait</td>\n
+      <td>${base_url}/ERP5Site_createUNGUser</td>\n
+      <td></td>\n
+    </tr>\n
+    <tr>\n
+      <td>openAndWait</td>\n
       <td>${base_url}/ERP5Site_cleanUpUNGTestEnvironment</td>\n
       <td></td>\n
     </tr>\n
+    <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities"/>\n
     <tr>\n
       <td>openAndWait</td>\n
       <td>${ung_url}/WebSite_logout</td>\n
@@ -58,25 +64,25 @@
   </tal:block>\n
   <tal:block metal:define-macro="login">\n
     <tr>\n
-        <td>openAndWait</td>\n
-        <td>${ung_url}/WebSite_logout</td>\n
-        <td></td>\n
-      </tr>\n
-      <tr>\n
-        <td>type</td>\n
-        <td>__ac_name</td>\n
-        <td>zope</td>\n
-      </tr>\n
-      <tr>\n
-        <td>type</td>\n
-        <td>__ac_password</td>\n
-        <td>zope</td>\n
-      </tr>\n
-      <tr>\n
-        <td>clickAndWait</td>\n
-        <td>//input[@type="submit"]</td>\n
-        <td></td>\n
-      </tr>\n
+      <td>openAndWait</td>\n
+      <td>${ung_url}/WebSite_logout</td>\n
+      <td></td>\n
+    </tr>\n
+    <tr>\n
+      <td>type</td>\n
+      <td>__ac_name</td>\n
+      <td>test_user</td>\n
+    </tr>\n
+    <tr>\n
+      <td>type</td>\n
+      <td>__ac_password</td>\n
+      <td>test_user</td>\n
+    </tr>\n
+    <tr>\n
+      <td>clickAndWait</td>\n
+      <td>//input[@type="submit"]</td>\n
+      <td></td>\n
+    </tr>\n
   </tal:block>\n
   <tal:block metal:define-macro="create-user">\n
     <tr>\n

Modified: erp5/trunk/bt5/erp5_web_ung_ui_test/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_ui_test/bt/revision?rev=45270&r1=45269&r2=45270&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_ui_test/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_ui_test/bt/revision [utf8] Sat Apr  9 01:04:22 2011
@@ -1 +1 @@
-42
\ No newline at end of file
+43
\ No newline at end of file



More information about the Erp5-report mailing list