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
Labels
Merge Requests
141
Merge Requests
141
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
8a08fe3b
Commit
8a08fe3b
authored
Apr 17, 2024
by
Carlos Ramos Carreño
Browse files
Options
Browse Files
Download
Plain Diff
Fix erp5_officejs tests in Python 2
See merge request
!1920
parents
a29c3532
a94bda6b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
10 deletions
+15
-10
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_common/StaticWebSite_getRedirectSourceUrlForOfficeJSApplication.py
...aticWebSite_getRedirectSourceUrlForOfficeJSApplication.py
+5
-2
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/WebSection_getBase64ConfigurationUrlList.py
...b_officejs_ui/WebSection_getBase64ConfigurationUrlList.py
+5
-4
bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/Post_ingestWebMessageForSupportRequest.py
...support_request/Post_ingestWebMessageForSupportRequest.py
+2
-1
product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
+3
-3
No files found.
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_common/StaticWebSite_getRedirectSourceUrlForOfficeJSApplication.py
View file @
8a08fe3b
...
...
@@ -8,6 +8,8 @@ Redirect to domain specified as layout property on website
import
binascii
import
base64
from
Products.ERP5Type.Utils
import
bytes2str
,
str2bytes
import
six
result_dict
=
{
"error"
:
"url missing definition view path"
}
base_64
=
False
...
...
@@ -19,8 +21,9 @@ except KeyError:
return
result_dict
try
:
encoded
=
name
.
replace
(
"definition_view/"
,
""
,
1
).
encode
()
name
=
base64
.
decodebytes
(
encoded
).
decode
()
encoded
=
str2bytes
(
name
.
replace
(
"definition_view/"
,
""
,
1
))
decode_method
=
base64
.
decodebytes
if
six
.
PY3
else
base64
.
decodestring
name
=
bytes2str
(
decode_method
(
encoded
))
base_64
=
True
except
binascii
.
Error
:
pass
...
...
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/WebSection_getBase64ConfigurationUrlList.py
View file @
8a08fe3b
import
json
import
base64
from
erp5.component.module.Log
import
log
from
Products.ERP5Type.Utils
import
bytes2str
,
str2bytes
def
getElementFromContent
(
key
,
content
):
before_template
=
'"%s" type="text/x-renderjs-configuration">'
...
...
@@ -69,22 +70,22 @@ try:
configuration_path_list
=
[]
for
key
in
portal_actions_dict
:
path
=
"portal_types/%s"
%
key
configuration_path_list
.
append
(
b
ase64
.
b64encode
(
path
.
encode
()).
decode
(
))
configuration_path_list
.
append
(
b
ytes2str
(
base64
.
b64encode
(
str2bytes
(
path
))
))
for
action
in
portal_actions_dict
[
key
]:
path
=
"portal_types/%s/%s"
%
(
key
,
action
)
configuration_path_list
.
append
(
b
ase64
.
b64encode
(
path
.
encode
()).
decode
(
))
configuration_path_list
.
append
(
b
ytes2str
(
base64
.
b64encode
(
str2bytes
(
path
))
))
try
:
action_object
=
context
.
restrictedTraverse
(
path
)
form
=
action_object
.
getActionText
().
split
(
'/'
)[
-
1
]
path
=
"portal_skins/%s/%s"
%
(
portal_skin
,
form
)
configuration_path_list
.
append
(
b
ase64
.
b64encode
(
path
.
encode
()).
decode
(
))
configuration_path_list
.
append
(
b
ytes2str
(
base64
.
b64encode
(
str2bytes
(
path
))
))
except
KeyError
as
e
:
raise
KeyError
(
"Error getting portal action info: "
+
str
(
e
))
if
new_dialog_form_list
:
for
form
in
new_dialog_form_list
:
path
=
"portal_skins/%s/%s"
%
(
portal_skin
,
form
)
configuration_path_list
.
append
(
b
ase64
.
b64encode
(
path
.
encode
()).
decode
(
))
configuration_path_list
.
append
(
b
ytes2str
(
base64
.
b64encode
(
str2bytes
(
path
))
))
url_list
=
[]
for
path
in
configuration_path_list
:
...
...
bt5/erp5_officejs_support_request_ui/SkinTemplateItem/portal_skins/erp5_officejs_support_request/Post_ingestWebMessageForSupportRequest.py
View file @
8a08fe3b
from
Products.ERP5Type.Message
import
translateString
from
Products.ERP5Type.Utils
import
bytes2str
portal
=
context
.
getPortalObject
()
support_request
=
context
.
getFollowUpValue
()
web_site_value
=
portal
.
restrictedTraverse
(
web_site_relative_url
)
...
...
@@ -34,7 +35,7 @@ web_message = portal.event_module.newContent(
portal_type
=
'Web Message'
,
title
=
context
.
getTitle
()
if
context
.
hasTitle
()
else
None
,
content_type
=
'text/html'
if
is_html
else
'text/plain'
,
text_content
=
data
.
decode
(
'utf-8'
),
text_content
=
bytes2str
(
data
),
follow_up_value
=
support_request
,
aggregate_value_list
=
[
context
]
+
context
.
getSuccessorValueList
(
portal_type
=
portal
.
getPortalDocumentTypeList
()),
...
...
product/ERP5Type/tests/ERP5TypeFunctionalTestCase.py
View file @
8a08fe3b
...
...
@@ -42,7 +42,7 @@ from ZPublisher.HTTPResponse import HTTPResponse
from
zExceptions.ExceptionFormatter
import
format_exception
from
Products.ERP5Type.tests.ERP5TypeTestCase
import
ERP5TypeTestCase
from
Products.ERP5Type.tests.runUnitTest
import
log_directory
from
Products.ERP5Type.Utils
import
stopProcess
,
PR_SET_PDEATHSIG
from
Products.ERP5Type.Utils
import
stopProcess
,
PR_SET_PDEATHSIG
,
unicode2str
from
lxml
import
etree
from
lxml.html.builder
import
E
import
certifi
...
...
@@ -398,7 +398,7 @@ class FunctionalTestRunner:
for
test_tr
in
test_table
.
xpath
(
'.//tr[contains(@class, "status_failed")]'
):
test_tr
.
set
(
'style'
,
'background-color: red;'
)
details_attribute_dict
=
{}
if
"expected failure"
in
etree
.
tostring
(
test_table
,
encoding
=
"unicode"
):
if
u
"expected failure"
in
etree
.
tostring
(
test_table
,
encoding
=
"unicode"
):
expected_failure_amount
+=
1
else
:
failure_amount
+=
1
...
...
@@ -406,7 +406,7 @@ class FunctionalTestRunner:
details_attribute_dict
[
'open'
]
=
'true'
detail_element
=
E
.
div
()
detail_element
.
append
(
E
.
details
(
E
.
summary
(
test_name
),
test_table
,
**
details_attribute_dict
))
detail
+=
etree
.
tostring
(
detail_element
,
encoding
=
"unicode"
)
detail
+=
unicode2str
(
etree
.
tostring
(
detail_element
,
encoding
=
"unicode"
)
)
tr_count
+=
1
success_amount
=
tr_count
-
1
-
failure_amount
-
expected_failure_amount
if
detail
:
...
...
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