Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Frederic Thoma
erp5
Commits
5021516a
Commit
5021516a
authored
Mar 04, 2020
by
Romain Courteaud
Committed by
Xiaowu Zhang
Apr 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui_test: stop relying on data-i18n attributes
parent
56859822
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
14 deletions
+34
-14
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_logout_zuite/testRenderjsLogout.zpt
...tal_tests/renderjs_ui_logout_zuite/testRenderjsLogout.zpt
+23
-3
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageAction.zpt
...rtal_tests/renderjs_ui_translate_zuite/testPageAction.zpt
+1
-1
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageFormEditable.zpt
...ests/renderjs_ui_translate_zuite/testPageFormEditable.zpt
+1
-1
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageTab.zpt
.../portal_tests/renderjs_ui_translate_zuite/testPageTab.zpt
+1
-1
bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.zpt
...eb_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.zpt
+8
-8
No files found.
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_logout_zuite/testRenderjsLogout.zpt
View file @
5021516a
...
...
@@ -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>
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageAction.zpt
View file @
5021516a
...
...
@@ -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"
/>
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageFormEditable.zpt
View file @
5021516a
...
...
@@ -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': '
Editabl
e'}"
>
<tal:block
tal:define=
"click_configuration python: {'text': '
bianxu
e'}"
>
<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"
/>
...
...
bt5/erp5_web_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_translate_zuite/testPageTab.zpt
View file @
5021516a
...
...
@@ -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"
/>
...
...
bt5/erp5_web_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui_test/Zuite_CommonTemplateForRenderjsUi.zpt
View file @
5021516a
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment