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

bt5/erp5_access_token/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_accounting/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_core_proxy_field_legacy
 erp5_base
 erp5_pdm

bt5/erp5_accounting_l10n_fr/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_core_proxy_field_legacy
 erp5_base
 erp5_pdm

bt5/erp5_accounting_renderjs_ui_test/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_dummy_movement
\ No newline at end of file

bt5/erp5_accounting_ui_test/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_base
 erp5_core_proxy_field_legacy
 erp5_pdm

bt5/erp5_administration/TestTemplateItem/portal_components/test.erp5.testERP5Administration.py

@@ -46,7 +46,7 @@ class TestERP5Administration(InventoryAPITestCase):
     """
         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):
     """

bt5/erp5_administration/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_core_proxy_field_legacy
 erp5_base
 erp5_pdm

bt5/erp5_advanced_ecommerce_test/SkinTemplateItem/portal_skins/erp5_advanced_ecommerce_test/ZuiteAdvancedECommerce_CommonTemplate.zpt

 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"
            xmlns:metal="http://xml.zope.org/namespaces/metal">
   <tal:block metal:define-macro="login_as_super_user">
-    <tr>
-      <td>openAndWait</td>
-      <td>${base_url}/login_form</td>
-      <td></td>
-    </tr>
-    <tr>
-      <td>type</td>
-      <td>//input[@name="__ac_name"]</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>
-    </tr>
+    <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 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>
       <td>verifyTextPresent</td>
       <td>Welcome to ERP5</td>
@@ -28,19 +26,6 @@
     </tr>
   </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">
     <tr>
      <td>openAndWait</td>

bt5/erp5_advanced_ecommerce_test/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_advanced_invoicing/PortalTypeTemplateItem/portal_types/Purchase%20Invoice.xml

@@ -55,6 +55,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>Delivery</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>

bt5/erp5_advanced_invoicing/PortalTypeTemplateItem/portal_types/Sale%20Invoice.xml

@@ -82,6 +82,10 @@
             <key> <string>title</string> </key>
             <value> <string></string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>Delivery</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>

bt5/erp5_advanced_invoicing/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_core_proxy_field_legacy
 erp5_base
 erp5_simulation

bt5/erp5_api_style/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_apparel/bt/test_dependency_list

-erp5_full_text_myisam_catalog
 erp5_mrp
\ No newline at end of file

bt5/erp5_archive/TestTemplateItem/portal_components/test.erp5.testArchive.py

@@ -51,7 +51,6 @@ class TestArchive(InventoryAPITestCase):
   def getBusinessTemplateList(self):
     return InventoryAPITestCase.getBusinessTemplateList(self) + (
       'erp5_archive',
-      'erp5_full_text_mroonga_catalog',
     )
 
   # Different variables used for this test

bt5/erp5_archive/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_core_proxy_field_legacy
 erp5_base
 erp5_pdm

bt5/erp5_authentication_policy/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_core_proxy_field_legacy
 erp5_base
 erp5_web

bt5/erp5_bank_reconciliation/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_core_proxy_field_legacy
 erp5_base
 erp5_pdm

bt5/erp5_bank_reconciliation_renderjs_ui_test/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_bearer_token/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_big_file/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_budget/bt/test_dependency_list

-erp5_full_text_myisam_catalog
 erp5_core_proxy_field_legacy
 erp5_pdm
 erp5_simulation

bt5/erp5_calendar/bt/test_dependency_list

-erp5_full_text_myisam_catalog
\ No newline at end of file

bt5/erp5_certificate_authority/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_commerce/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_core_proxy_field_legacy
 erp5_base
 erp5_simulation

bt5/erp5_commerce_loyalty_program_test/PathTemplateItem/person_module/test_sale_order_receiver.xml

@@ -146,23 +146,29 @@
             <value>
               <dictionary>
                 <item>
-                    <key> <string>edit_workflow</string> </key>
+                    <key> <string>content_translation_workflow</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key> <string>user_account_workflow</string> </key>
+                    <key> <string>edit_workflow</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAc=</string> </persistent>
                     </value>
                 </item>
                 <item>
-                    <key> <string>validation_workflow</string> </key>
+                    <key> <string>user_account_workflow</string> </key>
                     <value>
                       <persistent> <string encoding="base64">AAAAAAAAAAg=</string> </persistent>
                     </value>
                 </item>
+                <item>
+                    <key> <string>validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAk=</string> </persistent>
+                    </value>
+                </item>
               </dictionary>
             </value>
         </item>
@@ -170,6 +176,63 @@
     </pickle>
   </record>
   <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>
       <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
@@ -232,7 +295,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="7" aka="AAAAAAAAAAc=">
+  <record id="8" aka="AAAAAAAAAAg=">
     <pickle>
       <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>
@@ -291,7 +354,7 @@
       </dictionary>
     </pickle>
   </record>
-  <record id="8" aka="AAAAAAAAAAg=">
+  <record id="9" aka="AAAAAAAAAAk=">
     <pickle>
       <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
     </pickle>

bt5/erp5_commerce_loyalty_program_test/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_computer_immobilisation/bt/test_dependency_list

-erp5_full_text_myisam_catalog
 erp5_base
\ No newline at end of file

bt5/erp5_configurator/ModuleComponentTemplateItem/portal_components/module.erp5.ConfiguratorTestMixin.py

@@ -86,7 +86,7 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase):
 
   def getBusinessTemplateList(self):
     return ('erp5_core_proxy_field_legacy',
-        'erp5_full_text_mroonga_catalog',
+        'erp5_full_text_catalog',
         'erp5_base',
         'erp5_configurator',
         'erp5_configurator_standard',)

bt5/erp5_configurator/TestTemplateItem/portal_components/test.erp5.testConfiguratorItem.py

@@ -41,7 +41,6 @@ class TestConfiguratorItem(TestLiveConfiguratorWorkflowMixin):
 
   def getBusinessTemplateList(self):
     return ('erp5_core_proxy_field_legacy',
-            'erp5_full_text_mroonga_catalog',
             'erp5_base',
             'erp5_configurator',
             'erp5_simulation',

bt5/erp5_configurator/TestTemplateItem/portal_components/test.erp5.testConfiguratorTool.py

@@ -38,7 +38,6 @@ class TestConfiguratorTool(TestLiveConfiguratorWorkflowMixin):
 
   def getBusinessTemplateList(self):
     return ('erp5_core_proxy_field_legacy',
-            'erp5_full_text_mroonga_catalog',
             'erp5_base',
             'erp5_configurator',
             'erp5_configurator_standard',)

bt5/erp5_configurator/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_core_proxy_field_legacy
-erp5_full_text_mroonga_catalog
 erp5_base
 erp5_configurator_standard
 erp5_simulation

bt5/erp5_configurator_ebusiness_lotse/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_configurator_maxma_demo/bt/test_dependency_list

 erp5_core_proxy_field_legacy
-erp5_full_text_mroonga_catalog
 erp5_base
\ No newline at end of file

bt5/erp5_configurator_run_my_doc/bt/test_dependency_list

 erp5_core_proxy_field_legacy
-erp5_full_text_mroonga_catalog
 erp5_base
\ No newline at end of file

bt5/erp5_configurator_standard/TestTemplateItem/portal_components/test.erp5.testOfficeJSSDKConfigurator.py

@@ -197,7 +197,6 @@ class TestOfficeJSSDKConfigurator(SecurityTestCase):
       'erp5_dms_ui_test',
       'erp5_font',
       'erp5_forge',
-      'erp5_full_text_mroonga_catalog',
       'erp5_gadget_interface_validator',
       'erp5_hal_json_style',
       'erp5_hr',
@@ -219,6 +218,7 @@ class TestOfficeJSSDKConfigurator(SecurityTestCase):
       'erp5_monaco_editor',
       'erp5_multimedia',
       'erp5_notebook',
+      'erp5_oauth2_resource',
       'erp5_officejs',
       'erp5_officejs_connector',
       'erp5_officejs_jquery_app',

bt5/erp5_configurator_standard/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_administration
\ No newline at end of file

bt5/erp5_configurator_standard_categories/bt/test_dependency_list

-erp5_configurator_standard
-erp5_full_text_mroonga_catalog
\ No newline at end of file
+erp5_configurator_standard
\ No newline at end of file

bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/FIFO%20Delivery%20Solver.xml

@@ -75,6 +75,10 @@
             <key> <string>solver_action_title</string> </key>
             <value> <string>First In, First Out</string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>FIFODeliverySolver</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>

bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/LIFO%20Delivery%20Solver.xml

@@ -75,6 +75,10 @@
             <key> <string>solver_action_title</string> </key>
             <value> <string>Last In, First Out</string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>LIFODeliverySolver</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>

bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Minimise%20Price%20Delivery%20Solver.xml

@@ -75,6 +75,10 @@
             <key> <string>solver_action_title</string> </key>
             <value> <string>Minimise Price</string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>MinimisePriceDeliverySolver</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>

bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Quantity%20Cancel%20Solver.xml

@@ -146,6 +146,10 @@
             <key> <string>solver_action_title</string> </key>
             <value> <string>Cancel Quantity</string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>QuantityCancelSolver</string> </value>
+        </item>
         <item>
             <key> <string>workflow_list</string> </key>
             <value>

bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Trade%20Model%20Solver.xml

@@ -189,6 +189,10 @@
               </tuple>
             </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>TradeModelSolver</string> </value>
+        </item>
         <item>
             <key> <string>workflow_list</string> </key>
             <value>

bt5/erp5_configurator_standard_solver/PathTemplateItem/portal_solvers/Unify%20Solver.xml

@@ -185,6 +185,10 @@
             <key> <string>solver_action_title</string> </key>
             <value> <string>Unify value</string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>UnifySolver</string> </value>
+        </item>
         <item>
             <key> <string>workflow_list</string> </key>
             <value>

bt5/erp5_configurator_standard_ui_test/PathTemplateItem/test_page_module/user-Howto.Configure.ERP5.for.SMB.With.Configurator.html

@@ -1561,25 +1561,9 @@
                 <td>${base_url}/logout</td>
                 <td></td>
               </tr>
-              <tr>
-                <td>openAndWait</td>
-                <td>${base_url}/login_form</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 metal:use-macro="python: context.Zuite_CommonTemplate.macros['login']">
+                <td tal:omit-tag="" metal:fill-slot="username">PERSON_USER_REFERENCE</td>
+                <td tal:omit-tag="" metal:fill-slot="password">secret</td>
               </tr>
               <tr>
                 <td>openAndWait</td>
@@ -1608,23 +1592,12 @@
               </tr>
               <tr>
                 <td>openAndWait</td>
-                <td>${base_url}/login_form</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>${base_url}/logout</td>
                 <td></td>
               </tr>
-              <tr>
-                <td>clickAndWait</td>
-                <td>//input[@name="logged_in:method"]</td>
-                <td></td>
+              <tr metal:use-macro="python: context.Zuite_CommonTemplate.macros['login']">
+                <td tal:omit-tag="" metal:fill-slot="username">${base_user}</td>
+                <td tal:omit-tag="" metal:fill-slot="password"></td>
               </tr>
             </tbody>
           </table>

bt5/erp5_configurator_standard_ui_test/PathTemplateItem/test_page_module/user-Howto.Configure.ERP5.for.SMB.With.Consultant.Configurator.html

@@ -1434,26 +1434,10 @@
             <td>${base_url}/logout</td> 
             <td> </td> 
           </tr> 
-          <tr> 
-            <td>openAndWait</td> 
-            <td>${base_url}/login_form</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 metal:use-macro="python: context.Zuite_CommonTemplate.macros['login']">
+            <td tal:omit-tag="" metal:fill-slot="username">${base_user}</td>
+            <td tal:omit-tag="" metal:fill-slot="password">${base_password}</td>
+          </tr>
           <tr> 
             <td>openAndWait</td> 
             <td>${base_url}/view</td> 
@@ -1489,26 +1473,10 @@
             <td>${base_url}/logout</td> 
             <td> </td> 
           </tr> 
-          <tr> 
-            <td>openAndWait</td> 
-            <td>${base_url}/login_form</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 metal:use-macro="python: context.Zuite_CommonTemplate.macros['login']">
+            <td tal:omit-tag="" metal:fill-slot="username">PERSON_USER_REFERENCE</td>
+            <td tal:omit-tag="" metal:fill-slot="password">secret</td>
+          </tr>
           <tr> 
             <td>openAndWait</td> 
             <td>${base_url}/view</td> 
@@ -1534,26 +1502,15 @@
             <td>30000</td> 
             <td> </td> 
           </tr> 
-          <tr> 
-            <td>openAndWait</td> 
-            <td>${base_url}/login_form</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>
+            <td>openAndWait</td>
+            <td>${base_url}/logout</td>
+            <td></td>
+          </tr>
+          <tr metal:use-macro="python: context.Zuite_CommonTemplate.macros['login']">
+            <td tal:omit-tag="" metal:fill-slot="username">${base_user}</td>
+            <td tal:omit-tag="" metal:fill-slot="password">${base_password}</td>
+          </tr>
         </tbody> 
       </table> </test> </section><section class="screenshot"> 
     <h1>Login</h1> <img alt="Login Form" title="Login Form" type="image/svg+xml" src="user-ERP5.Login.Form.Screenshot?format=png" /> <details open="open"> 

bt5/erp5_configurator_standard_ui_test/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_content_translation/TestTemplateItem/portal_components/test.erp5.testContentTranslation.py

@@ -39,7 +39,7 @@ class TestContentTranslation(ERP5TypeTestCase):
 
   def getBusinessTemplateList(self):
 
-    return ('erp5_full_text_mroonga_catalog',
+    return (
             'erp5_base',
             'erp5_content_translation',
             )

bt5/erp5_content_translation/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_l10n_fr
 erp5_l10n_ja
\ No newline at end of file

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testCookieCrumbler.py

@@ -89,6 +89,17 @@ class ERP5CookieCrumblerTests (CookieCrumblerTests):
                          self.credentials)
     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():
   return unittest.makeSuite(ERP5CookieCrumblerTests)
 

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testERP5Catalog.py

@@ -202,7 +202,7 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
     return "ERP5Catalog"
 
   def getBusinessTemplateList(self):
-    return ('erp5_full_text_mroonga_catalog', 'erp5_base',)
+    return ('erp5_base',)
 
   # Different variables used for this test
   username = 'seb'
@@ -4150,9 +4150,6 @@ class CatalogToolUpgradeSchemaTestCase(ERP5TypeTestCase):
   """Tests for "upgrade schema" feature of ERP5 Catalog.
   """
 
-  def getBusinessTemplateList(self):
-    return ("erp5_full_text_mroonga_catalog",)
-
   def afterSetUp(self):
     # Add two connections
     db1, db2 = getExtraSqlConnectionStringList()[:2]

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testERP5Coordinate.py

@@ -46,7 +46,6 @@ class TestERP5Coordinate(ERP5TypeTestCase):
       Return the list of required business templates.
     """
     return ('erp5_core_proxy_field_legacy',
-            'erp5_full_text_mroonga_catalog',
             'erp5_base',)
 
   def afterSetUp(self):

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testI18NSearch.py

@@ -35,8 +35,7 @@ class TestI18NSearch(ERP5TypeTestCase):
     return "I18N Search"
 
   def getBusinessTemplateList(self):
-    return ('erp5_full_text_mroonga_catalog',
-            'erp5_base',)
+    return ('erp5_base', )
 
   def afterSetUp(self):
     self.person_module = self.portal.person_module

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testVanillaERP5Catalog.py

@@ -43,7 +43,7 @@ class TestVanillaERP5Catalog(ERP5TypeTestCase, LogInterceptor):
     return "VanillaERP5Catalog"
 
   def getBusinessTemplateList(self):
-    return ('erp5_full_text_mroonga_catalog', 'erp5_base')
+    return ('erp5_base', )
 
   # Different variables used for this test
   username = 'seb'

bt5/erp5_core_test/bt/dependency_list

-erp5_full_text_mroonga_catalog
 erp5_base
 erp5_csv_style
 erp5_core_proxy_field_legacy
\ No newline at end of file

bt5/erp5_corporate_identity_renderjs_ui_test/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_corporate_identity_test/PathTemplateItem/portal_tests/corporate_identity_test_zuite/testCorporateWeb.zpt

@@ -72,6 +72,11 @@
   <td>//ul/li[2]/a[text()='Template Test Web FAQ 2' and @href='Template.Test.Web.FAQ2']</td>
   <td></td>
 </tr>
+<tr>
+  <td>openAndWait</td>
+  <td>${base_url}/web_site_module/template_test_web_site/logout</td>
+  <td></td>
+</tr>
 <tr>
   <td>openAndWait</td>
   <td>${base_url}/web_site_module/template_test_web_site/login_form</td>

bt5/erp5_corporate_identity_test/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_credential/TestTemplateItem/portal_components/test.erp5.testERP5Credential.py

@@ -55,7 +55,6 @@ class TestERP5Credential(ERP5TypeTestCase):
 
   def getBusinessTemplateList(self):
     return (
-      'erp5_full_text_mroonga_catalog',
       'erp5_core_proxy_field_legacy',
       'erp5_base',
       'erp5_jquery',

bt5/erp5_credential/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_core_proxy_field_legacy
 erp5_jquery
 erp5_ingestion_mysql_innodb_catalog

bt5/erp5_crm/TestTemplateItem/portal_components/test.erp5.testCRM.py

@@ -85,7 +85,7 @@ class TestCRM(BaseTestCRM):
     return "CRM"
 
   def getBusinessTemplateList(self):
-    return ('erp5_full_text_mroonga_catalog',
+    return (
             'erp5_core_proxy_field_legacy',
             'erp5_base',
             'erp5_ingestion',
@@ -655,7 +655,6 @@ class TestCRMMailIngestion(BaseTestCRM):
   def getBusinessTemplateList(self):
     # Mail Ingestion must work with CRM alone.
     return ('erp5_core_proxy_field_legacy',
-            'erp5_full_text_mroonga_catalog',
             'erp5_base',
             'erp5_ingestion',
             'erp5_ingestion_mysql_innodb_catalog',

bt5/erp5_crm/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_core_test
 erp5_web
 erp5_core_proxy_field_legacy

bt5/erp5_crm_renderjs_ui_test/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_crm_ui_test/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_data_notebook/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_data_protection/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_base
\ No newline at end of file

bt5/erp5_deferred_renderjs_ui_test/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_demo_smb/SkinTemplateItem/portal_skins/erp5_demo_smb/Base_getDemoSMBBusinessTemplateList.py

 return ('erp5_core_proxy_field_legacy',
-        'erp5_full_text_mroonga_catalog',
+        'erp5_full_text_catalog',
         'erp5_base',
         'erp5_configurator',
         'erp5_configurator_standard')

bt5/erp5_discussion/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_ingestion_mysql_innodb_catalog
\ No newline at end of file

bt5/erp5_dms/TestTemplateItem/portal_components/test.erp5.testDms.py

@@ -100,7 +100,6 @@ class TestDocumentMixin(ERP5TypeTestCase):
 
   business_template_list = ['erp5_core_proxy_field_legacy',
                             'erp5_jquery',
-                            'erp5_full_text_mroonga_catalog',
                             'erp5_base',
                             'erp5_ingestion_mysql_innodb_catalog',
                             'erp5_ingestion',

bt5/erp5_dms/TestTemplateItem/portal_components/test.erp5.testOOoConversionServerRetry.py

@@ -34,7 +34,6 @@ class TestOOoConversionServerRetry(ERP5TypeTestCase):
   def getBusinessTemplateList(self):
     business_template_list = ['erp5_core_proxy_field_legacy',
                             'erp5_jquery',
-                            'erp5_full_text_mroonga_catalog',
                             'erp5_base',
                             'erp5_ingestion_mysql_innodb_catalog',
                             'erp5_ingestion',

bt5/erp5_dms/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_core_proxy_field_legacy
 erp5_ingestion_mysql_innodb_catalog
 erp5_ingestion_test

bt5/erp5_dms_conversion_catalog/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_dms
\ No newline at end of file

bt5/erp5_document_scanner_ui_test/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_external_account/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_core_proxy_field_legacy
\ No newline at end of file

bt5/erp5_forge/TestTemplateItem/portal_components/test.erp5.testTemplateTool.py

@@ -50,7 +50,6 @@ class TestTemplateTool(ERP5TypeTestCase):
 
   def getBusinessTemplateList(self):
     return ('erp5_core_proxy_field_legacy',
-            'erp5_full_text_mroonga_catalog',
             'erp5_base',
             'erp5_crm',
             'erp5_forge')

bt5/erp5_forge/bt/test_dependency_list

 erp5_ui_test
-erp5_full_text_mroonga_catalog
 erp5_pdm
 erp5_simulation
 erp5_trade

bt5/erp5_forum_tutorial/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_base
 erp5_web
 erp5_ingestion_mysql_innodb_catalog

bt5/erp5_free_subscription/TestTemplateItem/portal_components/test.erp5.testFreeSubscription.py

@@ -50,7 +50,6 @@ class TestFreeSubscription(ERP5TypeTestCase):
 
   def getBusinessTemplateList(self):
     return (
-      'erp5_full_text_mroonga_catalog',
       'erp5_core_proxy_field_legacy',
       'erp5_base',
       'erp5_jquery',

bt5/erp5_free_subscription/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_core_proxy_field_legacy
 erp5_base
 erp5_jquery

bt5/erp5_gadget_interface_validator_ui_test/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_graph_editor_ui_test/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_hal_json_style/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_ui_test_core
 erp5_ui_test
 erp5_dummy_movement

bt5/erp5_ical_style/bt/test_dependency_list

-erp5_full_text_myisam_catalog
 erp5_base
 erp5_pdm
 erp5_simulation

bt5/erp5_immobilisation/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_core_proxy_field_legacy
 erp5_base
 erp5_pdm

bt5/erp5_ingestion/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_ingestion_mysql_innodb_catalog
\ No newline at end of file

bt5/erp5_ingestion_test/bt/test_dependency_list

 erp5_web
 erp5_crm
-erp5_dms
-erp5_full_text_myisam_catalog
\ No newline at end of file
+erp5_dms
\ No newline at end of file

bt5/erp5_interface_post/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_invoicing/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_core_proxy_field_legacy
 erp5_base
 erp5_apparel

bt5/erp5_item/bt/test_dependency_list

 erp5_core_proxy_field_legacy
-erp5_full_text_mroonga_catalog
 erp5_base
 erp5_pdm
 erp5_simulation

bt5/erp5_item_renderjs_ui_test/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_jquery_sheet_editor/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_dms
\ No newline at end of file

bt5/erp5_json_form/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_km/TestTemplateItem/portal_components/test.erp5.testKM.py

@@ -48,7 +48,7 @@ class TestKMMixIn(TestDocumentMixin):
   manager_password = ''
   website_id = 'km_test'
   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_ingestion_mysql_innodb_catalog', 'erp5_ingestion',
                             'erp5_web', 'erp5_dms',

bt5/erp5_km/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
 erp5_core_proxy_field_legacy
 erp5_jquery
 erp5_jquery_ui

bt5/erp5_km_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalKM.py

@@ -43,7 +43,7 @@ class TestZeleniumKM(ERP5TypeFunctionalTestCase):
     """
     # XXX This is a rough list, we should drop as much as we can, and
     # 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_dhtml_style', 'erp5_dhtml_ui_test',
             'erp5_jquery', 'erp5_jquery_ui',

bt5/erp5_km_ui_test/bt/test_dependency_list

 erp5_core_proxy_field_legacy
-erp5_full_text_mroonga_catalog
 erp5_base
 erp5_ui_test
 erp5_dhtml_style

bt5/erp5_log/PortalTypeTemplateItem/portal_types/Log.xml

@@ -18,6 +18,10 @@
             <key> <string>portal_type</string> </key>
             <value> <string>Base Type</string> </value>
         </item>
+        <item>
+            <key> <string>type_class</string> </key>
+            <value> <string>XMLObject</string> </value>
+        </item>
       </dictionary>
     </pickle>
   </record>

bt5/erp5_maileva_connector/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file

bt5/erp5_monaco_editor_ui_test/bt/test_dependency_list

-erp5_full_text_mroonga_catalog
\ No newline at end of file