Commit cd09b7aa authored by Jérome Perrin's avatar Jérome Perrin

Merge remote-tracking branch 'nexedi/master' into zope4py2

parents d5ad1fad 159b0817
Pipeline #23955 failed with stage
in 0 seconds
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_base erp5_base
erp5_pdm erp5_pdm
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_base erp5_base
erp5_pdm erp5_pdm
......
erp5_full_text_mroonga_catalog
erp5_dummy_movement erp5_dummy_movement
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_base erp5_base
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_pdm erp5_pdm
......
...@@ -46,7 +46,7 @@ class TestERP5Administration(InventoryAPITestCase): ...@@ -46,7 +46,7 @@ class TestERP5Administration(InventoryAPITestCase):
""" """
Same list as for Inventory API and add erp5_administration Same list as for Inventory API and add erp5_administration
""" """
return InventoryAPITestCase.getBusinessTemplateList(self) + ('erp5_full_text_mroonga_catalog', 'erp5_administration') return InventoryAPITestCase.getBusinessTemplateList(self) + ('erp5_administration', )
def test_01_RunCheckStockTableAlarm(self): def test_01_RunCheckStockTableAlarm(self):
""" """
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_base erp5_base
erp5_pdm erp5_pdm
......
<tal:block xmlns:tal="http://xml.zope.org/namespaces/tal" <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"
xmlns:metal="http://xml.zope.org/namespaces/metal"> xmlns:metal="http://xml.zope.org/namespaces/metal">
<tal:block metal:define-macro="login_as_super_user"> <tal:block metal:define-macro="login_as_super_user">
<tal:block metal:define-macro="logout">
<tr> <tr>
<td>openAndWait</td> <td>openAndWait</td>
<td>${base_url}/login_form</td> <td>${base_url}/logout</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>type</td> <td>waitForTextPresent</td>
<td>//input[@name="__ac_name"]</td> <td>Log in</td>
<td>super_user</td>
</tr>
<tr>
<td>type</td>
<td>//input[@name="__ac_password"]</td>
<td>super_user</td>
</tr>
<tr>
<td>clickAndWait</td>
<td>//input[@value="Login"]</td>
<td></td> <td></td>
</tr> </tr>
</tal:block>
<tal:block tal:define="submit_name python:'//input[@value=\'Login\']'">
<tal:block metal:use-macro="python: context.Zuite_CommonTemplate.macros['login']">
<tal:block metal:fill-slot="username">super_user</tal:block>
<tal:block metal:fill-slot="password">super_user</tal:block>
</tal:block>
</tal:block>
<tr> <tr>
<td>verifyTextPresent</td> <td>verifyTextPresent</td>
<td>Welcome to ERP5</td> <td>Welcome to ERP5</td>
...@@ -28,19 +26,6 @@ ...@@ -28,19 +26,6 @@
</tr> </tr>
</tal:block> </tal:block>
<tal:block metal:define-macro="logout">
<tr>
<td>openAndWait</td>
<td>${base_url}/logout</td>
<td></td>
</tr>
<tr>
<td>waitForTextPresent</td>
<td>Log in</td>
<td></td>
</tr>
</tal:block>
<tal:block metal:define-macro="reset_shopcart"> <tal:block metal:define-macro="reset_shopcart">
<tr> <tr>
<td>openAndWait</td> <td>openAndWait</td>
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
...@@ -55,6 +55,10 @@ ...@@ -55,6 +55,10 @@
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>type_class</string> </key>
<value> <string>Delivery</string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
...@@ -82,6 +82,10 @@ ...@@ -82,6 +82,10 @@
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>type_class</string> </key>
<value> <string>Delivery</string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_base erp5_base
erp5_simulation erp5_simulation
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_myisam_catalog
erp5_mrp erp5_mrp
\ No newline at end of file
...@@ -51,7 +51,6 @@ class TestArchive(InventoryAPITestCase): ...@@ -51,7 +51,6 @@ class TestArchive(InventoryAPITestCase):
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
return InventoryAPITestCase.getBusinessTemplateList(self) + ( return InventoryAPITestCase.getBusinessTemplateList(self) + (
'erp5_archive', 'erp5_archive',
'erp5_full_text_mroonga_catalog',
) )
# Different variables used for this test # Different variables used for this test
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_base erp5_base
erp5_pdm erp5_pdm
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_base erp5_base
erp5_web erp5_web
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_base erp5_base
erp5_pdm erp5_pdm
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_myisam_catalog
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_pdm erp5_pdm
erp5_simulation erp5_simulation
......
erp5_full_text_myisam_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_base erp5_base
erp5_simulation erp5_simulation
......
...@@ -146,23 +146,29 @@ ...@@ -146,23 +146,29 @@
<value> <value>
<dictionary> <dictionary>
<item> <item>
<key> <string>edit_workflow</string> </key> <key> <string>content_translation_workflow</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
<key> <string>user_account_workflow</string> </key> <key> <string>edit_workflow</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
</value> </value>
</item> </item>
<item> <item>
<key> <string>validation_workflow</string> </key> <key> <string>user_account_workflow</string> </key>
<value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>validation_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent>
</value>
</item>
</dictionary> </dictionary>
</value> </value>
</item> </item>
...@@ -170,6 +176,63 @@ ...@@ -170,6 +176,63 @@
</pickle> </pickle>
</record> </record>
<record id="6" aka="AAAAAAAAAAY="> <record id="6" aka="AAAAAAAAAAY=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_log</string> </key>
<value>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>validate_content_translation</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>System Processes</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>content_translation_state</string> </key>
<value> <string>latest</string> </value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1664349798.66</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="7" aka="AAAAAAAAAAc=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle> </pickle>
...@@ -232,7 +295,7 @@ ...@@ -232,7 +295,7 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="7" aka="AAAAAAAAAAc="> <record id="8" aka="AAAAAAAAAAg=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle> </pickle>
...@@ -291,7 +354,7 @@ ...@@ -291,7 +354,7 @@
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
<record id="8" aka="AAAAAAAAAAg="> <record id="9" aka="AAAAAAAAAAk=">
<pickle> <pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/> <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
</pickle> </pickle>
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_myisam_catalog
erp5_base erp5_base
\ No newline at end of file
...@@ -86,7 +86,7 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase): ...@@ -86,7 +86,7 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase):
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
return ('erp5_core_proxy_field_legacy', return ('erp5_core_proxy_field_legacy',
'erp5_full_text_mroonga_catalog', 'erp5_full_text_catalog',
'erp5_base', 'erp5_base',
'erp5_configurator', 'erp5_configurator',
'erp5_configurator_standard',) 'erp5_configurator_standard',)
......
...@@ -41,7 +41,6 @@ class TestConfiguratorItem(TestLiveConfiguratorWorkflowMixin): ...@@ -41,7 +41,6 @@ class TestConfiguratorItem(TestLiveConfiguratorWorkflowMixin):
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
return ('erp5_core_proxy_field_legacy', return ('erp5_core_proxy_field_legacy',
'erp5_full_text_mroonga_catalog',
'erp5_base', 'erp5_base',
'erp5_configurator', 'erp5_configurator',
'erp5_simulation', 'erp5_simulation',
......
...@@ -38,7 +38,6 @@ class TestConfiguratorTool(TestLiveConfiguratorWorkflowMixin): ...@@ -38,7 +38,6 @@ class TestConfiguratorTool(TestLiveConfiguratorWorkflowMixin):
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
return ('erp5_core_proxy_field_legacy', return ('erp5_core_proxy_field_legacy',
'erp5_full_text_mroonga_catalog',
'erp5_base', 'erp5_base',
'erp5_configurator', 'erp5_configurator',
'erp5_configurator_standard',) 'erp5_configurator_standard',)
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_full_text_mroonga_catalog
erp5_base erp5_base
erp5_configurator_standard erp5_configurator_standard
erp5_simulation erp5_simulation
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_full_text_mroonga_catalog
erp5_base erp5_base
\ No newline at end of file
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_full_text_mroonga_catalog
erp5_base erp5_base
\ No newline at end of file
...@@ -197,7 +197,6 @@ class TestOfficeJSSDKConfigurator(SecurityTestCase): ...@@ -197,7 +197,6 @@ class TestOfficeJSSDKConfigurator(SecurityTestCase):
'erp5_dms_ui_test', 'erp5_dms_ui_test',
'erp5_font', 'erp5_font',
'erp5_forge', 'erp5_forge',
'erp5_full_text_mroonga_catalog',
'erp5_gadget_interface_validator', 'erp5_gadget_interface_validator',
'erp5_hal_json_style', 'erp5_hal_json_style',
'erp5_hr', 'erp5_hr',
...@@ -219,6 +218,7 @@ class TestOfficeJSSDKConfigurator(SecurityTestCase): ...@@ -219,6 +218,7 @@ class TestOfficeJSSDKConfigurator(SecurityTestCase):
'erp5_monaco_editor', 'erp5_monaco_editor',
'erp5_multimedia', 'erp5_multimedia',
'erp5_notebook', 'erp5_notebook',
'erp5_oauth2_resource',
'erp5_officejs', 'erp5_officejs',
'erp5_officejs_connector', 'erp5_officejs_connector',
'erp5_officejs_jquery_app', 'erp5_officejs_jquery_app',
......
erp5_full_text_mroonga_catalog
erp5_administration erp5_administration
\ No newline at end of file
erp5_configurator_standard erp5_configurator_standard
erp5_full_text_mroonga_catalog
\ No newline at end of file
...@@ -75,6 +75,10 @@ ...@@ -75,6 +75,10 @@
<key> <string>solver_action_title</string> </key> <key> <string>solver_action_title</string> </key>
<value> <string>First In, First Out</string> </value> <value> <string>First In, First Out</string> </value>
</item> </item>
<item>
<key> <string>type_class</string> </key>
<value> <string>FIFODeliverySolver</string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
...@@ -75,6 +75,10 @@ ...@@ -75,6 +75,10 @@
<key> <string>solver_action_title</string> </key> <key> <string>solver_action_title</string> </key>
<value> <string>Last In, First Out</string> </value> <value> <string>Last In, First Out</string> </value>
</item> </item>
<item>
<key> <string>type_class</string> </key>
<value> <string>LIFODeliverySolver</string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
...@@ -75,6 +75,10 @@ ...@@ -75,6 +75,10 @@
<key> <string>solver_action_title</string> </key> <key> <string>solver_action_title</string> </key>
<value> <string>Minimise Price</string> </value> <value> <string>Minimise Price</string> </value>
</item> </item>
<item>
<key> <string>type_class</string> </key>
<value> <string>MinimisePriceDeliverySolver</string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
...@@ -146,6 +146,10 @@ ...@@ -146,6 +146,10 @@
<key> <string>solver_action_title</string> </key> <key> <string>solver_action_title</string> </key>
<value> <string>Cancel Quantity</string> </value> <value> <string>Cancel Quantity</string> </value>
</item> </item>
<item>
<key> <string>type_class</string> </key>
<value> <string>QuantityCancelSolver</string> </value>
</item>
<item> <item>
<key> <string>workflow_list</string> </key> <key> <string>workflow_list</string> </key>
<value> <value>
......
...@@ -189,6 +189,10 @@ ...@@ -189,6 +189,10 @@
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>type_class</string> </key>
<value> <string>TradeModelSolver</string> </value>
</item>
<item> <item>
<key> <string>workflow_list</string> </key> <key> <string>workflow_list</string> </key>
<value> <value>
......
...@@ -185,6 +185,10 @@ ...@@ -185,6 +185,10 @@
<key> <string>solver_action_title</string> </key> <key> <string>solver_action_title</string> </key>
<value> <string>Unify value</string> </value> <value> <string>Unify value</string> </value>
</item> </item>
<item>
<key> <string>type_class</string> </key>
<value> <string>UnifySolver</string> </value>
</item>
<item> <item>
<key> <string>workflow_list</string> </key> <key> <string>workflow_list</string> </key>
<value> <value>
......
...@@ -1561,25 +1561,9 @@ ...@@ -1561,25 +1561,9 @@
<td>${base_url}/logout</td> <td>${base_url}/logout</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr metal:use-macro="python: context.Zuite_CommonTemplate.macros['login']">
<td>openAndWait</td> <td tal:omit-tag="" metal:fill-slot="username">PERSON_USER_REFERENCE</td>
<td>${base_url}/login_form</td> <td tal:omit-tag="" metal:fill-slot="password">secret</td>
<td></td>
</tr>
<tr>
<td>type</td>
<td>//input[@name="__ac_name"]</td>
<td>PERSON_USER_REFERENCE</td>
</tr>
<tr>
<td>type</td>
<td>//input[@name="__ac_password"]</td>
<td>secret</td>
</tr>
<tr>
<td>clickAndWait</td>
<td>//input[@name="logged_in:method"]</td>
<td></td>
</tr> </tr>
<tr> <tr>
<td>openAndWait</td> <td>openAndWait</td>
...@@ -1608,23 +1592,12 @@ ...@@ -1608,23 +1592,12 @@
</tr> </tr>
<tr> <tr>
<td>openAndWait</td> <td>openAndWait</td>
<td>${base_url}/login_form</td> <td>${base_url}/logout</td>
<td></td>
</tr>
<tr>
<td>type</td>
<td>//input[@name="__ac_name"]</td>
<td>${base_user}</td>
</tr>
<tr>
<td>type</td>
<td>//input[@name="__ac_password"]</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr metal:use-macro="python: context.Zuite_CommonTemplate.macros['login']">
<td>clickAndWait</td> <td tal:omit-tag="" metal:fill-slot="username">${base_user}</td>
<td>//input[@name="logged_in:method"]</td> <td tal:omit-tag="" metal:fill-slot="password"></td>
<td></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
...@@ -1434,25 +1434,9 @@ ...@@ -1434,25 +1434,9 @@
<td>${base_url}/logout</td> <td>${base_url}/logout</td>
<td> </td> <td> </td>
</tr> </tr>
<tr> <tr metal:use-macro="python: context.Zuite_CommonTemplate.macros['login']">
<td>openAndWait</td> <td tal:omit-tag="" metal:fill-slot="username">${base_user}</td>
<td>${base_url}/login_form</td> <td tal:omit-tag="" metal:fill-slot="password">${base_password}</td>
<td> </td>
</tr>
<tr>
<td>type</td>
<td>//input[@name=&quot;__ac_name&quot;]</td>
<td>${base_user}</td>
</tr>
<tr>
<td>type</td>
<td>//input[@name=&quot;__ac_password&quot;]</td>
<td>${base_password}</td>
</tr>
<tr>
<td>clickAndWait</td>
<td>//input[@name=&quot;logged_in:method&quot;]</td>
<td> </td>
</tr> </tr>
<tr> <tr>
<td>openAndWait</td> <td>openAndWait</td>
...@@ -1489,25 +1473,9 @@ ...@@ -1489,25 +1473,9 @@
<td>${base_url}/logout</td> <td>${base_url}/logout</td>
<td> </td> <td> </td>
</tr> </tr>
<tr> <tr metal:use-macro="python: context.Zuite_CommonTemplate.macros['login']">
<td>openAndWait</td> <td tal:omit-tag="" metal:fill-slot="username">PERSON_USER_REFERENCE</td>
<td>${base_url}/login_form</td> <td tal:omit-tag="" metal:fill-slot="password">secret</td>
<td> </td>
</tr>
<tr>
<td>type</td>
<td>//input[@name=&quot;__ac_name&quot;]</td>
<td>PERSON_USER_REFERENCE</td>
</tr>
<tr>
<td>type</td>
<td>//input[@name=&quot;__ac_password&quot;]</td>
<td>secret</td>
</tr>
<tr>
<td>clickAndWait</td>
<td>//input[@name=&quot;logged_in:method&quot;]</td>
<td> </td>
</tr> </tr>
<tr> <tr>
<td>openAndWait</td> <td>openAndWait</td>
...@@ -1536,23 +1504,12 @@ ...@@ -1536,23 +1504,12 @@
</tr> </tr>
<tr> <tr>
<td>openAndWait</td> <td>openAndWait</td>
<td>${base_url}/login_form</td> <td>${base_url}/logout</td>
<td> </td> <td></td>
</tr>
<tr>
<td>type</td>
<td>//input[@name=&quot;__ac_name&quot;]</td>
<td>${base_user}</td>
</tr>
<tr>
<td>type</td>
<td>//input[@name=&quot;__ac_password&quot;]</td>
<td>${base_password}</td>
</tr> </tr>
<tr> <tr metal:use-macro="python: context.Zuite_CommonTemplate.macros['login']">
<td>clickAndWait</td> <td tal:omit-tag="" metal:fill-slot="username">${base_user}</td>
<td>//input[@name=&quot;logged_in:method&quot;]</td> <td tal:omit-tag="" metal:fill-slot="password">${base_password}</td>
<td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </test> </section><section class="screenshot"> </table> </test> </section><section class="screenshot">
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
...@@ -39,7 +39,7 @@ class TestContentTranslation(ERP5TypeTestCase): ...@@ -39,7 +39,7 @@ class TestContentTranslation(ERP5TypeTestCase):
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
return ('erp5_full_text_mroonga_catalog', return (
'erp5_base', 'erp5_base',
'erp5_content_translation', 'erp5_content_translation',
) )
......
erp5_full_text_mroonga_catalog
erp5_l10n_fr erp5_l10n_fr
erp5_l10n_ja erp5_l10n_ja
\ No newline at end of file
...@@ -89,6 +89,17 @@ class ERP5CookieCrumblerTests (CookieCrumblerTests): ...@@ -89,6 +89,17 @@ class ERP5CookieCrumblerTests (CookieCrumblerTests):
self.credentials) self.credentials)
self.assertEqual(resp.cookies['__ac']['path'], '/') self.assertEqual(resp.cookies['__ac']['path'], '/')
def testCacheHeaderDisabled(self):
# Cache header is forcibly set on any authenticated user independently from
# CookieCrumbler's presence.
_, cc, req, credentials = self._makeSite()
cc.cache_header_value = ''
req.cookies['__ac'] = credentials
req.traverse('/')
self.assertEqual(
req.response.headers.get('cache-control', ''), 'private')
def test_suite(): def test_suite():
return unittest.makeSuite(ERP5CookieCrumblerTests) return unittest.makeSuite(ERP5CookieCrumblerTests)
......
...@@ -202,7 +202,7 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor): ...@@ -202,7 +202,7 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
return "ERP5Catalog" return "ERP5Catalog"
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
return ('erp5_full_text_mroonga_catalog', 'erp5_base',) return ('erp5_base',)
# Different variables used for this test # Different variables used for this test
username = 'seb' username = 'seb'
...@@ -4150,9 +4150,6 @@ class CatalogToolUpgradeSchemaTestCase(ERP5TypeTestCase): ...@@ -4150,9 +4150,6 @@ class CatalogToolUpgradeSchemaTestCase(ERP5TypeTestCase):
"""Tests for "upgrade schema" feature of ERP5 Catalog. """Tests for "upgrade schema" feature of ERP5 Catalog.
""" """
def getBusinessTemplateList(self):
return ("erp5_full_text_mroonga_catalog",)
def afterSetUp(self): def afterSetUp(self):
# Add two connections # Add two connections
db1, db2 = getExtraSqlConnectionStringList()[:2] db1, db2 = getExtraSqlConnectionStringList()[:2]
......
...@@ -46,7 +46,6 @@ class TestERP5Coordinate(ERP5TypeTestCase): ...@@ -46,7 +46,6 @@ class TestERP5Coordinate(ERP5TypeTestCase):
Return the list of required business templates. Return the list of required business templates.
""" """
return ('erp5_core_proxy_field_legacy', return ('erp5_core_proxy_field_legacy',
'erp5_full_text_mroonga_catalog',
'erp5_base',) 'erp5_base',)
def afterSetUp(self): def afterSetUp(self):
......
...@@ -35,8 +35,7 @@ class TestI18NSearch(ERP5TypeTestCase): ...@@ -35,8 +35,7 @@ class TestI18NSearch(ERP5TypeTestCase):
return "I18N Search" return "I18N Search"
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
return ('erp5_full_text_mroonga_catalog', return ('erp5_base', )
'erp5_base',)
def afterSetUp(self): def afterSetUp(self):
self.person_module = self.portal.person_module self.person_module = self.portal.person_module
......
...@@ -43,7 +43,7 @@ class TestVanillaERP5Catalog(ERP5TypeTestCase, LogInterceptor): ...@@ -43,7 +43,7 @@ class TestVanillaERP5Catalog(ERP5TypeTestCase, LogInterceptor):
return "VanillaERP5Catalog" return "VanillaERP5Catalog"
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
return ('erp5_full_text_mroonga_catalog', 'erp5_base') return ('erp5_base', )
# Different variables used for this test # Different variables used for this test
username = 'seb' username = 'seb'
......
erp5_full_text_mroonga_catalog
erp5_base erp5_base
erp5_csv_style erp5_csv_style
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
...@@ -72,6 +72,11 @@ ...@@ -72,6 +72,11 @@
<td>//ul/li[2]/a[text()='Template Test Web FAQ 2' and @href='Template.Test.Web.FAQ2']</td> <td>//ul/li[2]/a[text()='Template Test Web FAQ 2' and @href='Template.Test.Web.FAQ2']</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>openAndWait</td>
<td>${base_url}/web_site_module/template_test_web_site/logout</td>
<td></td>
</tr>
<tr> <tr>
<td>openAndWait</td> <td>openAndWait</td>
<td>${base_url}/web_site_module/template_test_web_site/login_form</td> <td>${base_url}/web_site_module/template_test_web_site/login_form</td>
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
...@@ -55,7 +55,6 @@ class TestERP5Credential(ERP5TypeTestCase): ...@@ -55,7 +55,6 @@ class TestERP5Credential(ERP5TypeTestCase):
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
return ( return (
'erp5_full_text_mroonga_catalog',
'erp5_core_proxy_field_legacy', 'erp5_core_proxy_field_legacy',
'erp5_base', 'erp5_base',
'erp5_jquery', 'erp5_jquery',
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_jquery erp5_jquery
erp5_ingestion_mysql_innodb_catalog erp5_ingestion_mysql_innodb_catalog
......
...@@ -85,7 +85,7 @@ class TestCRM(BaseTestCRM): ...@@ -85,7 +85,7 @@ class TestCRM(BaseTestCRM):
return "CRM" return "CRM"
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
return ('erp5_full_text_mroonga_catalog', return (
'erp5_core_proxy_field_legacy', 'erp5_core_proxy_field_legacy',
'erp5_base', 'erp5_base',
'erp5_ingestion', 'erp5_ingestion',
...@@ -655,7 +655,6 @@ class TestCRMMailIngestion(BaseTestCRM): ...@@ -655,7 +655,6 @@ class TestCRMMailIngestion(BaseTestCRM):
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
# Mail Ingestion must work with CRM alone. # Mail Ingestion must work with CRM alone.
return ('erp5_core_proxy_field_legacy', return ('erp5_core_proxy_field_legacy',
'erp5_full_text_mroonga_catalog',
'erp5_base', 'erp5_base',
'erp5_ingestion', 'erp5_ingestion',
'erp5_ingestion_mysql_innodb_catalog', 'erp5_ingestion_mysql_innodb_catalog',
......
erp5_full_text_mroonga_catalog
erp5_core_test erp5_core_test
erp5_web erp5_web
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_base erp5_base
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
return ('erp5_core_proxy_field_legacy', return ('erp5_core_proxy_field_legacy',
'erp5_full_text_mroonga_catalog', 'erp5_full_text_catalog',
'erp5_base', 'erp5_base',
'erp5_configurator', 'erp5_configurator',
'erp5_configurator_standard') 'erp5_configurator_standard')
erp5_full_text_mroonga_catalog
erp5_ingestion_mysql_innodb_catalog erp5_ingestion_mysql_innodb_catalog
\ No newline at end of file
...@@ -100,7 +100,6 @@ class TestDocumentMixin(ERP5TypeTestCase): ...@@ -100,7 +100,6 @@ class TestDocumentMixin(ERP5TypeTestCase):
business_template_list = ['erp5_core_proxy_field_legacy', business_template_list = ['erp5_core_proxy_field_legacy',
'erp5_jquery', 'erp5_jquery',
'erp5_full_text_mroonga_catalog',
'erp5_base', 'erp5_base',
'erp5_ingestion_mysql_innodb_catalog', 'erp5_ingestion_mysql_innodb_catalog',
'erp5_ingestion', 'erp5_ingestion',
......
...@@ -34,7 +34,6 @@ class TestOOoConversionServerRetry(ERP5TypeTestCase): ...@@ -34,7 +34,6 @@ class TestOOoConversionServerRetry(ERP5TypeTestCase):
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
business_template_list = ['erp5_core_proxy_field_legacy', business_template_list = ['erp5_core_proxy_field_legacy',
'erp5_jquery', 'erp5_jquery',
'erp5_full_text_mroonga_catalog',
'erp5_base', 'erp5_base',
'erp5_ingestion_mysql_innodb_catalog', 'erp5_ingestion_mysql_innodb_catalog',
'erp5_ingestion', 'erp5_ingestion',
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_ingestion_mysql_innodb_catalog erp5_ingestion_mysql_innodb_catalog
erp5_ingestion_test erp5_ingestion_test
......
erp5_full_text_mroonga_catalog
erp5_dms erp5_dms
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
\ No newline at end of file
...@@ -50,7 +50,6 @@ class TestTemplateTool(ERP5TypeTestCase): ...@@ -50,7 +50,6 @@ class TestTemplateTool(ERP5TypeTestCase):
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
return ('erp5_core_proxy_field_legacy', return ('erp5_core_proxy_field_legacy',
'erp5_full_text_mroonga_catalog',
'erp5_base', 'erp5_base',
'erp5_crm', 'erp5_crm',
'erp5_forge') 'erp5_forge')
......
erp5_ui_test erp5_ui_test
erp5_full_text_mroonga_catalog
erp5_pdm erp5_pdm
erp5_simulation erp5_simulation
erp5_trade erp5_trade
......
erp5_full_text_mroonga_catalog
erp5_base erp5_base
erp5_web erp5_web
erp5_ingestion_mysql_innodb_catalog erp5_ingestion_mysql_innodb_catalog
......
...@@ -50,7 +50,6 @@ class TestFreeSubscription(ERP5TypeTestCase): ...@@ -50,7 +50,6 @@ class TestFreeSubscription(ERP5TypeTestCase):
def getBusinessTemplateList(self): def getBusinessTemplateList(self):
return ( return (
'erp5_full_text_mroonga_catalog',
'erp5_core_proxy_field_legacy', 'erp5_core_proxy_field_legacy',
'erp5_base', 'erp5_base',
'erp5_jquery', 'erp5_jquery',
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_base erp5_base
erp5_jquery erp5_jquery
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_ui_test_core erp5_ui_test_core
erp5_ui_test erp5_ui_test
erp5_dummy_movement erp5_dummy_movement
......
erp5_full_text_myisam_catalog
erp5_base erp5_base
erp5_pdm erp5_pdm
erp5_simulation erp5_simulation
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_base erp5_base
erp5_pdm erp5_pdm
......
erp5_full_text_mroonga_catalog
erp5_ingestion_mysql_innodb_catalog erp5_ingestion_mysql_innodb_catalog
\ No newline at end of file
erp5_web erp5_web
erp5_crm erp5_crm
erp5_dms erp5_dms
erp5_full_text_myisam_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_base erp5_base
erp5_apparel erp5_apparel
......
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_full_text_mroonga_catalog
erp5_base erp5_base
erp5_pdm erp5_pdm
erp5_simulation erp5_simulation
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
erp5_dms erp5_dms
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
...@@ -48,7 +48,7 @@ class TestKMMixIn(TestDocumentMixin): ...@@ -48,7 +48,7 @@ class TestKMMixIn(TestDocumentMixin):
manager_password = '' manager_password = ''
website_id = 'km_test' website_id = 'km_test'
business_template_list = ['erp5_core_proxy_field_legacy', business_template_list = ['erp5_core_proxy_field_legacy',
'erp5_full_text_mroonga_catalog','erp5_base', 'erp5_base',
'erp5_jquery', 'erp5_jquery_ui', 'erp5_knowledge_pad', 'erp5_jquery', 'erp5_jquery_ui', 'erp5_knowledge_pad',
'erp5_ingestion_mysql_innodb_catalog', 'erp5_ingestion', 'erp5_ingestion_mysql_innodb_catalog', 'erp5_ingestion',
'erp5_web', 'erp5_dms', 'erp5_web', 'erp5_dms',
......
erp5_full_text_mroonga_catalog
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_jquery erp5_jquery
erp5_jquery_ui erp5_jquery_ui
......
...@@ -43,7 +43,7 @@ class TestZeleniumKM(ERP5TypeFunctionalTestCase): ...@@ -43,7 +43,7 @@ class TestZeleniumKM(ERP5TypeFunctionalTestCase):
""" """
# XXX This is a rough list, we should drop as much as we can, and # XXX This is a rough list, we should drop as much as we can, and
# keep only minimal # keep only minimal
return ('erp5_core_proxy_field_legacy', 'erp5_full_text_mroonga_catalog', return ('erp5_core_proxy_field_legacy',
'erp5_base', 'erp5_ui_test_core', 'erp5_ui_test', 'erp5_base', 'erp5_ui_test_core', 'erp5_ui_test',
'erp5_dhtml_style', 'erp5_dhtml_ui_test', 'erp5_dhtml_style', 'erp5_dhtml_ui_test',
'erp5_jquery', 'erp5_jquery_ui', 'erp5_jquery', 'erp5_jquery_ui',
......
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_full_text_mroonga_catalog
erp5_base erp5_base
erp5_ui_test erp5_ui_test
erp5_dhtml_style erp5_dhtml_style
......
...@@ -18,6 +18,10 @@ ...@@ -18,6 +18,10 @@
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Base Type</string> </value> <value> <string>Base Type</string> </value>
</item> </item>
<item>
<key> <string>type_class</string> </key>
<value> <string>XMLObject</string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
erp5_full_text_mroonga_catalog
\ No newline at end of file
erp5_full_text_mroonga_catalog
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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