Commit f5bd3bbe authored by Vincent Pelletier's avatar Vincent Pelletier

Fix all unit tests relative to removal of redirection after selection modifications.

Fix reference url generation in ListBoxZuite_CommonTemplate.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@11981 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 3c1375fd
...@@ -117,8 +117,8 @@ ...@@ -117,8 +117,8 @@
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertAbsoluteLocation</td>\n <td>assertLocation</td>\n
<td>exact:${base_url}/foo_module/0/view</td>\n <td>${base_url}/foo_module/0/view</td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<!-- We check that the transition has not been passed by looking at the\n <!-- We check that the transition has not been passed by looking at the\n
......
...@@ -145,8 +145,8 @@ ...@@ -145,8 +145,8 @@
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertAbsoluteLocation</td>\n <td>assertLocation</td>\n
<td>glob:${base_url}/foo_module/view?*</td>\n <td>${base_url}/foo_module/view</td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
......
...@@ -109,8 +109,8 @@ keeps `form_id`. This test doesn\'t test problems from #217</td></tr>\n ...@@ -109,8 +109,8 @@ keeps `form_id`. This test doesn\'t test problems from #217</td></tr>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertAbsoluteLocation</td>\n <td>assertLocation</td>\n
<td>glob:${base_url}/foo_module/0/Base_viewHistory?*</td>\n <td>${base_url}/foo_module/0/Base_viewHistory</td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
\n \n
......
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
<!-- Check all -->\n <!-- Check all -->\n
<tr>\n <tr>\n
\t<td>clickAndWait</td>\n \t<td>clickAndWait</td>\n
\t<td>portal_selections/checkAll:method</td>\n \t<td>checkAll:method</td>\n
\t<td></td>\n \t<td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
...@@ -364,7 +364,7 @@ ...@@ -364,7 +364,7 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>clickAndWait</td>\n \t<td>clickAndWait</td>\n
\t<td>portal_selections/checkAll:method</td>\n \t<td>checkAll:method</td>\n
\t<td></td>\n \t<td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
...@@ -385,7 +385,7 @@ ...@@ -385,7 +385,7 @@
<!-- Uncheck all -->\n <!-- Uncheck all -->\n
<tr>\n <tr>\n
\t<td>clickAndWait</td>\n \t<td>clickAndWait</td>\n
\t<td>portal_selections/uncheckAll:method</td>\n \t<td>uncheckAll:method</td>\n
\t<td></td>\n \t<td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
...@@ -425,7 +425,7 @@ ...@@ -425,7 +425,7 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
\t<td>clickAndWait</td>\n \t<td>clickAndWait</td>\n
\t<td>portal_selections/uncheckAll:method</td>\n \t<td>uncheckAll:method</td>\n
\t<td></td>\n \t<td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
......
...@@ -119,16 +119,16 @@ ...@@ -119,16 +119,16 @@
<tr>\n <tr>\n
<td>verifyAttribute</td>\n <td>verifyAttribute</td>\n
<td>//tr[@id="listbox_label_line"]/td[2]/a@href</td>\n <td>//tr[@id="listbox_label_line"]/td[2]/a@href</td>\n
<td>portal_selections/setSelectionQuickSortOrder?selection_name=foo_line_selection&amp;sort_on=title&amp;form_id=Foo_viewRelationField</td>\n <td>setSelectionQuickSortOrder?selection_name=foo_line_selection&amp;sort_on=title&amp;form_id=Foo_viewRelationField</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>open</td>\n <td>open</td>\n
<td>${base_url}/foo_module/0/portal_selections/setSelectionQuickSortOrder?selection_name=foo_line_selection&amp;sort_on=title&amp;form_id=Foo_viewRelationField</td>\n <td>${base_url}/foo_module/0/setSelectionQuickSortOrder?selection_name=foo_line_selection&amp;sort_on=title&amp;form_id=Foo_viewRelationField</td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyLocation</td>\n <td>verifyLocation</td>\n
<td>${base_url}/foo_module/0/Foo_viewRelationField</td>\n <td>${base_url}/foo_module/0/setSelectionQuickSortOrder</td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
\n \n
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyLocation</td>\n <td>verifyLocation</td>\n
<td>${base_url}/foo_module/0/Foo_viewRelationField</td>\n <td>${base_url}/foo_module/0</td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<!-- Go to last and verify -->\n <!-- Go to last and verify -->\n
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyLocation</td>\n <td>verifyLocation</td>\n
<td>${base_url}/foo_module/0/Foo_viewRelationField</td>\n <td>${base_url}/foo_module/0/setPage</td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<!-- Go to previous and verify -->\n <!-- Go to previous and verify -->\n
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyLocation</td>\n <td>verifyLocation</td>\n
<td>${base_url}/foo_module/0/Foo_viewRelationField</td>\n <td>${base_url}/foo_module/0</td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<!-- Go to first and verify -->\n <!-- Go to first and verify -->\n
...@@ -329,7 +329,7 @@ ...@@ -329,7 +329,7 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>verifyLocation</td>\n <td>verifyLocation</td>\n
<td>${base_url}/foo_module/0/Foo_viewRelationField</td>\n <td>${base_url}/foo_module/0/setPage</td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
...@@ -438,7 +438,7 @@ ...@@ -438,7 +438,7 @@
<!-- END of inspired code -->\n <!-- END of inspired code -->\n
<tr>\n <tr>\n
<td>verifyLocation</td>\n <td>verifyLocation</td>\n
<td>${base_url}/foo_module/0/Foo_viewRelationField</td>\n <td>${base_url}/foo_module/0/unfoldDomain</td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
\n \n
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<thead>\n <thead>\n
<tr><td rowspan="1" colspan="3">Test Bread Crumb</td></tr>\n <tr><td rowspan="1" colspan="3">Test Bread Crumb</td></tr>\n
</thead><tbody>\n </thead><tbody>\n
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/init" />\n <tal:block metal:use-macro="here/PTZuite_CommonTemplate/macros/init" />\n
<tr>\n <tr>\n
<td>open</td>\n <td>open</td>\n
<td>${base_url}/foo_module/FooModule_createObjects?num:int=1</td>\n <td>${base_url}/foo_module/FooModule_createObjects?num:int=1</td>\n
......
...@@ -68,12 +68,12 @@ ...@@ -68,12 +68,12 @@
<tal:block metal:use-macro="here/PTZuite_CommonTemplate/macros/init" />\n <tal:block metal:use-macro="here/PTZuite_CommonTemplate/macros/init" />\n
<tr>\n <tr>\n
<td>open</td>\n <td>open</td>\n
<td tal:content="string: ${here/portal_url}/portal_types/Foo/PortalType_addAction?id=test_action&name=Dummy Exchange&category=object_exchange&action=string:%24{object_url}/Foo_viewDummyDialog">Create a dummy action</td>\n <td>${base_url}/portal_types/Foo/PortalType_addAction?id=test_action&amp;name=Dummy Exchange&amp;category=object_exchange&amp;action=string:${object_url}/Foo_viewDummyDialog</td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>open</td>\n <td>open</td>\n
<td tal:content="string: ${here/portal_url}/foo_module/1/view">/erp5/foo_module/1/view</td>\n <td>${base_url}/foo_module/1/view</td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
...@@ -134,12 +134,12 @@ ...@@ -134,12 +134,12 @@
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>assertLocation</td>\n <td>assertLocation</td>\n
<td tal:content="string: ${here/portal_url}/foo_module/1/view"></td>\n <td>${base_url}/foo_module/1</td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
<td>open</td>\n <td>open</td>\n
<td tal:content="string: ${here/portal_url}/portal_types/Foo/PortalType_deleteAction?id=test_action"></td>\n <td>${base_url}/portal_types/Foo/PortalType_deleteAction?id=test_action</td>\n
<td></td>\n <td></td>\n
</tr>\n </tr>\n
</body>\n </body>\n
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<tal:block metal:define-macro="init">\n <tal:block metal:define-macro="init">\n
<tr>\n <tr>\n
<td>store</td>\n <td>store</td>\n
<td tal:content="python: here.getPortalObject().absolute_url()">erp5</td>\n <td tal:content="python: \'/\' + here.getPortalObject().getId()">erp5</td>\n
<td>base_url</td>\n <td>base_url</td>\n
</tr>\n </tr>\n
<tr>\n <tr>\n
......
139 140
\ No newline at end of file \ 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