Skip to content

erp5
erp5
Commit 74e43c89 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

OfficeJS Web Sites reference a non existant appcache 

Also extend coding style test to cover this kind of issues with business templates.

See merge request !1083
parents 801ff6ab b4ae0f3b
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 56 deletions
bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_smart_assistant.xml
View file @ 74e43c89
......@@ -259,16 +259,6 @@
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>configuration_manifest_url</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
......@@ -467,10 +457,6 @@
<key> <string>configuration_latest_version</string> </key>
<value> <string>app</string> </value>
</item>
<item>
<key> <string>configuration_manifest_url</string> </key>
<value> <string>gadget_officejs_spreadsheet.appcache</string> </value>
</item>
<item>
<key> <string>configuration_panel_gadget_url</string> </key>
<value> <string>gadget_officejs_spreadsheet_application_panel.html</string> </value>
......
bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_presentation.xml
View file @ 74e43c89
......@@ -259,16 +259,6 @@
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>configuration_manifest_url</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
......@@ -457,10 +447,6 @@
<key> <string>configuration_latest_version</string> </key>
<value> <string>app</string> </value>
</item>
<item>
<key> <string>configuration_manifest_url</string> </key>
<value> <string>gadget_officejs_spreadsheet.appcache</string> </value>
</item>
<item>
<key> <string>configuration_panel_gadget_url</string> </key>
<value> <string>gadget_officejs_spreadsheet_application_panel.html</string> </value>
......
bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_spreadsheet.xml
View file @ 74e43c89
......@@ -259,16 +259,6 @@
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>configuration_manifest_url</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
......@@ -457,10 +447,6 @@
<key> <string>configuration_latest_version</string> </key>
<value> <string>app</string> </value>
</item>
<item>
<key> <string>configuration_manifest_url</string> </key>
<value> <string>gadget_officejs_spreadsheet.appcache</string> </value>
</item>
<item>
<key> <string>configuration_panel_gadget_url</string> </key>
<value> <string>gadget_officejs_spreadsheet_application_panel.html</string> </value>
......
bt5/erp5_officejs_ooffice/PathTemplateItem/web_site_module/ooffice_text.xml
View file @ 74e43c89
......@@ -259,16 +259,6 @@
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>configuration_manifest_url</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
......@@ -457,10 +447,6 @@
<key> <string>configuration_latest_version</string> </key>
<value> <string>app</string> </value>
</item>
<item>
<key> <string>configuration_manifest_url</string> </key>
<value> <string>gadget_officejs_spreadsheet.appcache</string> </value>
</item>
<item>
<key> <string>configuration_panel_gadget_url</string> </key>
<value> <string>gadget_officejs_spreadsheet_application_panel.html</string> </value>
......
product/ERP5Type/tests/CodingStyleTest.py
View file @ 74e43c89
......@@ -44,11 +44,13 @@ class CodingStyleTest(CodingStyleTestCase, testXHTML.TestXHTMLMixin):
def getBusinessTemplateList(self):
# install erp5_administration to check with tools from erp5_administration
# and erp5_upgrader for CodingStyleTestCase.test_run_upgrader
# XXX also install erp5_full_text_myisam_catalog to workaround missing test
# dependencies and the fact that test dependencies are not checked
# recursively.
return (
'erp5_administration',
'erp5_upgrader',
'erp5_full_text_myisam_catalog',
self.tested_business_template)
......
product/ERP5Type/tests/CodingStyleTestCase.py
View file @ 74e43c89
......@@ -125,3 +125,32 @@ class CodingStyleTestCase(ERP5TypeTestCase):
self.maxDiff = None
self.assertEqual(existing_files, new_files)
def test_run_upgrader(self):
# Check that pre and post upgrade do not raise problems.
# We dont check upgrade step, because upgrader by default want to
# uninstall business templates.
self.portal.portal_alarms.upgrader_check_pre_upgrade.activeSense(fixit=True)
self.tic()
self.portal.portal_alarms.upgrader_check_pre_upgrade.activeSense()
self.tic()
self.assertFalse(
self.portal.portal_alarms.upgrader_check_pre_upgrade.sense(),
[
'\n'.join(x.detail) for x in self.portal.portal_alarms
.upgrader_check_post_upgrade.Alarm_getReportResultList()
],
)
self.portal.portal_alarms.upgrader_check_post_upgrade.activeSense(
fixit=True)
self.tic()
self.portal.portal_alarms.upgrader_check_post_upgrade.activeSense()
self.tic()
self.assertFalse(
self.portal.portal_alarms.upgrader_check_post_upgrade.sense(),
[
'\n'.join(x.detail) for x in self.portal.portal_alarms
.upgrader_check_post_upgrade.Alarm_getReportResultList()
],
)
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