From ba1013c2a5bda3ed0c04ff4410deb99c9479c523 Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Wed, 4 Mar 2020 10:06:57 +0000 Subject: [PATCH] erp5_web_renderjs_ui_test: stop relying on data-i18n attributes --- .../testRenderjsLogout.zpt | 26 ++++++++++++++++--- .../testPageAction.zpt | 2 +- .../testPageFormEditable.zpt | 2 +- .../testPageTab.zpt | 2 +- .../Zuite_CommonTemplateForRenderjsUi.zpt | 16 ++++++------ 5 files changed, 34 insertions(+), 14 deletions(-) diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_logout_zuite/testRenderjsLogout.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_logout_zuite/testRenderjsLogout.zpt index c99cfd0a9c..444f9f9b6b 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_logout_zuite/testRenderjsLogout.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_logout_zuite/testRenderjsLogout.zpt @@ -55,7 +55,16 @@ </tal:block> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> -<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" /> +<tr> + <td>waitForElementPresent</td> + <td>//input[@value='Confirm']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//input[@value='Confirm']</td> + <td></td> +</tr> <tr> <td>waitForElementPresent</td> @@ -89,14 +98,25 @@ <td>//input[@value='Login']</td> <td></td> </tr> + +<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_app_loaded" /> + <!-- come_from field in url is not empty --> <tal:block tal:define="click_configuration python: {'text': 'Logout'}"> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_panel_link" /> </tal:block> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> -<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_dialog" /> - +<tr> + <td>waitForElementPresent</td> + <td>//input[@value='Confirm']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//input[@value='Confirm']</td> + <td></td> +</tr> <tr> <td>waitForElementPresent</td> <td>//input[@value='Login']</td> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageAction.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageAction.zpt index d99d1022a6..c18ba7b4d6 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageAction.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageAction.zpt @@ -35,7 +35,7 @@ <td></td> </tr> -<tal:block tal:define="click_configuration python: {'text': 'Actions'}"> +<tal:block tal:define="click_configuration python: {'text': 'caozhuo'}"> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_header_link" /> </tal:block> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageFormEditable.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageFormEditable.zpt index ef8bf78989..9879dda620 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageFormEditable.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageFormEditable.zpt @@ -29,7 +29,7 @@ </tal:block> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> -<tal:block tal:define="click_configuration python: {'text': 'Editable'}"> +<tal:block tal:define="click_configuration python: {'text': 'bianxue'}"> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_header_link" /> </tal:block> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> diff --git a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageTab.zpt b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageTab.zpt index bc597b0f6d..fc31b262d0 100644 --- a/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageTab.zpt +++ b/bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageTab.zpt @@ -29,7 +29,7 @@ </tal:block> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> -<tal:block tal:define="click_configuration python: {'text': 'Views'}"> +<tal:block tal:define="click_configuration python: {'text': 'shitu'}"> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_header_link" /> </tal:block> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> 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 0dafd44237..d38776b632 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 @@ -6,32 +6,32 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@data-gadget-scope='header']//button[text()='Save']</td> + <td>//div[@data-gadget-scope='header']//button[@data-i18n='Save']</td> <td></td> </tr> <tr> <td>assertElementPresent</td> - <td>//div[@data-gadget-scope='header']//button[text()='Save']</td> + <td>//div[@data-gadget-scope='header']//button[@data-i18n='Save']</td> <td></td> </tr> <tr> <td>waitForElementNotPresent</td> - <td>//div[@data-gadget-scope='header']//button[text()='Save'][contains(@class, "ui-disabled")]</td> + <td>//div[@data-gadget-scope='header']//button[@data-i18n='Save'][contains(@class, "ui-disabled")]</td> <td></td> </tr> <tr> <td>assertElementNotPresent</td> - <td>//div[@data-gadget-scope='header']//button[text()='Save'][contains(@class, "ui-disabled")]</td> + <td>//div[@data-gadget-scope='header']//button[@data-i18n='Save'][contains(@class, "ui-disabled")]</td> <td></td> </tr> <tr> <td>assertElementPresent</td> - <td>//div[@data-gadget-scope='header']//button[text()='Save']</td> + <td>//div[@data-gadget-scope='header']//button[@data-i18n='Save']</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[@data-gadget-scope='header']//button[text()='Save']</td> + <td>//div[@data-gadget-scope='header']//button[@data-i18n='Save']</td> <td></td> </tr> </tal:block> @@ -43,7 +43,7 @@ <!-- Save Button is disabled --> <tr> <td>verifyElementPresent</td> - <td>//button[text()="Save"][contains(@class, "ui-disabled")]</td> + <td>//button[@data-i18n="Save"][contains(@class, "ui-disabled")]</td> <td></td> </tr> <!-- First loader while calling Base_edit --> @@ -54,7 +54,7 @@ </tal:block> <tr> <td>verifyElementPresent</td> - <td>//button[text()="Save"][contains(@class, "ui-icon-check")]</td> + <td>//button[@data-i18n="Save"][contains(@class, "ui-icon-check")]</td> <td></td> </tr> <tr> -- 2.30.9