Skip to content

erp5
erp5
Commit dd3dc352 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

use glob: and portal_url to assertLocation, this should work in both directly... 

use glob: and portal_url to assertLocation, this should work in both directly and in virutal hosting

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20777 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 3b8a54c8
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 78 deletions
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml
View file @ dd3dc352
......@@ -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 @@ have id "2". This is probably a bit too stupid. -->\n
</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 @@ have id "2". This is probably a bit too stupid. -->\n
</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 @@ another object of the same type. -->\n
</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
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialog.xml
View file @ dd3dc352
......@@ -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
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialogKeepSelection.xml
View file @ dd3dc352
......@@ -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>
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testChangeId.xml
View file @ dd3dc352
......@@ -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>
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCloneObject.xml
View file @ dd3dc352
......@@ -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 @@ have id "2". This is probably a bit too stupid. -->\n
</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 @@ another object of the same type. -->\n
</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 @@ another object of the same type. -->\n
</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
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testDialogButtonTranslated.xml
View file @ dd3dc352
......@@ -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>
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testHistory.xml
View file @ dd3dc352
......@@ -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
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassFailingWorkflowTransition.xml
View file @ dd3dc352
......@@ -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>
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransition.xml
View file @ dd3dc352
......@@ -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>
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionKeepSelection.xml
View file @ dd3dc352
......@@ -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>
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testPassWorkflowTransitionTwice.xml
View file @ dd3dc352
......@@ -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>
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSearchDialog.xml
View file @ dd3dc352
......@@ -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>
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml
View file @ dd3dc352
......@@ -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
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml
View file @ dd3dc352
......@@ -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 @@ keeps `form_id`. This test doesn\'t test problems from #217</td></tr>\n
</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
......
bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testWorklist.xml
View file @ dd3dc352
......@@ -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>
......
bt5/erp5_ui_test/bt/revision
View file @ dd3dc352
339
\ No newline at end of file
340
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7