diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialog.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialog.xml index 5194ffb09f367d62a542873e4b2a3c4645fee6b6..354140e460b5e808d19eecdc2c920e4240c980bc 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialog.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testCancelWorkflowTransitionDialog.xml @@ -117,8 +117,8 @@ <td></td>\n </tr>\n <tr>\n - <td>assertAbsoluteLocation</td>\n - <td>exact:${base_url}/foo_module/0/view</td>\n + <td>assertLocation</td>\n + <td>${base_url}/foo_module/0/view</td>\n <td></td>\n </tr>\n <!-- We check that the transition has not been passed by looking at the\n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml index 6e1ba846c602f2af42a1a6e522f3458db8b4c942..533319a91fdd651c5c3a913b5789d25042cdc52e 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtons.xml @@ -145,8 +145,8 @@ <td></td>\n </tr>\n <tr>\n - <td>assertAbsoluteLocation</td>\n - <td>glob:${base_url}/foo_module/view?*</td>\n + <td>assertLocation</td>\n + <td>${base_url}/foo_module/view</td>\n <td></td>\n </tr>\n <tr>\n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml index c15c743830a31935c2e47c6b59c469ce560c5f1f..b83ce6fa47f3288c5ec90439655894cf73d86f42 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/document_zuite/testSelectionPreviousNextButtonsKeepsFormId.xml @@ -109,8 +109,8 @@ keeps `form_id`. This test doesn\'t test problems from #217</td></tr>\n <td></td>\n </tr>\n <tr>\n - <td>assertAbsoluteLocation</td>\n - <td>glob:${base_url}/foo_module/0/Base_viewHistory?*</td>\n + <td>assertLocation</td>\n + <td>${base_url}/foo_module/0/Base_viewHistory</td>\n <td></td>\n </tr>\n \n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testFilter.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testFilter.xml index 063b85310e557a6e6de89e76ebeb8bec57393ff3..38deea6ae30bb03f1e04e10a24485c6a10c5b438 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testFilter.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testFilter.xml @@ -324,7 +324,7 @@ <!-- Check all -->\n <tr>\n \t<td>clickAndWait</td>\n -\t<td>portal_selections/checkAll:method</td>\n +\t<td>checkAll:method</td>\n \t<td></td>\n </tr>\n <tr>\n @@ -364,7 +364,7 @@ </tr>\n <tr>\n \t<td>clickAndWait</td>\n -\t<td>portal_selections/checkAll:method</td>\n +\t<td>checkAll:method</td>\n \t<td></td>\n </tr>\n <tr>\n @@ -385,7 +385,7 @@ <!-- Uncheck all -->\n <tr>\n \t<td>clickAndWait</td>\n -\t<td>portal_selections/uncheckAll:method</td>\n +\t<td>uncheckAll:method</td>\n \t<td></td>\n </tr>\n <tr>\n @@ -425,7 +425,7 @@ </tr>\n <tr>\n \t<td>clickAndWait</td>\n -\t<td>portal_selections/uncheckAll:method</td>\n +\t<td>uncheckAll:method</td>\n \t<td></td>\n </tr>\n <tr>\n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testRedirect.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testRedirect.xml index 3c73918b73a0da0bb7caf9ac254a08dae310acc0..eadec6cb2159108b7002bf67a7813dd2ed7e6ef0 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testRedirect.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/listbox_zuite/testRedirect.xml @@ -119,16 +119,16 @@ <tr>\n <td>verifyAttribute</td>\n <td>//tr[@id="listbox_label_line"]/td[2]/a@href</td>\n - <td>portal_selections/setSelectionQuickSortOrder?selection_name=foo_line_selection&sort_on=title&form_id=Foo_viewRelationField</td>\n + <td>setSelectionQuickSortOrder?selection_name=foo_line_selection&sort_on=title&form_id=Foo_viewRelationField</td>\n </tr>\n <tr>\n <td>open</td>\n - <td>${base_url}/foo_module/0/portal_selections/setSelectionQuickSortOrder?selection_name=foo_line_selection&sort_on=title&form_id=Foo_viewRelationField</td>\n + <td>${base_url}/foo_module/0/setSelectionQuickSortOrder?selection_name=foo_line_selection&sort_on=title&form_id=Foo_viewRelationField</td>\n <td></td>\n </tr>\n <tr>\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 </tr>\n \n @@ -201,7 +201,7 @@ </tr>\n <tr>\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 </tr>\n <!-- Go to last and verify -->\n @@ -247,7 +247,7 @@ </tr>\n <tr>\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 </tr>\n <!-- Go to previous and verify -->\n @@ -283,7 +283,7 @@ </tr>\n <tr>\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 </tr>\n <!-- Go to first and verify -->\n @@ -329,7 +329,7 @@ </tr>\n <tr>\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 </tr>\n <tr>\n @@ -438,7 +438,7 @@ <!-- END of inspired code -->\n <tr>\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 </tr>\n \n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testBreadCrumbs.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testBreadCrumbs.xml index c536cee4b1f05e156ff8afb3ba9a8342ec0d57d7..3ec0cd57461e4c149217451a4fa1da6190929d6e 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testBreadCrumbs.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testBreadCrumbs.xml @@ -65,7 +65,7 @@ <thead>\n <tr><td rowspan="1" colspan="3">Test Bread Crumb</td></tr>\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 <td>open</td>\n <td>${base_url}/foo_module/FooModule_createObjects?num:int=1</td>\n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDialogActions.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDialogActions.xml index 3b3ccdc99701cb0447cafd6cc20fb5cb647c157a..775de207c517818385d56ffc80b88592feb917dd 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDialogActions.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/page_templates_zuite/testDialogActions.xml @@ -68,12 +68,12 @@ <tal:block metal:use-macro="here/PTZuite_CommonTemplate/macros/init" />\n <tr>\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&name=Dummy Exchange&category=object_exchange&action=string:${object_url}/Foo_viewDummyDialog</td>\n <td></td>\n </tr>\n <tr>\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 </tr>\n <tr>\n @@ -134,12 +134,12 @@ </tr>\n <tr>\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 </tr>\n <tr>\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 </tr>\n </body>\n diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxZuite_CommonTemplate.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxZuite_CommonTemplate.xml index bc0c000355e2ff6e3a14c7a8c47d7b7d226eefa0..7efbe7bb0a49c1a6a6a6884d76471471bbafaa54 100644 --- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxZuite_CommonTemplate.xml +++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/ListBoxZuite_CommonTemplate.xml @@ -59,7 +59,7 @@ <tal:block metal:define-macro="init">\n <tr>\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 </tr>\n <tr>\n diff --git a/bt5/erp5_ui_test/bt/revision b/bt5/erp5_ui_test/bt/revision index b5db9c417a229cf02976899b74f8b6fc87712919..c2807f7f3cebe94f4ce652ca42b80dcc5853fe2d 100644 --- a/bt5/erp5_ui_test/bt/revision +++ b/bt5/erp5_ui_test/bt/revision @@ -1 +1 @@ -139 \ No newline at end of file +140 \ No newline at end of file