From be4365cf796c30a36fc7871ddedd416cec6000bd Mon Sep 17 00:00:00 2001 From: Jean-Paul Smets <jp@nexedi.com> Date: Fri, 15 Sep 2006 16:40:01 +0000 Subject: [PATCH] 2006-09-15 jp * use bar_category instead of destination git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@10015 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...testRelationFieldAndMultiRelationField.xml | 4 +- .../testSimpleMultiRelationField.xml | 84 ++++++++++++++++++- .../erp5_ui_test/Foo_viewRelationField.xml | 2 +- ...ist.xml => my_bar_category_title_list.xml} | 29 +------ .../bt/template_base_category_list | 1 + 5 files changed, 89 insertions(+), 31 deletions(-) rename bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Foo_viewRelationField/{my_destination_title_list.xml => my_bar_category_title_list.xml} (95%) diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldAndMultiRelationField.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldAndMultiRelationField.xml index c94bdeb4ba..01cc41397f 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldAndMultiRelationField.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testRelationFieldAndMultiRelationField.xml @@ -105,7 +105,7 @@ the same Form</td></tr>\n </tr>\n <tr>\n <td>type</td>\n - <td>field_my_destination_title_list</td>\n + <td>field_my_bar_category_title_list</td>\n <td>Title 1</td>\n </tr>\n <tr>\n @@ -126,7 +126,7 @@ the same Form</td></tr>\n </tr>\n <tr>\n <td>verifyValue</td>\n - <td>field_my_destination_title_list</td>\n + <td>field_my_bar_category_title_list</td>\n <td>Title 1</td>\n </tr>\n </tbody></table>\n diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleMultiRelationField.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleMultiRelationField.xml index 9ad2127fa8..bec9ca2775 100644 --- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleMultiRelationField.xml +++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/relation_field_zuite/testSimpleMultiRelationField.xml @@ -77,53 +77,131 @@ to set categories</td></tr>\n <td>open</td>\n <td>${base_url}/foo_module/FooModule_createObjects?num:int=2</td>\n <td></td>\n + <td></td>\n </tr>\n <tr>\n <td>assertTextPresent</td>\n <td>Created Successfully.</td>\n <td></td>\n + <td></td>\n </tr>\n <tr>\n <td>open</td>\n <td>${base_url}/foo_module/ListBoxZuite_waitForActivities</td>\n <td></td>\n + <td></td>\n </tr>\n <tr>\n <td>assertTextPresent</td>\n <td>Done.</td>\n <td></td>\n + <td></td>\n </tr>\n <tr>\n <td>open</td>\n <td>${base_url}/foo_module/0/Base_viewMetadata</td>\n <td></td>\n + <td></td>\n </tr>\n <tr>\n <td>type</td>\n <td>field_my_category_list</td>\n - <td>destination/foo_module/0\n -destination/foo_module/1</td>\n + <td>bar_category/foo_module/0\n +bar_category/foo_module/1</td>\n + <td></td>\n </tr>\n <tr>\n <td>clickAndWait</td>\n <td>//button[@title=\'Save\']</td>\n <td></td>\n + <td></td>\n </tr>\n <tr>\n <td>verifyPortalStatusMessage</td>\n <td>Data Updated.</td>\n <td></td>\n + <td></td>\n </tr>\n <tr>\n <td>clickAndWait</td>\n <td>link=Relation Fields</td>\n <td></td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>verifyValue</td>\n + <td>field_my_bar_category_title_list</td>\n + <td>Title 0\n +Title 1</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>type</td>\n + <td>field_my_bar_category_title_list</td>\n + <td>Title 0\n +Title 1\n +Title 1</td>\n + <td>Make sure than we can repeat the second item in a list</td>\n +</tr>\n +<tr>\n + <td>clickAndWait</td>\n + <td>//button[@title=\'Save\']</td>\n + <td></td>\n + <td></td>\n </tr>\n <tr>\n <td>verifyValue</td>\n - <td>field_my_destination_title_list</td>\n + <td>field_my_bar_category_title_list</td>\n <td>Title 0\n +Title 1\n Title 1</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>type</td>\n + <td>field_my_bar_category_title_list</td>\n + <td>Title 0\n +Title 0\n +Title 1\n +Title 1</td>\n + <td>Make sure that we can repeat the first item (default) in a list</td>\n +</tr>\n +<tr>\n + <td>clickAndWait</td>\n + <td>//button[@title=\'Save\']</td>\n + <td></td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>verifyValue</td>\n + <td>field_my_bar_category_title_list</td>\n + <td>Title 0\n +Title 0\n +Title 1\n +Title 1</td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>type</td>\n + <td>field_my_bar_category_title_list</td>\n + <td>Title 1\n +Title 0\n +Title 1</td>\n + <td>Make sure we can reorder items in a list</td>\n +</tr>\n +<tr>\n + <td>clickAndWait</td>\n + <td>//button[@title=\'Save\']</td>\n + <td></td>\n + <td></td>\n +</tr>\n +<tr>\n + <td>verifyValue</td>\n + <td>field_my_bar_category_title_list</td>\n + <td>Title 1\n +Title 0\n +Title 1</td>\n + <td></td>\n </tr>\n <!-- XXX don\'t test jump for now, because we don\'t have good locators anyway.\n -->\n diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Foo_viewRelationField.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Foo_viewRelationField.xml index 5c25b7eb78..e9e6902979 100644 --- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Foo_viewRelationField.xml +++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Foo_viewRelationField.xml @@ -110,7 +110,7 @@ <string>my_id</string> <string>my_title</string> <string>my_foo_category_title</string> - <string>my_destination_title_list</string> + <string>my_bar_category_title_list</string> </list> </value> </item> diff --git a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Foo_viewRelationField/my_destination_title_list.xml b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Foo_viewRelationField/my_bar_category_title_list.xml similarity index 95% rename from bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Foo_viewRelationField/my_destination_title_list.xml rename to bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Foo_viewRelationField/my_bar_category_title_list.xml index f2a392dd8b..74d187894e 100644 --- a/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Foo_viewRelationField/my_destination_title_list.xml +++ b/bt5/erp5_ui_test/SkinTemplateItem/portal_skins/erp5_ui_test/Foo_viewRelationField/my_bar_category_title_list.xml @@ -14,7 +14,7 @@ <dictionary> <item> <key> <string>id</string> </key> - <value> <string>my_destination_title_list</string> </value> + <value> <string>my_bar_category_title_list</string> </value> </item> <item> <key> <string>message_values</string> </key> @@ -252,9 +252,7 @@ </item> <item> <key> <string>default</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> + <value> <string></string> </value> </item> <item> <key> <string>description</string> </key> @@ -393,7 +391,7 @@ </item> <item> <key> <string>base_category</string> </key> - <value> <string>destination</string> </value> + <value> <string>bar_category</string> </value> </item> <item> <key> <string>catalog_index</string> </key> @@ -526,7 +524,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Destination Titles - XXX with workaround on default TALES</string> </value> + <value> <string>Bar Titles</string> </value> </item> <item> <key> <string>unicode</string> </key> @@ -558,23 +556,4 @@ </dictionary> </pickle> </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python:[x.getTitle() for x in here.getDestinationValueList()]</string> </value> - </item> - </dictionary> - </pickle> - </record> </ZopeData> diff --git a/bt5/erp5_ui_test/bt/template_base_category_list b/bt5/erp5_ui_test/bt/template_base_category_list index 41181eed4b..645596eb2a 100644 --- a/bt5/erp5_ui_test/bt/template_base_category_list +++ b/bt5/erp5_ui_test/bt/template_base_category_list @@ -1,2 +1,3 @@ +bar_category foo_category foo_empty_category \ No newline at end of file -- 2.30.9