Commit bb05296b authored by Jérome Perrin's avatar Jérome Perrin

*_ui_test: make Zelenium tests compatible with Zope4 ZMI

The status message no longer use system-msg class, use simpler
"assertTextPresent" that should be enough.

Simplify the waiting for static pages, clickAndWait is enough.
parent 21df7d3e
...@@ -21,18 +21,13 @@ ...@@ -21,18 +21,13 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//label/a[@href="portal_skins/erp5_core/Preference_viewHtmlStyle/my_preferred_html_style_developper_mode/manage_main"]</td> <td>//label/a[@href="portal_skins/erp5_core/Preference_viewHtmlStyle/my_preferred_html_style_developper_mode/manage_main"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>waitForElementPresent</td>
<td>//a[@href="fieldTest"]/span/strong</td>
<td></td>
</tr>
<tr> <tr>
<td>assertElementPresent</td> <td>assertElementPresent</td>
<td>//a[@href="fieldTest"]/span/strong</td> <td>//a[@href="fieldTest"]/descendant-or-self::*[text()="Test"]</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -38,18 +38,13 @@ ...@@ -38,18 +38,13 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//div[@data-gadget-scope="erp5_form"]/a[@href="portal_skins/erp5_core/Preference_viewHtmlStyle/manage_main"]</td> <td>//div[@data-gadget-scope="erp5_form"]/a[@href="portal_skins/erp5_core/Preference_viewHtmlStyle/manage_main"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>waitForElementPresent</td>
<td>//a[@href="formTest"]/span/strong</td>
<td></td>
</tr>
<tr> <tr>
<td>assertElementPresent</td> <td>assertElementPresent</td>
<td>//a[@href="formTest"]/span/strong</td> <td>//a[@href="formTest"]/descendant-or-self::*[text()="Test"]</td>
<td></td> <td></td>
</tr> </tr>
</tbody></table> </tbody></table>
......
...@@ -37,18 +37,13 @@ ...@@ -37,18 +37,13 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//div[@data-gadget-scope="erp5_form"]/a[@href="hateoas/Base_edit/manage_main"]</td> <td>//div[@data-gadget-scope="erp5_form"]/a[@href="hateoas/Base_edit/manage_main"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>waitForElementPresent</td>
<td>//a[@href="ZScriptHTML_tryForm"]/span/strong</td>
<td></td>
</tr>
<tr> <tr>
<td>assertElementPresent</td> <td>assertElementPresent</td>
<td>//a[@href="ZScriptHTML_tryForm"]/span/strong</td> <td>//a[@href="ZScriptHTML_tryForm"]/descendant-or-self::*[text()="Test"]</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -38,18 +38,13 @@ ...@@ -38,18 +38,13 @@
<td>current_location</td> <td>current_location</td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//div[@data-gadget-scope="erp5_form"]/a[@href="portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/manage_main"]</td> <td>//div[@data-gadget-scope="erp5_form"]/a[@href="portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/manage_main"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>waitForElementPresent</td>
<td>//a[@href="formTest"]/span/strong</td>
<td></td>
</tr>
<tr> <tr>
<td>assertElementPresent</td> <td>assertElementPresent</td>
<td>//a[@href="formTest"]/span/strong</td> <td>//a[@href="formTest"]/descendant-or-self::*[text()="Test"]</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
...@@ -64,13 +59,13 @@ ...@@ -64,13 +59,13 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//div[@data-gadget-scope="erp5_form"]/a[@href="hateoas/Base_doSelect/manage_main"]</td> <td>//div[@data-gadget-scope="erp5_form"]/a[@href="hateoas/Base_doSelect/manage_main"]</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>waitForElementPresent</td> <td>assertElementPresent</td>
<td>//a[@href="ZScriptHTML_tryForm"]/span/strong</td> <td>//a[@href="ZScriptHTML_tryForm"]/descendant-or-self::*[text()="Test"]</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
...@@ -95,8 +90,8 @@ ...@@ -95,8 +90,8 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>waitForElementPresent</td> <td>assertElementPresent</td>
<td>//a[@href="fieldTest"]/span/strong</td> <td>//a[@href="fieldTest"]/descendant-or-self::*[text()="Test"]</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>waitForElementPresent</td> <td>assertElementPresent</td>
<td>//a[@href="ZScriptHTML_tryForm"]/span/strong</td> <td>//a[@href="ZScriptHTML_tryForm"]/descendant-or-self::*[text()="Test"]</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -23,13 +23,13 @@ ...@@ -23,13 +23,13 @@
</tr> </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_content_loaded" />
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//div[contains(@data-gadget-url, 'gadget_erp5_label_field.html')]/a[@href="portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox/manage_main"]</td> <td>//div[contains(@data-gadget-url, 'gadget_erp5_label_field.html')]/a[@href="portal_skins/erp5_accounting/AccountingTransactionModule_viewAccountingTransactionList/listbox/manage_main"]</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>waitForElementPresent</td> <td>assertElementPresent</td>
<td>//a[@href="fieldTest"]/span/strong</td> <td>//a[@href="fieldTest"]/descendant-or-self::*[text()="Test"]</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
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