Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
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
Jérome Perrin
slapos.core
Commits
14af5289
Commit
14af5289
authored
Jul 31, 2018
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio_ui_test: wait for activities.
parent
75b3d3ab
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
58 additions
and
49 deletions
+58
-49
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSNetwork.zpt
...eItem/portal_tests/slaposjs_zuite/testSlapOSJSNetwork.zpt
+4
-5
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSProject.zpt
...eItem/portal_tests/slaposjs_zuite/testSlapOSJSProject.zpt
+3
-5
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServer.zpt
...teItem/portal_tests/slaposjs_zuite/testSlapOSJSServer.zpt
+3
-18
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSService.zpt
...eItem/portal_tests/slaposjs_zuite/testSlapOSJSService.zpt
+3
-5
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSSite.zpt
...lateItem/portal_tests/slaposjs_zuite/testSlapOSJSSite.zpt
+5
-6
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTicket.zpt
...teItem/portal_tests/slaposjs_zuite/testSlapOSJSTicket.zpt
+3
-5
master/bt5/slapos_jio_ui_test/SkinTemplateItem/portal_skins/slapos_ui_test/Zuite_SlapOSCommonTemplate.zpt
...ortal_skins/slapos_ui_test/Zuite_SlapOSCommonTemplate.zpt
+37
-5
No files found.
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSNetwork.zpt
View file @
14af5289
...
@@ -89,11 +89,6 @@
...
@@ -89,11 +89,6 @@
<td>
//button[@type="submit" and text()="Data Updated"]
</td>
<td>
//button[@type="submit" and text()="Data Updated"]
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<td>
pause
</td>
<td>
5000
</td>
<td>
5000
</td>
</tr>
<!-- check site -->
<!-- check site -->
<!-- Broken history to return
<!-- Broken history to return
...
@@ -103,6 +98,8 @@
...
@@ -103,6 +98,8 @@
<td></td>
<td></td>
</tr>
</tr>
-->
-->
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page"
/>
<tr>
<tr>
<td>
click
</td>
<td>
click
</td>
<td>
//a[@data-i18n="Networks"]
</td>
<td>
//a[@data-i18n="Networks"]
</td>
...
@@ -168,6 +165,8 @@
...
@@ -168,6 +165,8 @@
<td>
//button[@type="submit" and text()="Network is Deleted."]
</td>
<td>
//button[@type="submit" and text()="Network is Deleted."]
</td>
<td></td>
<td></td>
</tr>
</tr>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page"
/>
<tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
waitForElementPresent
</td>
<td>
//span[@data-i18n="No records"]
</td>
<td>
//span[@data-i18n="No records"]
</td>
...
...
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSProject.zpt
View file @
14af5289
...
@@ -89,11 +89,6 @@
...
@@ -89,11 +89,6 @@
<td>
//button[@type="submit" and text()="Data Updated"]
</td>
<td>
//button[@type="submit" and text()="Data Updated"]
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<td>
pause
</td>
<td>
5000
</td>
<td>
5000
</td>
</tr>
<!-- check site -->
<!-- check site -->
<!-- Broken history to return
<!-- Broken history to return
...
@@ -103,6 +98,7 @@
...
@@ -103,6 +98,7 @@
<td></td>
<td></td>
</tr>
</tr>
-->
-->
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page"
/>
<tr>
<tr>
<td>
click
</td>
<td>
click
</td>
<td>
//a[@data-i18n="Projects"]
</td>
<td>
//a[@data-i18n="Projects"]
</td>
...
@@ -168,6 +164,8 @@
...
@@ -168,6 +164,8 @@
<td>
//button[@type="submit" and text()="Project is Deleted."]
</td>
<td>
//button[@type="submit" and text()="Project is Deleted."]
</td>
<td></td>
<td></td>
</tr>
</tr>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page"
/>
<tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
waitForElementPresent
</td>
<td>
//span[@data-i18n="No records"]
</td>
<td>
//span[@data-i18n="No records"]
</td>
...
...
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSServer.zpt
View file @
14af5289
...
@@ -97,20 +97,8 @@
...
@@ -97,20 +97,8 @@
<td>
//a[@data-i18n="Computer: TEST-SLAPOSJS-COMPUTER 0"]
</td>
<td>
//a[@data-i18n="Computer: TEST-SLAPOSJS-COMPUTER 0"]
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page"
/>
<td>
pause
</td>
<td>
5000
</td>
<td>
5000
</td>
</tr>
<!-- check site -->
<!-- Broken history to return
<tr>
<td>click</td>
<td>//a[@data-i18n="Site : TEST-SLAPOSJS-SET 0"]</td>
<td></td>
</tr>
-->
<tr>
<tr>
<td>
click
</td>
<td>
click
</td>
<td>
//a[@data-i18n="Servers" and @accesskey="c"]
</td>
<td>
//a[@data-i18n="Servers" and @accesskey="c"]
</td>
...
@@ -507,11 +495,8 @@
...
@@ -507,11 +495,8 @@
<td>
//h1[@data-i18n='Servers']
</td>
<td>
//h1[@data-i18n='Servers']
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page"
/>
<td>
pause
</td>
<td>
5000
</td>
<td>
5000
</td>
</tr>
<tr>
<tr>
<td>
click
</td>
<td>
click
</td>
<td>
//th/a[text()="Title"]
</td>
<td>
//th/a[text()="Title"]
</td>
...
...
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSService.zpt
View file @
14af5289
...
@@ -118,11 +118,8 @@
...
@@ -118,11 +118,8 @@
<td>
//button[@type="submit" and text()="New service created."]
</td>
<td>
//button[@type="submit" and text()="New service created."]
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<td>
pause
</td>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page"
/>
<td>
5000
</td>
<td>
5000
</td>
</tr>
<tr>
<tr>
<td>
click
</td>
<td>
click
</td>
...
@@ -194,6 +191,7 @@
...
@@ -194,6 +191,7 @@
<td>
//button[@type="submit" and text()="Service is Destroyed."]
</td>
<td>
//button[@type="submit" and text()="Service is Destroyed."]
</td>
<td></td>
<td></td>
</tr>
</tr>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page"
/>
<tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
waitForElementPresent
</td>
<td>
//span[@data-i18n="No records"]
</td>
<td>
//span[@data-i18n="No records"]
</td>
...
...
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSSite.zpt
View file @
14af5289
...
@@ -99,12 +99,9 @@
...
@@ -99,12 +99,9 @@
<td>
//div[@class="leaflet-popup-content"]/div/a[text()="TEST-SLAPOSJS-SET 0"]
</td>
<td>
//div[@class="leaflet-popup-content"]/div/a[text()="TEST-SLAPOSJS-SET 0"]
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<td>
pause
</td>
<td>
5000
</td>
<!-- check site -->
<td>
5000
</td>
</tr>
<!-- check site -->
<!-- Broken history to return
<!-- Broken history to return
<tr>
<tr>
...
@@ -113,6 +110,8 @@
...
@@ -113,6 +110,8 @@
<td></td>
<td></td>
</tr>
</tr>
-->
-->
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page"
/>
<tr>
<tr>
<td>
click
</td>
<td>
click
</td>
<td>
//a[@data-i18n="Sites"]
</td>
<td>
//a[@data-i18n="Sites"]
</td>
...
...
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSTicket.zpt
View file @
14af5289
...
@@ -87,11 +87,9 @@
...
@@ -87,11 +87,9 @@
<td>
//button[@type="submit" and @data-i18n="Save"]
</td>
<td>
//button[@type="submit" and @data-i18n="Save"]
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<td>
pause
</td>
<tal:block
metal:use-macro=
"here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_activities_and_front_page"
/>
<td>
5000
</td>
<td>
5000
</td>
</tr>
<tr>
<tr>
<td>
click
</td>
<td>
click
</td>
<td>
//a[@data-i18n="Tickets"]
</td>
<td>
//a[@data-i18n="Tickets"]
</td>
...
...
master/bt5/slapos_jio_ui_test/SkinTemplateItem/portal_skins/slapos_ui_test/Zuite_SlapOSCommonTemplate.zpt
View file @
14af5289
...
@@ -110,6 +110,23 @@
...
@@ -110,6 +110,23 @@
</tr>
</tr>
</tal:block>
</tal:block>
<tal:block metal:define-macro="slapos_wait_for_activities_and_front_page">
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
<tr>
<td>assertTextPresent</td>
<td>Done.</td>
<td></td>
</tr>
<tr>
<td>open</td>
<td>${base_url}/web_site_module/hostingjs/</td>
<td></td>
</tr>
<tal:block metal:use-macro="here/Zuite_SlapOSCommonTemplate/macros/slapos_wait_for_front_page" />
</tal:block>
<tal:block metal:define-macro="slapos_wait_for_front_page">
<tal:block metal:define-macro="slapos_wait_for_front_page">
<!-- Dashboard -->
<!-- Dashboard -->
<tr>
<tr>
...
@@ -133,11 +150,6 @@
...
@@ -133,11 +150,6 @@
<td>//a[@class='leaflet-control-zoom-out']</td>
<td>//a[@class='leaflet-control-zoom-out']</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<td>pause</td>
<td>5000</td>
<td>5000</td>
</tr>
</tal:block>
</tal:block>
<tal:block metal:define-macro="slapos_logout">
<tal:block metal:define-macro="slapos_logout">
...
@@ -171,4 +183,24 @@
...
@@ -171,4 +183,24 @@
</tr>
</tr>
</tal:block>
</tal:block>
<tal:block metal:define-macro="wait_for_content_loaded">
<tr>
<td colspan="3"><b>Wait for the content to be loaded</b></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//div[contains(@data-gadget-url, 'gadget_erp5_header.html')]//h1[@class="ui-title"]//*[contains(@class, "ui-icon-spinner")]</td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
<td>//div[contains(@data-gadget-url, 'gadget_erp5_header.html')]//h1[@class="ui-title"]//*[contains(@class, "ui-icon-spinner")]</td>
<td></td>
</tr>
<tr>
<td colspan="3"><p></p></td>
</tr>
</tal:block>
</tal:block>
</tal:block>
\ No newline at end of file
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