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
Labels
Merge Requests
17
Merge Requests
17
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
6bf8e336
Commit
6bf8e336
authored
May 26, 2021
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Plain Diff
[master] various contributions: configuration and tests
See merge request
!302
parents
ff176a4b
06160c1d
Pipeline
#15669
passed with stage
Changes
6
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
5 additions
and
19 deletions
+5
-19
master/bt5/slapos_configurator/TestTemplateItem/portal_components/test.erp5.testSlapOSConfigurator.py
...tem/portal_components/test.erp5.testSlapOSConfigurator.py
+0
-1
master/bt5/slapos_configurator/bt/dependency_list
master/bt5/slapos_configurator/bt/dependency_list
+2
-1
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5GroupRoleSecurity.py
...l_components/test.erp5.testSlapOSERP5GroupRoleSecurity.py
+1
-1
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SkinSelection.py
...ortal_components/test.erp5.testSlapOSERP5SkinSelection.py
+0
-13
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSInvoice.zpt
...eItem/portal_tests/slaposjs_zuite/testSlapOSJSInvoice.zpt
+2
-2
master/product/SlapOS/tests/testSlapOSMixin.py
master/product/SlapOS/tests/testSlapOSMixin.py
+0
-1
No files found.
master/bt5/slapos_configurator/TestTemplateItem/portal_components/test.erp5.testSlapOSConfigurator.py
View file @
6bf8e336
...
@@ -280,7 +280,6 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
...
@@ -280,7 +280,6 @@ class TestSlapOSConfigurator(SlapOSTestCaseMixin):
'erp5_simulation'
,
'erp5_simulation'
,
'erp5_pdm'
,
'erp5_pdm'
,
'erp5_trade'
,
'erp5_trade'
,
'erp5_ui_test_core'
,
'erp5_tiosafe_core'
,
'erp5_tiosafe_core'
,
'erp5_item'
,
'erp5_item'
,
'erp5_forge'
,
'erp5_forge'
,
...
...
master/bt5/slapos_configurator/bt/dependency_list
View file @
6bf8e336
erp5_configurator
erp5_configurator
erp5_full_text_mroonga_catalog
\ No newline at end of file
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5GroupRoleSecurity.py
View file @
6bf8e336
...
@@ -1025,7 +1025,7 @@ class TestSoftwareInstallation(TestSlapOSGroupRoleSecurityMixin):
...
@@ -1025,7 +1025,7 @@ class TestSoftwareInstallation(TestSlapOSGroupRoleSecurityMixin):
self
.
assertSecurityGroup
(
installation
,
[
self
.
user_id
,
self
.
assertSecurityGroup
(
installation
,
[
self
.
user_id
,
'G-COMPANY'
,
provider
.
getUserId
()],
False
)
'G-COMPANY'
,
provider
.
getUserId
()],
False
)
self
.
assertRoles
(
installation
,
'G-COMPANY'
,
[
'Assignor'
])
self
.
assertRoles
(
installation
,
'G-COMPANY'
,
[
'Assignor'
])
self
.
assertRoles
(
installation
,
provider
.
getUserId
(),
[
'Assign
or
'
])
self
.
assertRoles
(
installation
,
provider
.
getUserId
(),
[
'Assign
ee
'
])
self
.
assertRoles
(
installation
,
self
.
user_id
,
[
'Owner'
])
self
.
assertRoles
(
installation
,
self
.
user_id
,
[
'Owner'
])
class
TestSoftwareInstallationModule
(
TestSlapOSGroupRoleSecurityMixin
):
class
TestSoftwareInstallationModule
(
TestSlapOSGroupRoleSecurityMixin
):
...
...
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SkinSelection.py
View file @
6bf8e336
...
@@ -145,7 +145,6 @@ erp5_syncml
...
@@ -145,7 +145,6 @@ erp5_syncml
erp5_system_event
erp5_system_event
erp5_toolbox
erp5_toolbox
erp5_trade
erp5_trade
erp5_ui_test_core
erp5_vcs
erp5_vcs
erp5_web
erp5_web
erp5_web_crm
erp5_web_crm
...
@@ -257,7 +256,6 @@ erp5_syncml
...
@@ -257,7 +256,6 @@ erp5_syncml
erp5_system_event
erp5_system_event
erp5_toolbox
erp5_toolbox
erp5_trade
erp5_trade
erp5_ui_test_core
erp5_vcs
erp5_vcs
erp5_web
erp5_web
erp5_web_crm
erp5_web_crm
...
@@ -369,7 +367,6 @@ erp5_syncml
...
@@ -369,7 +367,6 @@ erp5_syncml
erp5_system_event
erp5_system_event
erp5_toolbox
erp5_toolbox
erp5_trade
erp5_trade
erp5_ui_test_core
erp5_vcs
erp5_vcs
erp5_web
erp5_web
erp5_web_crm
erp5_web_crm
...
@@ -482,7 +479,6 @@ erp5_syncml
...
@@ -482,7 +479,6 @@ erp5_syncml
erp5_system_event
erp5_system_event
erp5_toolbox
erp5_toolbox
erp5_trade
erp5_trade
erp5_ui_test_core
erp5_vcs
erp5_vcs
erp5_web
erp5_web
erp5_web_crm
erp5_web_crm
...
@@ -596,7 +592,6 @@ erp5_syncml
...
@@ -596,7 +592,6 @@ erp5_syncml
erp5_system_event
erp5_system_event
erp5_toolbox
erp5_toolbox
erp5_trade
erp5_trade
erp5_ui_test_core
erp5_vcs
erp5_vcs
erp5_web
erp5_web
erp5_web_crm
erp5_web_crm
...
@@ -708,7 +703,6 @@ erp5_syncml
...
@@ -708,7 +703,6 @@ erp5_syncml
erp5_system_event
erp5_system_event
erp5_toolbox
erp5_toolbox
erp5_trade
erp5_trade
erp5_ui_test_core
erp5_vcs
erp5_vcs
erp5_web
erp5_web
erp5_web_crm
erp5_web_crm
...
@@ -819,7 +813,6 @@ erp5_syncml
...
@@ -819,7 +813,6 @@ erp5_syncml
erp5_system_event
erp5_system_event
erp5_toolbox
erp5_toolbox
erp5_trade
erp5_trade
erp5_ui_test_core
erp5_vcs
erp5_vcs
erp5_web
erp5_web
erp5_web_crm
erp5_web_crm
...
@@ -931,7 +924,6 @@ erp5_syncml
...
@@ -931,7 +924,6 @@ erp5_syncml
erp5_system_event
erp5_system_event
erp5_toolbox
erp5_toolbox
erp5_trade
erp5_trade
erp5_ui_test_core
erp5_vcs
erp5_vcs
erp5_web
erp5_web
erp5_web_crm
erp5_web_crm
...
@@ -1042,7 +1034,6 @@ erp5_syncml
...
@@ -1042,7 +1034,6 @@ erp5_syncml
erp5_system_event
erp5_system_event
erp5_toolbox
erp5_toolbox
erp5_trade
erp5_trade
erp5_ui_test_core
erp5_vcs
erp5_vcs
erp5_web
erp5_web
erp5_web_crm
erp5_web_crm
...
@@ -1154,7 +1145,6 @@ erp5_syncml
...
@@ -1154,7 +1145,6 @@ erp5_syncml
erp5_system_event
erp5_system_event
erp5_toolbox
erp5_toolbox
erp5_trade
erp5_trade
erp5_ui_test_core
erp5_vcs
erp5_vcs
erp5_web
erp5_web
erp5_web_crm
erp5_web_crm
...
@@ -1266,7 +1256,6 @@ erp5_syncml
...
@@ -1266,7 +1256,6 @@ erp5_syncml
erp5_system_event
erp5_system_event
erp5_toolbox
erp5_toolbox
erp5_trade
erp5_trade
erp5_ui_test_core
erp5_vcs
erp5_vcs
erp5_web
erp5_web
erp5_web_crm
erp5_web_crm
...
@@ -1379,7 +1368,6 @@ erp5_syncml
...
@@ -1379,7 +1368,6 @@ erp5_syncml
erp5_system_event
erp5_system_event
erp5_toolbox
erp5_toolbox
erp5_trade
erp5_trade
erp5_ui_test_core
erp5_vcs
erp5_vcs
erp5_web
erp5_web
erp5_web_crm
erp5_web_crm
...
@@ -1492,7 +1480,6 @@ erp5_syncml
...
@@ -1492,7 +1480,6 @@ erp5_syncml
erp5_system_event
erp5_system_event
erp5_toolbox
erp5_toolbox
erp5_trade
erp5_trade
erp5_ui_test_core
erp5_vcs
erp5_vcs
erp5_web
erp5_web
erp5_web_crm
erp5_web_crm
...
...
master/bt5/slapos_jio_ui_test/PathTemplateItem/portal_tests/slaposjs_zuite/testSlapOSJSInvoice.zpt
View file @
6bf8e336
...
@@ -62,12 +62,12 @@
...
@@ -62,12 +62,12 @@
<tr>
<tr>
<td>
waitForElementPresent
</td>
<td>
waitForElementPresent
</td>
<td>
//p[
text()='10/20/2019
']
</td>
<td>
//p[
@data-date='2019-10-20
']
</td>
<td></td>
<td></td>
</tr>
</tr>
<tr>
<tr>
<td>
click
</td>
<td>
click
</td>
<td>
//p[
text()='10/20/2019
']
</td>
<td>
//p[
@data-date='2019-10-20
']
</td>
<td></td>
<td></td>
</tr>
</tr>
...
...
master/product/SlapOS/tests/testSlapOSMixin.py
View file @
6bf8e336
...
@@ -343,7 +343,6 @@ class testSlapOSMixin(ERP5TypeTestCase):
...
@@ -343,7 +343,6 @@ class testSlapOSMixin(ERP5TypeTestCase):
'erp5_workflow'
,
'erp5_workflow'
,
'erp5_configurator'
,
'erp5_configurator'
,
'slapos_configurator'
,
'slapos_configurator'
,
'erp5_ui_test_core'
]
]
if
int
(
os
.
environ
.
get
(
'erp5_load_data_fs'
,
0
)):
if
int
(
os
.
environ
.
get
(
'erp5_load_data_fs'
,
0
)):
result
.
extend
(
result
.
extend
(
...
...
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