From ad2062c37f4c7290f31704ea38d1e3a35f863e02 Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Tue, 10 Mar 2020 09:22:35 +0000 Subject: [PATCH] erp5_web_renderjs_ui_test: use macros --- .../testFormViewNextLink.zpt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewNextLink.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewNextLink.zpt index 53825b9f1c..c65f96317c 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewNextLink.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_page_templates_zuite/testFormViewNextLink.zpt @@ -18,13 +18,16 @@ </tr> <!-- Wait for gadget to be loaded --> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_app_loaded" /> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" /> + <tr> - <td>waitForElementPresent</td> + <td>assertElementPresent</td> <td>//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_view.html']</td> <td></td> </tr> <tr> - <td>waitForTextPresent</td> + <td>assertTextPresent</td> <td>Title 1</td> <td></td> </tr> @@ -40,13 +43,17 @@ <td>//div[@data-gadget-scope='header']//a[text()='Next' and contains(@href, '#!selection_next')]</td> <td></td> </tr> + +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" /> + <tr> - <td>waitForElementPresent</td> + <td>assertElementPresent</td> <td>//div[@data-gadget-url='${base_url}/web_site_module/renderjs_runner/gadget_erp5_pt_form_list.html']</td> <td></td> </tr> <tr> - <td>waitForTextPresent</td> + <td>assertTextPresent</td> <td>Foos</td> <td></td> </tr> -- 2.30.9