From 7bb9396b8d8cb7df7288ca5e91020af002c59de2 Mon Sep 17 00:00:00 2001 From: Tomas Peterka <tomas.peterka@nexedi.com> Date: Fri, 1 Sep 2017 15:21:25 +0200 Subject: [PATCH] [renderjs_ui_test] Fix more randomly failing Zelenium tests --- .../renderjs_ui_translate_zuite/testPageHistory.zpt | 2 +- .../Zuite_CommonTemplateForRenderjsUi.zpt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageHistory.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageHistory.zpt index c33fb19b74..45868c562b 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageHistory.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageHistory.zpt @@ -106,7 +106,7 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@data-gadget-scope='panel' and contains(@class, 'visible')]</td> + <td>//div[@data-gadget-scope='panel' and contains(@class, 'visible')]//a[text()='lishi']</td> <td></td> </tr> <tr> diff --git a/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.zpt b/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.zpt index 33e6e45959..6293176352 100644 --- a/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.zpt +++ b/bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.zpt @@ -207,13 +207,13 @@ <tal:block metal:define-macro="check_search_in_form_list"> <tr> <td>waitForElementPresent</td> - <td>//div[contains(@data-gadget-url, 'gadget_erp5_pt_form_list.html')]//input[@name='search']</td> + <td>//div[contains(@data-gadget-url, 'gadget_erp5_pt_form_list.html')]//div[@data-gadget-scope='erp5_searchfield']//input[@name='search']</td> <td></td> </tr> <tr> - <td>assertElementPresent</td> - <td tal:content="python: "//div[contains(@data-gadget-url, 'gadget_erp5_pt_form_list.html')]//div[@data-gadget-scope='erp5_searchfield']//input[@value='%s' and @type='search' and @name='search']" % search_query"></td> - <td></td> + <td>assertValue</td> + <td>//div[contains(@data-gadget-url, 'gadget_erp5_pt_form_list.html')]//div[@data-gadget-scope='erp5_searchfield']//input[@name='search' and @type='search']</td> + <td tal:content="search_query"></td> </tr> </tal:block> -- 2.30.9