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

bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testAddObject.xml

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

-339
+340
\ No newline at end of file