Commit 71f70c7a authored by Romain Courteaud's avatar Romain Courteaud

[erp5_web_renderjs_ui_test] Improve macros.

Clean up the macros and add description to make them more readable.
Precise where the filter/sort editors are located.
Add macros to manage the filter panel.
parent 5892dd0e
......@@ -23,7 +23,6 @@
<td>Reset Successfully.</td>
<td></td>
</tr>
<tr>
<td>open</td>
<td>${base_url}/foo_module/FooModule_createObjects</td>
......@@ -37,265 +36,106 @@
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
<!-- Initialize -->
<tr>
<td>open</td>
<td>${base_url}/web_site_module/renderjs_runner/#/foo_module</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//a[@data-i18n='Previous']</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/triggle_filter_and" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/add_new_filter_section" />
<tal:block tal:define="filter_section_configuration python: {'key': 'id', 'value': '0', 'index': 0}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/set_filter_section" />
</tal:block>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/add_new_filter_section" />
<tal:block tal:define="filter_section_configuration python: {'key': 'title', 'value': 'Title 2', 'index': 1}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/set_filter_section" />
</tal:block>
<tr>
<td>waitForElementPresent</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[1]//select</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>//div[@class="filter_item_container"]/div[1]//select</td>
<td>index=0</td>
</tr>
<tr>
<td>type</td>
<td>//div[@class="filter_item_container"]/div[1]//input</td>
<td>0</td>
</tr>
<tr>
<td>click</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[2]//select</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>//div[@class="filter_item_container"]/div[2]//select</td>
<td>index=1</td>
</tr>
<tr>
<td>type</td>
<td>//div[@class="filter_item_container"]/div[2]//input</td>
<td>Title 2</td>
</tr>
<tr>
<td>click</td>
<td>//button[@class="submit responsive ui-last-child ui-btn ui-btn-icon-left ui-icon-check"]</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" />
<tr>
<td>waitForElementNotPresent</td>
<td>link=Title 8</td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
<td>link=Title 0</td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
<td>link=Title 2</td>
<td></td>
</tr>
<tr>
<td>verifyElementNotPresent</td>
<td>link=Title 0</td>
<td></td>
</tr>
<tr>
<td>verifyElementNotPresent</td>
<td>link=Title 8</td>
<td></td>
</tr>
<tr>
<td>verifyElementNotPresent</td>
<td>link=Title 2</td>
<td></td>
</tr>
<tal:block tal:define="search_query python: '( id:&nbsp; &#34;0&#34; AND title:&nbsp; &#34;Title 2&#34; )'">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" />
</tal:block>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/triggle_filter_and" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/change_filter_to_or" />
<tr>
<td>click</td>
<td>//button[text()='Filter']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//select[@name='heard_about']</td>
<td></td>
</tr>
<tr>
<td>verifyValue</td>
<td>//select[@name='heard_about']</td>
<td>AND</td>
</tr>
<tr>
<td>select</td>
<td>//select[@name='heard_about']</td>
<td>index=1</td>
</tr>
<tr>
<td>verifyValue</td>
<td>//select[@name='heard_about']</td>
<td>OR</td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class='filter_item_container']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//button[@class="submit responsive ui-last-child ui-btn ui-btn-icon-left ui-icon-check"]</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" />
<tr>
<td>waitForElementPresent</td>
<td>link=Title 0</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>link=Title 0</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>link=Title 2</td>
<td></td>
</tr>
<tal:block tal:define="search_query python: '( id:&nbsp; &#34;0&#34; OR title:&nbsp; &#34;Title 2&#34; )'">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" />
</tal:block>
<tr>
<td>click</td>
<td>//button[text()='Filter']</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/triggle_filter_or" />
<tal:block tal:define="filter_section_configuration python: {'index': 1}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/remove_filter_section" />
</tal:block>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[2]</td>
<td></td>
</tr>
<tal:block tal:define="filter_section_configuration python: {'index': 0}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/remove_filter_section" />
</tal:block>
<tr>
<td>focus</td>
<td>//div[@class="filter_item_container"]/div[2]//button</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//div[@class="filter_item_container"]/div[2]//button</td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
<td>//div[@class="filter_item_container"]/div[2]</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[1]</td>
<td></td>
</tr>
<tr>
<td>focus</td>
<td>//div[@class="filter_item_container"]/div[1]//button</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//div[@class="filter_item_container"]/div[1]//button</td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
<td>//div[@class="filter_item_container"]/div[1]</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//button[@class="submit responsive ui-last-child ui-btn ui-btn-icon-left ui-icon-check"]</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
<tal:block tal:define="search_query python: ''">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" />
</tal:block>
</tbody></table>
</body>
......
......@@ -53,45 +53,12 @@
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/triggle_filter_and" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/add_new_filter_section" />
<tal:block tal:define="filter_section_configuration python: {'key': 'id', 'value': '0', 'index': 0}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/set_filter_section" />
</tal:block>
<tr>
<td>waitForElementPresent</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[1]//select</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>//div[@class="filter_item_container"]/div[1]//select</td>
<td>index=0</td>
</tr>
<tr>
<td>type</td>
<td>//div[@class="filter_item_container"]/div[1]//input</td>
<td>0</td>
</tr>
<tr>
<td>click</td>
<td>//button[@class="submit responsive ui-last-child ui-btn ui-btn-icon-left ui-icon-check"]</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
<tr>
......@@ -99,43 +66,17 @@
<td>link=Title 0</td>
<td></td>
</tr>
<tal:block tal:define="search_query python: '( id:&nbsp; &#34;0&#34; )'">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" />
</tal:block>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/triggle_filter_and" />
<tr>
<td>waitForElementPresent</td>
<td>//div[@class='filter_item_container']</td>
<td></td>
</tr>
<tal:block tal:define="filter_section_configuration python: {'key': 'title', 'value': 'T%', 'index': 0}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/set_filter_section" />
</tal:block>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[1]//select</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>//div[@class="filter_item_container"]/div[1]//select</td>
<td>index=1</td>
</tr>
<tr>
<td>type</td>
<td>//div[@class="filter_item_container"]/div[1]//input</td>
<td>T%</td>
</tr>
<tr>
<td>click</td>
<td>//button[@class="submit responsive ui-last-child ui-btn ui-btn-icon-left ui-icon-check"]</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
......@@ -163,44 +104,23 @@
<td>link=Title 0</td>
<td></td>
</tr>
<tal:block tal:define="search_query python: '( title:&nbsp; &#34;T%&#34; )'">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" />
</tal:block>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/triggle_filter_and" />
<tal:block tal:define="filter_section_configuration python: {'index': 0}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/remove_filter_section" />
</tal:block>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[1]</td>
<td></td>
</tr>
<tr>
<td>focus</td>
<td>//div[@class="filter_item_container"]/div[1]//button</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//div[@class="filter_item_container"]/div[1]//button</td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
<td>//div[@class="filter_item_container"]/div[1]</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//button[@class="submit responsive ui-last-child ui-btn ui-btn-icon-left ui-icon-check"]</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
<tal:block tal:define="search_query python: ''">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" />
</tal:block>
</tbody></table>
</body>
......
......@@ -54,194 +54,79 @@
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/triggle_filter_and" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/add_new_filter_section" />
<tal:block tal:define="filter_section_configuration python: {'key': 'id', 'value': '0', 'index': 0}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/set_filter_section" />
</tal:block>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/add_new_filter_section" />
<tal:block tal:define="filter_section_configuration python: {'key': 'title', 'value': 'Title 2', 'index': 1}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/set_filter_section" />
</tal:block>
<tr>
<td>waitForElementPresent</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[1]//select</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>//div[@class="filter_item_container"]/div[1]//select</td>
<td>index=0</td>
</tr>
<tr>
<td>type</td>
<td>//div[@class="filter_item_container"]/div[1]//input</td>
<td>0</td>
</tr>
<tr>
<td>click</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[2]//select</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>//div[@class="filter_item_container"]/div[2]//select</td>
<td>index=1</td>
</tr>
<tr>
<td>type</td>
<td>//div[@class="filter_item_container"]/div[2]//input</td>
<td>Title 2</td>
</tr>
<tr>
<td>click</td>
<td>//button[@class="submit responsive ui-last-child ui-btn ui-btn-icon-left ui-icon-check"]</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
<tal:block tal:define="search_query python: '( id:&nbsp; &#34;0&#34; AND title:&nbsp; &#34;Title 2&#34; )'">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" />
</tal:block>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/triggle_filter_and" />
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[2]//select</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>//div[@class="filter_item_container"]/div[2]//select</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>//div[@class="filter_item_container"]/div[1]//select</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>//select[@name='heard_about']</td>
<td>index=1</td>
</tr>
<tr>
<td>verifyValue</td>
<td>//select[@name='heard_about']</td>
<td>OR</td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class='filter_item_container']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//button[@class="submit responsive ui-last-child ui-btn ui-btn-icon-left ui-icon-check"]</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/change_filter_to_or" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
<tal:block tal:define="search_query python: '( id:&nbsp; &#34;0&#34; OR title:&nbsp; &#34;Title 2&#34; )'">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" />
</tal:block>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/triggle_filter_or" />
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[2]</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>//div[@class="filter_item_container"]/div[2]</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>//div[@class="filter_item_container"]/div[1]</td>
<td></td>
</tr>
<tal:block tal:define="filter_section_configuration python: {'index': 1}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/remove_filter_section" />
</tal:block>
<tr>
<td>focus</td>
<td>//div[@class="filter_item_container"]/div[2]//button</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//div[@class="filter_item_container"]/div[2]//button</td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
<td>//div[@class="filter_item_container"]/div[2]</td>
<td></td>
</tr>
<tr>
<td>focus</td>
<td>//div[@class="filter_item_container"]/div[1]//button</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//div[@class="filter_item_container"]/div[1]//button</td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
<td>//div[@class="filter_item_container"]/div[1]</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//button[@class="submit responsive ui-last-child ui-btn ui-btn-icon-left ui-icon-check"]</td>
<td></td>
</tr>
<tal:block tal:define="filter_section_configuration python: {'index': 0}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/remove_filter_section" />
</tal:block>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
<tal:block tal:define="search_query python: ''">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" />
</tal:block>
</tbody></table>
</body>
......
......@@ -17,13 +17,11 @@
<td>${base_url}/bar_module/ListBoxZuite_reset</td>
<td></td>
</tr>
<tr>
<td>assertTextPresent</td>
<td>Reset Successfully.</td>
<td></td>
</tr>
<tr>
<td>open</td>
<td>${base_url}/foo_module/FooModule_createObjects</td>
......@@ -44,7 +42,6 @@
<td>${base_url}/web_site_module/renderjs_runner/#/foo_module</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//a[@data-i18n='Previous']</td>
......@@ -52,185 +49,37 @@
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/triggle_filter_and" />
<tr>
<td>waitForElementPresent</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//select[@name='heard_about']</td>
<td></td>
</tr>
<tr>
<td>verifyValue</td>
<td>//select[@name='heard_about']</td>
<td>AND</td>
</tr>
<tr>
<td>select</td>
<td>//select[@name='heard_about']</td>
<td>index=1</td>
</tr>
<tr>
<td>verifyValue</td>
<td>//select[@name='heard_about']</td>
<td>OR</td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class='filter_item_container']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[1]//select</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>//div[@class="filter_item_container"]/div[1]//select</td>
<td>index=0</td>
</tr>
<tr>
<td>type</td>
<td>//div[@class="filter_item_container"]/div[1]//input</td>
<td>0</td>
</tr>
<tr>
<td>click</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[2]//select</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>//div[@class="filter_item_container"]/div[2]//select</td>
<td>index=1</td>
</tr>
<tr>
<td>type</td>
<td>//div[@class="filter_item_container"]/div[2]//input</td>
<td>Title 2</td>
</tr>
<tr>
<td>click</td>
<td>//button[@class="submit responsive ui-last-child ui-btn ui-btn-icon-left ui-icon-check"]</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/change_filter_to_or" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/add_new_filter_section" />
<tal:block tal:define="filter_section_configuration python: {'key': 'id', 'value': '0', 'index': 0}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/set_filter_section" />
</tal:block>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/add_new_filter_section" />
<tal:block tal:define="filter_section_configuration python: {'key': 'title', 'value': 'Title 2', 'index': 1}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/set_filter_section" />
</tal:block>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
<tal:block tal:define="search_query python: '( id:&nbsp; &#34;0&#34; OR title:&nbsp; &#34;Title 2&#34; )'">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" />
</tal:block>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/triggle_filter_or" />
<tal:block tal:define="filter_section_configuration python: {'index': 1}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/remove_filter_section" />
</tal:block>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[2]</td>
<td></td>
</tr>
<tr>
<td>focus</td>
<td>//div[@class="filter_item_container"]/div[2]//button</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//div[@class="filter_item_container"]/div[2]//button</td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
<td>//div[@class="filter_item_container"]/div[2]</td>
<td></td>
</tr>
<tr>
<td>verifyElementNotPresent</td>
<td>//div[@class="filter_item_container"]/div[2]</td>
<td></td>
</tr>
<tr>
<td>focus</td>
<td>//div[@class="filter_item_container"]/div[1]//button</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//div[@class="filter_item_container"]/div[1]//button</td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
<td>//div[@class="filter_item_container"]/div[1]</td>
<td></td>
</tr>
<tr>
<td>verifyElementNotPresent</td>
<td>//div[@class="filter_item_container"]/div[1]</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//button[@class="submit responsive ui-last-child ui-btn ui-btn-icon-left ui-icon-check"]</td>
<td></td>
</tr>
<tal:block tal:define="filter_section_configuration python: {'index': 0}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/remove_filter_section" />
</tal:block>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
<tal:block tal:define="search_query python: ''">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" />
</tal:block>
</tbody></table>
</body>
......
......@@ -52,136 +52,29 @@
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/triggle_filter_and" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/change_filter_to_or" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/add_new_filter_section" />
<tal:block tal:define="filter_section_configuration python: {'key': 'id', 'value': '0', 'index': 0}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/set_filter_section" />
</tal:block>
<tr>
<td>select</td>
<td>//select[@name='heard_about']</td>
<td>index=1</td>
</tr>
<tr>
<td>verifyValue</td>
<td>//select[@name='heard_about']</td>
<td>OR</td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[1]//select</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>//div[@class="filter_item_container"]/div[1]//select</td>
<td>index=0</td>
</tr>
<tr>
<td>type</td>
<td>//div[@class="filter_item_container"]/div[1]//input</td>
<td>0</td>
</tr>
<tr>
<td>click</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[2]//select</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>//div[@class="filter_item_container"]/div[2]//select</td>
<td>index=0</td>
</tr>
<tr>
<td>type</td>
<td>//div[@class="filter_item_container"]/div[2]//input</td>
<td>1</td>
</tr>
<tr>
<td>click</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[3]//select</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>//div[@class="filter_item_container"]/div[3]//select</td>
<td>index=0</td>
</tr>
<tr>
<td>type</td>
<td>//div[@class="filter_item_container"]/div[3]//input</td>
<td>2</td>
</tr>
<tr>
<td>click</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[4]//select</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>//div[@class="filter_item_container"]/div[4]//select</td>
<td>index=0</td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/add_new_filter_section" />
<tal:block tal:define="filter_section_configuration python: {'key': 'id', 'value': '1', 'index': 1}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/set_filter_section" />
</tal:block>
<tr>
<td>type</td>
<td>//div[@class="filter_item_container"]/div[4]//input</td>
<td>3</td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/add_new_filter_section" />
<tal:block tal:define="filter_section_configuration python: {'key': 'id', 'value': '2', 'index': 2}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/set_filter_section" />
</tal:block>
<tr>
<td>click</td>
<td>//button[@class="submit responsive ui-last-child ui-btn ui-btn-icon-left ui-icon-check"]</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/add_new_filter_section" />
<tal:block tal:define="filter_section_configuration python: {'key': 'id', 'value': '3', 'index': 3}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/set_filter_section" />
</tal:block>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
<tr>
......@@ -189,13 +82,15 @@
<td>link=Title 2</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>link=Title 2</td>
<td></td>
</tr>
<tal:block tal:define="search_query python: '( id:&nbsp; &#34;0&#34; OR id:&nbsp; &#34;1&#34; OR id:&nbsp; &#34;2&#34; OR id:&nbsp; &#34;3&#34; )'">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" />
</tal:block>
<tr>
<td>click</td>
......@@ -208,14 +103,11 @@
<td>link=Title 2</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>link=Title 0</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>link=Title 0</td>
......@@ -227,7 +119,6 @@
<td>//a[@data-i18n="Previous"]</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//a[@data-i18n="Previous"]</td>
......@@ -239,146 +130,38 @@
<td>link=Title 0</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>link=Title 2</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>link=Title 2</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//button[text()='Filter']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//button[text()='Filter']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[4]</td>
<td></td>
</tr>
<tr>
<td>focus</td>
<td>//div[@class="filter_item_container"]/div[4]//button</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//div[@class="filter_item_container"]/div[4]//button</td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
<td>//div[@class="filter_item_container"]/div[4]</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[3]</td>
<td></td>
</tr>
<tr>
<td>focus</td>
<td>//div[@class="filter_item_container"]/div[3]//button</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//div[@class="filter_item_container"]/div[3]//button</td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
<td>//div[@class="filter_item_container"]/div[3]</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[2]</td>
<td></td>
</tr>
<tr>
<td>focus</td>
<td>//div[@class="filter_item_container"]/div[2]//button</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//div[@class="filter_item_container"]/div[2]//button</td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
<td>//div[@class="filter_item_container"]/div[2]</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/triggle_filter_or" />
<tal:block tal:define="filter_section_configuration python: {'index': 3}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/remove_filter_section" />
</tal:block>
<tal:block tal:define="filter_section_configuration python: {'index': 2}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/remove_filter_section" />
</tal:block>
<tal:block tal:define="filter_section_configuration python: {'index': 1}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/remove_filter_section" />
</tal:block>
<tal:block tal:define="filter_section_configuration python: {'index': 0}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/remove_filter_section" />
</tal:block>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[1]</td>
<td></td>
</tr>
<tr>
<td>focus</td>
<td>//div[@class="filter_item_container"]/div[1]//button</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//div[@class="filter_item_container"]/div[1]//button</td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
<td>//div[@class="filter_item_container"]/div[1]</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//button[@class="submit responsive ui-last-child ui-btn ui-btn-icon-left ui-icon-check"]</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
<tal:block tal:define="search_query python: ''">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" />
</tal:block>
</tbody></table>
</body>
......
......@@ -52,95 +52,54 @@
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/triggle_filter_and" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/add_new_filter_section" />
<tal:block tal:define="filter_section_configuration python: {'key': 'id', 'value': '0', 'index': 0}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/set_filter_section" />
</tal:block>
<tr>
<td>waitForElementPresent</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[1]//select</td>
<td></td>
</tr>
<tr>
<td>select</td>
<td>//div[@class="filter_item_container"]/div[1]//select</td>
<td>index=0</td>
</tr>
<tr>
<td>type</td>
<td>//div[@class="filter_item_container"]/div[1]//input</td>
<td>0</td>
</tr>
<tr>
<td>click</td>
<td>//button[@class="submit responsive ui-last-child ui-btn ui-btn-icon-left ui-icon-check"]</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
<tr>
<td>waitForElementPresent</td>
<td>link=Title 0</td>
<td></td>
</tr>
<tr>
<td>verifyElementPresent</td>
<td>link=Title 0</td>
<td></td>
</tr>
<tal:block tal:define="search_query python: '( id:&nbsp; &#34;0&#34; )'">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" />
</tal:block>
<tr>
<td>click</td>
<td>link=Title 0</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//a[@data-i18n='Editable']</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//a[@data-i18n='Next']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//a[@data-i18n='Next']</td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
<td>//a[@data-i18n = "Title 0"]</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//a[@data-i18n='Foo Module']</td>
......@@ -148,41 +107,16 @@
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/triggle_filter_and" />
<tal:block tal:define="filter_section_configuration python: {'index': 0}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/remove_filter_section" />
</tal:block>
<tr>
<td>waitForElementPresent</td>
<td>//div[@class="filter_item_container"]/div[1]</td>
<td></td>
</tr>
<tr>
<td>focus</td>
<td>//div[@class="filter_item_container"]/div[1]//button</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//div[@class="filter_item_container"]/div[1]//button</td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
<td>//div[@class="filter_item_container"]/div[1]</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//button[@class="submit responsive ui-last-child ui-btn ui-btn-icon-left ui-icon-check"]</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/submit_filter" />
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
<tal:block tal:define="search_query python: ''">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_search_in_form_list" />
</tal:block>
</tbody></table>
</body>
......
......@@ -46,18 +46,7 @@
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/add_new_filter_section" />
<tr>
<td>waitForElementPresent</td>
......
......@@ -68,17 +68,7 @@
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tr>
<td>click</td>
<td>//button[@class='plus ui-btn-c ui-override-theme ui-btn ui-icon-plus ui-btn-icon-left ui-corner-all']</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/add_new_filter_section" />
<tr>
<td>waitForElementPresent</td>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment