Skip to content

S
slapos.core
Commit ebc44dcc authored by Rafael Monnerat's avatar Rafael Monnerat
Browse files
Options

slapos_jio: Merge slapos_hypermedia into slapos_jio 

No need 2 bt5 with similar goal.
parent f648fd6a
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 221 deletions
master/bt5/slapos_configurator/TestTemplateItem/portal_components/test.erp5.testSlapOSConfigurator.py
View file @ ebc44dcc
...@@ -198,7 +198,6 @@ class TestSlapOSConfigurator(testSlapOSMixin): ...@@ -198,7 +198,6 @@ class TestSlapOSConfigurator(testSlapOSMixin):
'slapos_category', 'slapos_category',
'slapos_rest_api_tool_portal_type', 'slapos_rest_api_tool_portal_type',
'slapos_rest_api', 'slapos_rest_api',
'slapos_hypermedia',
'slapos_pdm', 'slapos_pdm',
'slapos_crm', 'slapos_crm',
'slapos_accounting', 'slapos_accounting',
......
master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SkinSelection.py
View file @ ebc44dcc
...@@ -130,7 +130,6 @@ slapos_cloud_promise ...@@ -130,7 +130,6 @@ slapos_cloud_promise
slapos_consumption slapos_consumption
slapos_core slapos_core
slapos_crm slapos_crm
slapos_hypermedia
slapos_payzen slapos_payzen
slapos_pdm slapos_pdm
slapos_rest_api slapos_rest_api
...@@ -244,7 +243,6 @@ slapos_cloud_promise ...@@ -244,7 +243,6 @@ slapos_cloud_promise
slapos_consumption slapos_consumption
slapos_core slapos_core
slapos_crm slapos_crm
slapos_hypermedia
slapos_payzen slapos_payzen
slapos_pdm slapos_pdm
slapos_rest_api slapos_rest_api
...@@ -353,7 +351,6 @@ slapos_cloud_promise ...@@ -353,7 +351,6 @@ slapos_cloud_promise
slapos_consumption slapos_consumption
slapos_core slapos_core
slapos_crm slapos_crm
slapos_hypermedia
slapos_payzen slapos_payzen
slapos_pdm slapos_pdm
slapos_rest_api slapos_rest_api
...@@ -463,7 +460,6 @@ slapos_cloud_promise ...@@ -463,7 +460,6 @@ slapos_cloud_promise
slapos_consumption slapos_consumption
slapos_core slapos_core
slapos_crm slapos_crm
slapos_hypermedia
slapos_payzen slapos_payzen
slapos_pdm slapos_pdm
slapos_rest_api slapos_rest_api
...@@ -570,7 +566,6 @@ slapos_cloud_promise ...@@ -570,7 +566,6 @@ slapos_cloud_promise
slapos_consumption slapos_consumption
slapos_core slapos_core
slapos_crm slapos_crm
slapos_hypermedia
slapos_payzen slapos_payzen
slapos_pdm slapos_pdm
slapos_rest_api slapos_rest_api
...@@ -678,7 +673,6 @@ slapos_cloud_promise ...@@ -678,7 +673,6 @@ slapos_cloud_promise
slapos_consumption slapos_consumption
slapos_core slapos_core
slapos_crm slapos_crm
slapos_hypermedia
slapos_payzen slapos_payzen
slapos_pdm slapos_pdm
slapos_rest_api slapos_rest_api
...@@ -785,7 +779,6 @@ slapos_cloud_promise ...@@ -785,7 +779,6 @@ slapos_cloud_promise
slapos_consumption slapos_consumption
slapos_core slapos_core
slapos_crm slapos_crm
slapos_hypermedia
slapos_payzen slapos_payzen
slapos_pdm slapos_pdm
slapos_rest_api slapos_rest_api
...@@ -893,7 +886,6 @@ slapos_cloud_promise ...@@ -893,7 +886,6 @@ slapos_cloud_promise
slapos_consumption slapos_consumption
slapos_core slapos_core
slapos_crm slapos_crm
slapos_hypermedia
slapos_payzen slapos_payzen
slapos_pdm slapos_pdm
slapos_rest_api slapos_rest_api
...@@ -1000,7 +992,6 @@ slapos_cloud_promise ...@@ -1000,7 +992,6 @@ slapos_cloud_promise
slapos_consumption slapos_consumption
slapos_core slapos_core
slapos_crm slapos_crm
slapos_hypermedia
slapos_payzen slapos_payzen
slapos_pdm slapos_pdm
slapos_rest_api slapos_rest_api
...@@ -1109,7 +1100,6 @@ slapos_cloud_promise ...@@ -1109,7 +1100,6 @@ slapos_cloud_promise
slapos_consumption slapos_consumption
slapos_core slapos_core
slapos_crm slapos_crm
slapos_hypermedia
slapos_payzen slapos_payzen
slapos_pdm slapos_pdm
slapos_rest_api slapos_rest_api
...@@ -1219,7 +1209,6 @@ slapos_cloud_promise ...@@ -1219,7 +1209,6 @@ slapos_cloud_promise
slapos_consumption slapos_consumption
slapos_core slapos_core
slapos_crm slapos_crm
slapos_hypermedia
slapos_payzen slapos_payzen
slapos_pdm slapos_pdm
slapos_rest_api slapos_rest_api
......
master/bt5/slapos_erp5/bt/dependency_list
View file @ ebc44dcc
...@@ -20,6 +20,5 @@ slapos_pdm ...@@ -20,6 +20,5 @@ slapos_pdm
slapos_web slapos_web
slapos_jio slapos_jio
slapos_payzen slapos_payzen
slapos_hypermedia
slapos_upgrader slapos_upgrader
slapos_trial_request slapos_trial_request
master/bt5/slapos_hypermedia/PropertySheetTemplateItem/portal_property_sheets/SlapOSHypermediaSystemPreference.xml deleted 100644 → 0
View file @ f648fd6a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Property Sheet" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>SlapOSHypermediaSystemPreference</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Property Sheet</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_hypermedia/PropertySheetTemplateItem/portal_property_sheets/SlapOSHypermediaSystemPreference/preferred_hateoas_url_property.xml deleted 100644 → 0
View file @ f648fd6a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Standard Property" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>mode</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>elementary_type/string</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Stores token server URL</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>preferred_hateoas_url_property</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Standard Property</string> </value>
</item>
<item>
<key> <string>preference</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>property_default</string> </key>
<value> <string>python: \'\'</string> </value>
</item>
<item>
<key> <string>read_permission</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>write_permission</string> </key>
<value> <string>Manage properties</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_hypermedia/SkinTemplateItem/portal_skins/slapos_hypermedia.xml deleted 100644 → 0
View file @ f648fd6a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Folder" module="OFS.Folder"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>business_template_skin_layer_priority</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>float</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>business_template_skin_layer_priority</string> </key>
<value> <float>60.0</float> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>slapos_hypermedia</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_hypermedia/bt/copyright_list deleted 100644 → 0
View file @ f648fd6a
2013 Nexedi S.A.
\ No newline at end of file
master/bt5/slapos_hypermedia/bt/dependency_list deleted 100644 → 0
View file @ f648fd6a
erp5_hal_json_style
slapos_cloud
slapos_slap_tool
\ No newline at end of file
master/bt5/slapos_hypermedia/bt/description deleted 100644 → 0
View file @ f648fd6a
Provide hypermedia access to slapos
\ No newline at end of file
master/bt5/slapos_hypermedia/bt/template_skin_id_list deleted 100644 → 0
View file @ f648fd6a
slapos_hypermedia
\ No newline at end of file
master/bt5/slapos_hypermedia/bt/title deleted 100644 → 0
View file @ f648fd6a
slapos_hypermedia
\ No newline at end of file
master/bt5/slapos_hypermedia/TestTemplateItem/portal_components/test.erp5.testSlapOSHypermediaSkins.py → master/bt5/slapos_jio/TestTemplateItem/portal_components/test.erp5.testSlapOSHypermediaSkins.py
View file @ ebc44dcc
...@@ -11,9 +11,6 @@ from functools import wraps ...@@ -11,9 +11,6 @@ from functools import wraps
from ZPublisher.HTTPRequest import HTTPRequest from ZPublisher.HTTPRequest import HTTPRequest
from ZPublisher.HTTPResponse import HTTPResponse from ZPublisher.HTTPResponse import HTTPResponse
import os
import sys
import json import json
import StringIO import StringIO
...@@ -348,7 +345,7 @@ class TestSlapOSBase_getHateoasMaster(TestSlapOSHypermediaMixin): ...@@ -348,7 +345,7 @@ class TestSlapOSBase_getHateoasMaster(TestSlapOSHypermediaMixin):
@changeSkin('Hal') @changeSkin('Hal')
def test_getHateoasMaster_person_result(self): def test_getHateoasMaster_person_result(self):
person_user = self._makePerson() person_user = self._makePerson()
self.login(person_user.getReference()) self.login(person_user.getUserId())
self.changeSkin('Hal') self.changeSkin('Hal')
fake_request = do_fake_request("GET") fake_request = do_fake_request("GET")
result = self.portal.Base_getHateoasMaster(REQUEST=fake_request) result = self.portal.Base_getHateoasMaster(REQUEST=fake_request)
...@@ -528,7 +525,7 @@ class TestSlapOSPerson_getHateoasHostingSubscriptionList(TestSlapOSHypermediaMix ...@@ -528,7 +525,7 @@ class TestSlapOSPerson_getHateoasHostingSubscriptionList(TestSlapOSHypermediaMix
hosting_subscription.edit(destination_section_value=person_user) hosting_subscription.edit(destination_section_value=person_user)
self.tic() self.tic()
self.login(person_user.getReference()) self.login(person_user.getUserId())
self.changeSkin('Hal') self.changeSkin('Hal')
fake_request = do_fake_request("GET") fake_request = do_fake_request("GET")
result = person_user.Person_getHateoasHostingSubscriptionList( result = person_user.Person_getHateoasHostingSubscriptionList(
......
master/bt5/slapos_hypermedia/TestTemplateItem/portal_components/test.erp5.testSlapOSHypermediaSkins.xml → master/bt5/slapos_jio/TestTemplateItem/portal_components/test.erp5.testSlapOSHypermediaSkins.xml
View file @ ebc44dcc
...@@ -6,10 +6,22 @@ ...@@ -6,10 +6,22 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>_recorded_property_dict</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item> <item>
<key> <string>default_reference</string> </key> <key> <string>default_reference</string> </key>
<value> <string>testSlapOSHypermediaSkins</string> </value> <value> <string>testSlapOSHypermediaSkins</string> </value>
</item> </item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>test.erp5.testSlapOSHypermediaSkins</string> </value> <value> <string>test.erp5.testSlapOSHypermediaSkins</string> </value>
...@@ -34,9 +46,7 @@ ...@@ -34,9 +46,7 @@
<key> <string>text_content_warning_message</string> </key> <key> <string>text_content_warning_message</string> </key>
<value> <value>
<tuple> <tuple>
<string>W: 39, 0: Dangerous default value {} as argument (dangerous-default-value)</string> <string>W: 51, 0: Dangerous default value {} as argument (dangerous-default-value)</string>
<string>W: 15, 0: Unused import sys (unused-import)</string>
<string>W: 14, 0: Unused import os (unused-import)</string>
</tuple> </tuple>
</value> </value>
</item> </item>
...@@ -47,13 +57,28 @@ ...@@ -47,13 +57,28 @@
<item> <item>
<key> <string>workflow_history</string> </key> <key> <string>workflow_history</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="2" aka="AAAAAAAAAAI="> <record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle> <pickle>
<global name="PersistentMapping" module="Persistence.mapping"/> <global name="PersistentMapping" module="Persistence.mapping"/>
</pickle> </pickle>
...@@ -66,7 +91,7 @@ ...@@ -66,7 +91,7 @@
<item> <item>
<key> <string>component_validation_workflow</string> </key> <key> <string>component_validation_workflow</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value> </value>
</item> </item>
</dictionary> </dictionary>
...@@ -75,7 +100,7 @@ ...@@ -75,7 +100,7 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="3" aka="AAAAAAAAAAM="> <record id="4" aka="AAAAAAAAAAQ=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle> </pickle>
......
master/bt5/slapos_jio/bt/dependency_list
View file @ ebc44dcc
slapos_web slapos_web
erp5_hal_json_style erp5_hal_json_style
slapos_cloud
slapos_slap_tool
\ No newline at end of file
master/tests/__init__.py
View file @ ebc44dcc
...@@ -13,11 +13,11 @@ slapos_bt_list = [ ...@@ -13,11 +13,11 @@ slapos_bt_list = [
'slapos_pdm', 'slapos_pdm',
'slapos_rest_api', 'slapos_rest_api',
'slapos_slap_tool', 'slapos_slap_tool',
'slapos_hypermedia',
'slapos_web', 'slapos_web',
'slapos_crm', 'slapos_crm',
'slapos_payzen', 'slapos_payzen',
'slapos_monitoring_ui_test' 'slapos_configurator',
'slapos_jio'
] ]
class SlapOSCloud(SavedTestSuite, ProjectTestSuite): class SlapOSCloud(SavedTestSuite, ProjectTestSuite):
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7