Commit 15c018c1 authored by Boxiang Sun's avatar Boxiang Sun

erp5_user_tutorial_ui_test: Update user login to adapt the new UI

parent 0e1afe84
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</tr> </tr>
<!-- Logout --> <!-- Logout -->
<tr> <tr>
<td>openAndWait</td> <td>open</td>
<td>${base_url}</td> <td>${base_url}</td>
<td></td> <td></td>
</tr> </tr>
...@@ -42,7 +42,16 @@ ...@@ -42,7 +42,16 @@
<tal:block tal:define="click_configuration python: {'text': 'Logout'}"> <tal:block tal:define="click_configuration python: {'text': 'Logout'}">
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_panel_link" /> <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/click_on_panel_link" />
</tal:block> </tal:block>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" /> <tr>
<td>waitForElementPresent</td>
<td>//h1/a[@data-i18n="Logout"]</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@value="Confirm"]</td>
<td></td>
</tr>
<tr> <tr>
<td>click</td> <td>click</td>
<td>//input[@value="Confirm"]</td> <td>//input[@value="Confirm"]</td>
...@@ -212,16 +221,7 @@ ...@@ -212,16 +221,7 @@
<td></td> <td></td>
</tr> </tr>
<!-- login with functional test user --> <!-- login with functional test user -->
<tr> <span metal:use-macro="container/Zuite_viewTestMacroLibrary/macros/logout">Logout</span>
<td>openAndWait</td>
<td>${base_url}/logout</td>
<td></td>
</tr>
<tr>
<td>openAndWait</td>
<td>${base_url}/login_form</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>//input[@name="__ac_name"]</td> <td>//input[@name="__ac_name"]</td>
...@@ -235,21 +235,11 @@ ...@@ -235,21 +235,11 @@
here.Zuite_getHowToInfo()['functional_test_user_password']"></td> here.Zuite_getHowToInfo()['functional_test_user_password']"></td>
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>click</td>
<td>//input[@name="logged_in:method"]</td> <td>//input[@value="Login"]</td>
<td></td>
</tr>
<tr>
<td>openAndWait</td>
<td>${base_url}/view</td>
<td></td>
</tr>
<tr>
<td>assertTextPresent</td>
<td tal:content="python:
here.Zuite_getHowToInfo()['functional_another_test_username']"></td>
<td></td> <td></td>
</tr> </tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_app_loaded" />
<span metal:use-macro="container/Zuite_viewTestMacroLibrary/macros/wait_for_activities"> Wait for activities</span> <span metal:use-macro="container/Zuite_viewTestMacroLibrary/macros/wait_for_activities"> Wait for activities</span>
<tr> <tr>
<td>openAndWait</td> <td>openAndWait</td>
...@@ -273,9 +263,10 @@ ...@@ -273,9 +263,10 @@
</tr> </tr>
<tr> <tr>
<td>openAndWait</td> <td>openAndWait</td>
<td>${base_url}/view</td> <td>${base_url}</td>
<td></td> <td></td>
</tr> </tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_app_loaded" />
</tal:block> </tal:block>
<tal:block metal:define-macro="login_as_user"> <tal:block metal:define-macro="login_as_user">
......
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