[Erp5-report] r20777 - in /erp5/trunk/bt5/erp5_ui_test: PathTemplateItem/portal_tests/docum...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Apr 23 17:31:49 CEST 2008
Author: jerome
Date: Wed Apr 23 17:31:48 2008
New Revision: 20777
URL: http://svn.erp5.org?rev=20777&view=rev
Log:
use glob: and portal_url to assertLocation, this should work in both directly and in virutal hosting
Modified:
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialog.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialogKeepSelection.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testChangeId.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testDialogButtonTranslated.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testHistory.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassFailingWorkflowTransition.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransition.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionKeepSelection.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionTwice.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSearchDialog.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml
erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testWorklist.xml
erp5/trunk/bt5/erp5_ui_test/bt/revision
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml?rev=20777&r1=20776&r2=20777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml Wed Apr 23 17:31:48 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PageTemplates.ZopePageTemplate</string>
- <string>ZopePageTemplate</string>
- </tuple>
- <none/>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -82,7 +79,7 @@
have id "2". This is probably a bit too stupid. -->\n
<tr>\n
<td>assertLocation</td>\n
- <td tal:content="python: \'%s/foo_module/2/view\' % here.getPortalObject().absolute_url_path()"/>\n
+ <td tal:content="python: \'glob:%s/foo_module/2/view*\' % here.getPortalObject().absolute_url()"/>\n
<td></td>\n
</tr>\n
<tr>\n
@@ -103,7 +100,7 @@
</tr>\n
<tr>\n
<td>assertLocation</td>\n
- <td tal:content="python: \'%s/foo_module/2/1/view\' % here.getPortalObject().absolute_url_path()"/>\n
+ <td tal:content="python: \'glob:%s/foo_module/2/1/view*\' % here.getPortalObject().absolute_url()"/>\n
<td></td>\n
</tr>\n
<tr>\n
@@ -131,7 +128,7 @@
</tr>\n
<tr>\n
<td>assertLocation</td>\n
- <td tal:content="python: \'%s/foo_module/3/view\' % here.getPortalObject().absolute_url_path()"/>\n
+ <td tal:content="string:glob:${here/portal_url}/foo_module/3/view*"/>\n
<td></td>\n
</tr>\n
<tr>\n
@@ -153,7 +150,7 @@
</tr>\n
<tr>\n
<td>assertLocation</td>\n
- <td tal:content="python: \'%s/foo_module/4/view\' % here.getPortalObject().absolute_url_path()"/>\n
+ <td tal:content="string:glob:${here/portal_url}/foo_module/4/Foo_view*"/>\n
<td></td>\n
</tr>\n
<tr>\n
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialog.xml?rev=20777&r1=20776&r2=20777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialog.xml (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialog.xml Wed Apr 23 17:31:48 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PageTemplates.ZopePageTemplate</string>
- <string>ZopePageTemplate</string>
- </tuple>
- <none/>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -118,7 +115,7 @@
</tr>\n
<tr>\n
<td>assertLocation</td>\n
- <td>${base_url}/foo_module/0/Foo_view</td>\n
+ <td tal:content="string:glob:${here/portal_url}/foo_module/0/Foo_view*"/>\n
<td></td>\n
</tr>\n
<!-- We check that the transition has not been passed by looking at the\n
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialogKeepSelection.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialogKeepSelection.xml?rev=20777&r1=20776&r2=20777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialogKeepSelection.xml (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialogKeepSelection.xml Wed Apr 23 17:31:48 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PageTemplates.ZopePageTemplate</string>
- <string>ZopePageTemplate</string>
- </tuple>
- <none/>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testChangeId.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testChangeId.xml?rev=20777&r1=20776&r2=20777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testChangeId.xml (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testChangeId.xml Wed Apr 23 17:31:48 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PageTemplates.ZopePageTemplate</string>
- <string>ZopePageTemplate</string>
- </tuple>
- <none/>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml?rev=20777&r1=20776&r2=20777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml Wed Apr 23 17:31:48 2008
@@ -79,7 +79,7 @@
have id "2". This is probably a bit too stupid. -->\n
<tr>\n
<td>assertLocation</td>\n
- <td tal:content="python: \'%s/foo_module/2/view\' % here.getPortalObject().absolute_url_path()"/>\n
+ <td tal:content="string:glob:${here/portal_url}/foo_module/2/view*"/>\n
<td></td>\n
</tr>\n
<tr>\n
@@ -100,7 +100,7 @@
</tr>\n
<tr>\n
<td>assertLocation</td>\n
- <td tal:content="python: \'%s/foo_module/2/1/view\' % here.getPortalObject().absolute_url_path()"/>\n
+ <td tal:content="string:glob:${here/portal_url}/foo_module/2/1/view*"/>\n
<td></td>\n
</tr>\n
<tr>\n
@@ -122,7 +122,7 @@
</tr>\n
<tr>\n
<td>assertLocation</td>\n
- <td tal:content="python: \'%s/foo_module/2/2/FooLine_view\' % here.getPortalObject().absolute_url_path()"/>\n
+ <td tal:content="string:glob:${here/portal_url}/foo_module/2/2/FooLine_view*"/>\n
<td></td>\n
</tr>\n
<tr>\n
@@ -147,7 +147,7 @@
</tr>\n
<tr>\n
<td>assertLocation</td>\n
- <td tal:content="python: \'%s/foo_module/3/view\' % here.getPortalObject().absolute_url_path()"/>\n
+ <td tal:content="string:glob:${here/portal_url}/foo_module/3/view*"/>\n
<td></td>\n
</tr>\n
<tr>\n
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testDialogButtonTranslated.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testDialogButtonTranslated.xml?rev=20777&r1=20776&r2=20777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testDialogButtonTranslated.xml (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testDialogButtonTranslated.xml Wed Apr 23 17:31:48 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PageTemplates.ZopePageTemplate</string>
- <string>ZopePageTemplate</string>
- </tuple>
- <none/>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testHistory.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testHistory.xml?rev=20777&r1=20776&r2=20777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testHistory.xml (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testHistory.xml Wed Apr 23 17:31:48 2008
@@ -65,7 +65,7 @@
\n
<tr>\n
<td>store</td>\n
- <td tal:content="python: \'/\' + here.getPortalObject().getId()">erp5</td>\n
+ <td tal:content="python: \'/\' + here.getPortalObject().getProperty(\'erp5_ui_test_base_url\', here.getPortalObject().getId())">erp5</td>\n
<td>base_url</td>\n
</tr>\n
<tr>\n
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassFailingWorkflowTransition.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassFailingWorkflowTransition.xml?rev=20777&r1=20776&r2=20777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassFailingWorkflowTransition.xml (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassFailingWorkflowTransition.xml Wed Apr 23 17:31:48 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PageTemplates.ZopePageTemplate</string>
- <string>ZopePageTemplate</string>
- </tuple>
- <none/>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransition.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransition.xml?rev=20777&r1=20776&r2=20777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransition.xml (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransition.xml Wed Apr 23 17:31:48 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PageTemplates.ZopePageTemplate</string>
- <string>ZopePageTemplate</string>
- </tuple>
- <none/>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionKeepSelection.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionKeepSelection.xml?rev=20777&r1=20776&r2=20777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionKeepSelection.xml (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionKeepSelection.xml Wed Apr 23 17:31:48 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PageTemplates.ZopePageTemplate</string>
- <string>ZopePageTemplate</string>
- </tuple>
- <none/>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionTwice.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionTwice.xml?rev=20777&r1=20776&r2=20777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionTwice.xml (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionTwice.xml Wed Apr 23 17:31:48 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PageTemplates.ZopePageTemplate</string>
- <string>ZopePageTemplate</string>
- </tuple>
- <none/>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSearchDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSearchDialog.xml?rev=20777&r1=20776&r2=20777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSearchDialog.xml (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSearchDialog.xml Wed Apr 23 17:31:48 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PageTemplates.ZopePageTemplate</string>
- <string>ZopePageTemplate</string>
- </tuple>
- <none/>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml?rev=20777&r1=20776&r2=20777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml Wed Apr 23 17:31:48 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PageTemplates.ZopePageTemplate</string>
- <string>ZopePageTemplate</string>
- </tuple>
- <none/>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -146,7 +143,7 @@
</tr>\n
<tr>\n
<td>assertLocation</td>\n
- <td>${base_url}/foo_module/FooModule_viewFooList</td>\n
+ <td tal:replace="string:glob:${here/portal_url}/foo_module/FooModule_viewFooList*"/>\n
<td></td>\n
</tr>\n
<tr>\n
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml?rev=20777&r1=20776&r2=20777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml Wed Apr 23 17:31:48 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PageTemplates.ZopePageTemplate</string>
- <string>ZopePageTemplate</string>
- </tuple>
- <none/>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -110,7 +107,7 @@
</tr>\n
<tr>\n
<td>assertLocation</td>\n
- <td>${base_url}/foo_module/0/Base_viewHistory</td>\n
+ <td tal:content="string:glob:${here/portal_url}/foo_module/0/Base_viewHistory*"/>\n
<td></td>\n
</tr>\n
\n
Modified: erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testWorklist.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testWorklist.xml?rev=20777&r1=20776&r2=20777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testWorklist.xml (original)
+++ erp5/trunk/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testWorklist.xml Wed Apr 23 17:31:48 2008
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.PageTemplates.ZopePageTemplate</string>
- <string>ZopePageTemplate</string>
- </tuple>
- <none/>
+ <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
Modified: erp5/trunk/bt5/erp5_ui_test/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ui_test/bt/revision?rev=20777&r1=20776&r2=20777&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ui_test/bt/revision (original)
+++ erp5/trunk/bt5/erp5_ui_test/bt/revision Wed Apr 23 17:31:48 2008
@@ -1,1 +1,1 @@
-339
+340
More information about the Erp5-report
mailing list