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
137
Merge Requests
137
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
e0dec940
Commit
e0dec940
authored
Jan 08, 2020
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui&test: first line of Appcache file should be CACHE MANIFEST
parent
97d6b818
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_checkCacheModificationDateConsistency.py
...renderjs/WebSite_checkCacheModificationDateConsistency.py
+5
-4
bt5/erp5_web_renderjs_ui_test/TestTemplateItem/portal_components/test.erp5.testRJSUpgrader.py
...mplateItem/portal_components/test.erp5.testRJSUpgrader.py
+5
-2
No files found.
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs/WebSite_checkCacheModificationDateConsistency.py
View file @
e0dec940
...
@@ -19,9 +19,10 @@ if appcache_reference:
...
@@ -19,9 +19,10 @@ if appcache_reference:
"Document {} is newer than cache manifest"
.
format
(
url
))
"Document {} is newer than cache manifest"
.
format
(
url
))
if
error_list
and
fixit
:
if
error_list
and
fixit
:
text_list
=
appcache_manifest
.
getTextContent
().
split
(
'
\
n
'
)
assert
text_list
[
0
]
==
'CACHE MANIFEST'
,
'First Line of %s should be CACHE MANIFEST'
%
appcache_manifest
.
getRelativeUrl
()
appcache_manifest
.
edit
(
appcache_manifest
.
edit
(
text_content
=
'''# Last modified by {} on {}
text_content
=
'''{}
{}
# Last modified by {} on {}
'''
.
format
(
script
.
getId
(),
DateTime
(),
appcache_manifest
.
getTextContent
()))
{}'''
.
format
(
text_list
[
0
],
script
.
getId
(),
DateTime
(),
'
\
n
'
.
join
(
text_list
[
1
:])))
return
error_list
return
error_list
bt5/erp5_web_renderjs_ui_test/TestTemplateItem/portal_components/test.erp5.testRJSUpgrader.py
View file @
e0dec940
...
@@ -102,7 +102,10 @@ class TestRenderJSUpgrade(ERP5TypeTestCase):
...
@@ -102,7 +102,10 @@ class TestRenderJSUpgrade(ERP5TypeTestCase):
self
.
assertGreater
(
self
.
assertGreater
(
self
.
manifest
.
getModificationDate
(),
self
.
manifest
.
getModificationDate
(),
self
.
javascript
.
getModificationDate
())
self
.
javascript
.
getModificationDate
())
# Last modified... is insert at second line
self
.
assertIn
(
self
.
assertIn
(
'Last modified by WebSite_checkCacheModificationDateConsistency on'
,
'Last modified by WebSite_checkCacheModificationDateConsistency on'
,
self
.
manifest
.
getTextContent
())
self
.
manifest
.
getTextContent
().
split
(
'
\
n
'
)[
1
])
self
.
assertIn
(
manifest_content
,
self
.
manifest
.
getTextContent
())
manifest_content_list
=
manifest_content
.
split
(
'
\
n
'
)
self
.
assertIn
(
manifest_content_list
[
0
]
,
self
.
manifest
.
getTextContent
())
self
.
assertIn
(
'
\
n
'
.
join
(
manifest_content_list
[
2
:])
,
self
.
manifest
.
getTextContent
())
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