[IMP] *: adapt qunit suite bundle inheritance

Since the test assets bundle name has been changed and its structure is different,
the inheriting assets need to be updated.

Task 2002399

38 files changed, 68 insertions, 68 deletions

diff --git a/addons/account/views/account.xml b/addons/account/views/account.xml
index ae91e2411c6..c0aa006db4c 100644
--- a/addons/account/views/account.xml
+++ b/addons/account/views/account.xml
@@ -46,7 +46,7 @@
         </xpath>
     </template>
 
-    <template id="qunit_suite" name="account tests" inherit_id="web.qunit_suite">
+    <template id="qunit_suite" name="account tests" inherit_id="web.qunit_suite_tests">
         <xpath expr="//script[contains(@src, '/web/static/tests/views/kanban_tests.js')]" position="after">
             <script type="text/javascript" src="/account/static/tests/account_payment_field_tests.js"></script>
             <script type="text/javascript" src="/account/static/tests/section_and_note_tests.js"></script>
diff --git a/addons/barcodes/views/barcodes_templates.xml b/addons/barcodes/views/barcodes_templates.xml
index 45b77bd3301..fbc78f80afe 100644
--- a/addons/barcodes/views/barcodes_templates.xml
+++ b/addons/barcodes/views/barcodes_templates.xml
@@ -10,14 +10,14 @@
             </xpath>
         </template>
 
-        <template id="qunit_suite" name="barcode_tests" inherit_id="web.qunit_suite">
-            <xpath expr="//t[@t-set='head']" position="inside">
+        <template id="qunit_suite" name="barcode_tests" inherit_id="web.qunit_suite_tests">
+            <xpath expr="." position="inside">
                 <script type="text/javascript" src="/barcodes/static/tests/barcode_tests.js"/>
             </xpath>
         </template>
 
-        <template id="qunit_mobile_suite" name="barcode_mobile_tests" inherit_id="web.qunit_mobile_suite">
-            <xpath expr="//t[@t-set='head']" position="inside">
+        <template id="qunit_mobile_suite" name="barcode_mobile_tests" inherit_id="web.qunit_mobile_suite_tests">
+            <xpath expr="." position="inside">
                 <script type="text/javascript" src="/barcodes/static/tests/barcode_mobile_tests.js"></script>
             </xpath>
         </template>
diff --git a/addons/base_automation/views/base_automation_view.xml b/addons/base_automation/views/base_automation_view.xml
index 557883e26e8..5bce06082f5 100644
--- a/addons/base_automation/views/base_automation_view.xml
+++ b/addons/base_automation/views/base_automation_view.xml
@@ -110,8 +110,8 @@
             </xpath>
         </template>
 
-        <template id="qunit_suite" name="base_automation_tests" inherit_id="web.qunit_suite">
-            <xpath expr="//t[@t-set='head']" position="inside">
+        <template id="qunit_suite" name="base_automation_tests" inherit_id="web.qunit_suite_tests">
+            <xpath expr="." position="inside">
                 <script type="text/javascript" src="/base_automation/static/tests/base_automation_error_dialog.js"/>
             </xpath>
         </template>
diff --git a/addons/base_iban/views/templates.xml b/addons/base_iban/views/templates.xml
index 271565093c4..b25dc9e1cab 100644
--- a/addons/base_iban/views/templates.xml
+++ b/addons/base_iban/views/templates.xml
@@ -8,7 +8,7 @@
             </xpath>
         </template>
 
-        <template id="qunit_suite" name="base_iban_widget_tests" inherit_id="web.qunit_suite">
+        <template id="qunit_suite" name="base_iban_widget_tests" inherit_id="web.qunit_suite_tests">
             <xpath expr="." position="inside">
                 <script type="text/javascript" src="/base_iban/static/src/tests/iban_widget_test.js"></script>
             </xpath>
diff --git a/addons/base_import/views/base_import_templates.xml b/addons/base_import/views/base_import_templates.xml
index 2b4670f3805..ce2af4e0c26 100644
--- a/addons/base_import/views/base_import_templates.xml
+++ b/addons/base_import/views/base_import_templates.xml
@@ -10,14 +10,14 @@
             </xpath>
         </template>
 
-        <template id="qunit_suite" name="base_import_tests" inherit_id="web.qunit_suite">
-            <xpath expr="//t[@t-set='head']" position="inside">
+        <template id="qunit_suite" name="base_import_tests" inherit_id="web.qunit_suite_tests">
+            <xpath expr="." position="inside">
                 <script type="text/javascript" src="/base_import/static/tests/import_buttons_tests.js"></script>
             </xpath>
         </template>
 
-        <template id="qunit_mobile_suite" name="base_import_mobile_tests" inherit_id="web.qunit_mobile_suite">
-            <xpath expr="//t[@t-set='head']" position="inside">
+        <template id="qunit_mobile_suite" name="base_import_mobile_tests" inherit_id="web.qunit_mobile_suite_tests">
+            <xpath expr="." position="inside">
                 <script type="text/javascript" src="/base_import/static/tests/import_buttons_mobile_tests.js"></script>
             </xpath>
         </template>
diff --git a/addons/board/views/board_templates.xml b/addons/board/views/board_templates.xml
index 65ab2a1b6c1..bfd6695a847 100644
--- a/addons/board/views/board_templates.xml
+++ b/addons/board/views/board_templates.xml
@@ -9,8 +9,8 @@
             </xpath>
         </template>
 
-         <template id="qunit_suite" name="dashboard_tests" inherit_id="web.qunit_suite">
-            <xpath expr="//t[@t-set='head']" position="inside">
+         <template id="qunit_suite" name="dashboard_tests" inherit_id="web.qunit_suite_tests">
+            <xpath expr="." position="inside">
                 <script type="text/javascript" src="/board/static/tests/dashboard_tests.js"></script>
             </xpath>
         </template>
diff --git a/addons/bus/views/bus.xml b/addons/bus/views/bus.xml
index 8ccabfdfa3c..e60371c9f78 100644
--- a/addons/bus/views/bus.xml
+++ b/addons/bus/views/bus.xml
@@ -16,7 +16,7 @@
         </xpath>
     </template>
 
-    <template id="qunit_suite" name="bus tests" inherit_id="web.qunit_suite">
+    <template id="qunit_suite" name="bus tests" inherit_id="web.qunit_suite_tests">
         <xpath expr="//script[last()]" position="after">
             <script type="text/javascript" src="/bus/static/tests/bus_tests.js"/>
         </xpath>
diff --git a/addons/calendar/views/calendar_templates.xml b/addons/calendar/views/calendar_templates.xml
index b5c2cf64523..d22059ecd21 100644
--- a/addons/calendar/views/calendar_templates.xml
+++ b/addons/calendar/views/calendar_templates.xml
@@ -10,7 +10,7 @@
         </xpath>
     </template>
 
-    <template id="qunit_suite" inherit_id="web.qunit_suite">
+    <template id="qunit_suite" inherit_id="web.qunit_suite_tests">
         <xpath expr="//script[last()]" position="after">
             <script type="text/javascript" src="/calendar/static/tests/calendar_tests.js"/>
             <script type="text/javascript" src="/calendar/static/tests/systray_activity_menu_tests.js"/>
diff --git a/addons/event_sale/views/assets.xml b/addons/event_sale/views/assets.xml
index 11391322534..4f0ebce23f6 100644
--- a/addons/event_sale/views/assets.xml
+++ b/addons/event_sale/views/assets.xml
@@ -12,8 +12,8 @@
         <script type="text/javascript" src="/event_sale/static/tests/tours/event_configurator_ui.js"></script>
     </xpath>
 </template>
-<template id="qunit_suite" inherit_id="web.qunit_suite" name="event_sale_tests">
-    <xpath expr="//t[@t-set='head']" position="inside">
+<template id="qunit_suite" inherit_id="web.qunit_suite_tests" name="event_sale_tests">
+    <xpath expr="." position="inside">
         <script type="text/javascript" src="/event_sale/static/tests/event_configurator.test.js"></script>
     </xpath>
 </template>
diff --git a/addons/google_calendar/views/google_calendar_templates.xml b/addons/google_calendar/views/google_calendar_templates.xml
index 5d194433b92..1448a2dedde 100644
--- a/addons/google_calendar/views/google_calendar_templates.xml
+++ b/addons/google_calendar/views/google_calendar_templates.xml
@@ -7,8 +7,8 @@
         </xpath>
     </template>
 
-    <template id="qunit_suite" name="google_calendar_tests" inherit_id="web.qunit_suite">
-        <xpath expr="//t[@t-set='head']" position="inside">
+    <template id="qunit_suite" name="google_calendar_tests" inherit_id="web.qunit_suite_tests">
+        <xpath expr="." position="inside">
             <script type="text/javascript" src="/google_calendar/static/tests/google_calendar_tests.js"></script>
         </xpath>
     </template>
diff --git a/addons/google_drive/views/google_drive_templates.xml b/addons/google_drive/views/google_drive_templates.xml
index 406126a0748..7a02753a2e6 100644
--- a/addons/google_drive/views/google_drive_templates.xml
+++ b/addons/google_drive/views/google_drive_templates.xml
@@ -8,8 +8,8 @@
         </xpath>
     </template>
 
-    <template id="qunit_suite" name="google_drive tests" inherit_id="web.qunit_suite">
-        <xpath expr="//t[@t-set='head']" position="inside">
+    <template id="qunit_suite" name="google_drive tests" inherit_id="web.qunit_suite_tests">
+        <xpath expr="." position="inside">
             <script type="text/javascript" src="/google_drive/static/tests/mock_server.js"></script>
             <script type="text/javascript" src="/google_drive/static/tests/gdrive_test.js"></script>
         </xpath>
diff --git a/addons/hr_attendance/views/web_asset_backend_template.xml b/addons/hr_attendance/views/web_asset_backend_template.xml
index 77d96abddae..3a0fb87f4c2 100644
--- a/addons/hr_attendance/views/web_asset_backend_template.xml
+++ b/addons/hr_attendance/views/web_asset_backend_template.xml
@@ -12,7 +12,7 @@
         </xpath>
     </template>
 
-    <template id="qunit_suite" name="hr attendance tests" inherit_id="web.qunit_suite">
+    <template id="qunit_suite" name="hr attendance tests" inherit_id="web.qunit_suite_tests">
         <xpath expr="//script[contains(@src, '/web/static/tests/views/kanban_tests.js')]" position="after">
             <script type="text/javascript" src="/hr_attendance/static/tests/hr_attendance_tests.js"></script>
         </xpath>
diff --git a/addons/hr_holidays/views/hr_leave_template.xml b/addons/hr_holidays/views/hr_leave_template.xml
index e4af562cc60..6cbb59333b3 100644
--- a/addons/hr_holidays/views/hr_leave_template.xml
+++ b/addons/hr_holidays/views/hr_leave_template.xml
@@ -10,7 +10,7 @@
       <link rel="stylesheet" type="text/scss" href="/hr_holidays/static/src/scss/time_off.scss"/>
     </xpath>
   </template>
-  <template id="qunit_suite" name="hr_holidays_qunit_suite" inherit_id="web.qunit_suite">
+  <template id="qunit_suite" name="hr_holidays_qunit_suite" inherit_id="web.qunit_suite_tests">
       <xpath expr="." position="inside">
           <script type="text/javascript" src="/hr_holidays/static/tests/test_leave_stats_widget.js"></script>
       </xpath>
diff --git a/addons/hr_org_chart/views/hr_templates.xml b/addons/hr_org_chart/views/hr_templates.xml
index 5ee5e9e753b..7e3fdf0b645 100644
--- a/addons/hr_org_chart/views/hr_templates.xml
+++ b/addons/hr_org_chart/views/hr_templates.xml
@@ -13,7 +13,7 @@
         </xpath>
     </template>
 
-    <template id="qunit_suite" inherit_id="web.qunit_suite">
+    <template id="qunit_suite" inherit_id="web.qunit_suite_tests">
         <xpath expr="//script[last()]" position="after">
             <script type="text/javascript" src="/hr_org_chart/static/tests/hr_org_chart_tests.js"/>
         </xpath>
diff --git a/addons/hr_skills/views/hr_templates.xml b/addons/hr_skills/views/hr_templates.xml
index 05329346c64..18f28143b79 100644
--- a/addons/hr_skills/views/hr_templates.xml
+++ b/addons/hr_skills/views/hr_templates.xml
@@ -6,7 +6,7 @@
             <script type="text/javascript" src="/hr_skills/static/src/js/resume_widget.js"></script>
         </xpath>
     </template>
-    <template id="qunit_suite" name="hr_skills_qunit_suite" inherit_id="web.qunit_suite">
+    <template id="qunit_suite" name="hr_skills_qunit_suite" inherit_id="web.qunit_suite_tests">
         <xpath expr="." position="inside">
             <script type="text/javascript" src="/hr_skills/static/tests/widget_tests.js"></script>
         </xpath>
diff --git a/addons/im_livechat/views/im_livechat_channel_templates.xml b/addons/im_livechat/views/im_livechat_channel_templates.xml
index 4906bae1cdb..d5a5dd3f490 100644
--- a/addons/im_livechat/views/im_livechat_channel_templates.xml
+++ b/addons/im_livechat/views/im_livechat_channel_templates.xml
@@ -15,8 +15,8 @@
             </xpath>
         </template>
 
-        <template id="qunit_suite" name="livechat_tests" inherit_id="web.qunit_suite">
-            <xpath expr="//t[@t-set='head']" position="inside">
+        <template id="qunit_suite" name="livechat_tests" inherit_id="web.qunit_suite_tests">
+            <xpath expr="." position="inside">
                 <script type="text/javascript" src="/im_livechat/static/src/js/website_livechat_window.js"></script>
                 <script type="text/javascript" src="/im_livechat/static/src/js/models/website_livechat.js"></script>
                 <script type="text/javascript" src="/im_livechat/static/src/js/models/website_livechat_message.js"></script>
diff --git a/addons/im_support/views/assets.xml b/addons/im_support/views/assets.xml
index 60bbd7be798..1025050ad64 100644
--- a/addons/im_support/views/assets.xml
+++ b/addons/im_support/views/assets.xml
@@ -15,15 +15,15 @@
       </xpath>
     </template>
 
-    <template id="qunit_suite" name="im_support_tests" inherit_id="web.qunit_suite">
-      <xpath expr="//t[@t-set='head']" position="inside">
+    <template id="qunit_suite" name="im_support_tests" inherit_id="web.qunit_suite_tests">
+      <xpath expr="." position="inside">
         <script type="text/javascript" src="/im_support/static/tests/helpers/test_utils.js"></script>
         <script type="text/javascript" src="/im_support/static/tests/systray_no_support_tests.js"></script>
       </xpath>
     </template>
 
-    <template id="qunit_mobile_suite" name="im_support_mobile_tests" inherit_id="web.qunit_mobile_suite">
-      <xpath expr="//t[@t-set='head']" position="inside">
+    <template id="qunit_mobile_suite" name="im_support_mobile_tests" inherit_id="web.qunit_mobile_suite_tests">
+      <xpath expr="." position="inside">
         <script type="text/javascript" src="/im_support/static/tests/helpers/test_utils.js"></script>
       </xpath>
     </template>
diff --git a/addons/lunch/views/lunch_templates.xml b/addons/lunch/views/lunch_templates.xml
index b39211bf3af..2fbdb1d3df0 100644
--- a/addons/lunch/views/lunch_templates.xml
+++ b/addons/lunch/views/lunch_templates.xml
@@ -16,15 +16,15 @@
         </xpath>
     </template>
 
-    <template id="qunit_suite" name="lunch tests" inherit_id="web.qunit_suite">
-        <xpath expr="//t[@t-set='head']" position="inside">
+    <template id="qunit_suite" name="lunch tests" inherit_id="web.qunit_suite_tests">
+        <xpath expr="." position="inside">
             <script type="text/javascript" src="/lunch/static/tests/lunch_test_utils.js"></script>
             <script type="text/javascript" src="/lunch/static/tests/lunch_kanban_tests.js"></script>
         </xpath>
     </template>
 
-    <template id="qunit_mobile_suite" name="lunch mobile tests" inherit_id="web.qunit_mobile_suite">
-        <xpath expr="//t[@t-set='head']" position="inside">
+    <template id="qunit_mobile_suite" name="lunch mobile tests" inherit_id="web.qunit_mobile_suite_tests">
+        <xpath expr="." position="inside">
             <script type="text/javascript" src="/lunch/static/tests/lunch_test_utils.js"></script>
             <script type="text/javascript" src="/lunch/static/tests/lunch_kanban_mobile_tests.js"></script>
         </xpath>
diff --git a/addons/mail/views/mail_templates.xml b/addons/mail/views/mail_templates.xml
index f1ef1e2947b..195d8e2f799 100644
--- a/addons/mail/views/mail_templates.xml
+++ b/addons/mail/views/mail_templates.xml
@@ -110,8 +110,8 @@
             </xpath>
         </template>
 
-        <template id="qunit_suite" name="mail_tests" inherit_id="web.qunit_suite">
-            <xpath expr="//t[@t-set='head']" position="inside">
+        <template id="qunit_suite" name="mail_tests" inherit_id="web.qunit_suite_tests">
+            <xpath expr="." position="inside">
                 <!-- thread window -->
                     <script type="text/javascript" src="/mail/static/tests/thread_window/basic_thread_window_tests.js"></script>
                     <script type="text/javascript" src="/mail/static/tests/thread_window/blank_thread_window_tests.js"></script>
diff --git a/addons/mail_bot/views/assets.xml b/addons/mail_bot/views/assets.xml
index 45189d82715..243fa5228a2 100644
--- a/addons/mail_bot/views/assets.xml
+++ b/addons/mail_bot/views/assets.xml
@@ -8,8 +8,8 @@
                 <script type="text/javascript" src="/mail_bot/static/src/js/systray_messaging_menu.js"></script>
             </xpath>
         </template>
-        <template id="qunit_suite" name="mail_tests" inherit_id="web.qunit_suite">
-            <xpath expr="//t[@t-set='head']" position="inside">
+        <template id="qunit_suite" name="mail_tests" inherit_id="web.qunit_suite_tests">
+            <xpath expr="." position="inside">
                 <script type="text/javascript" src="/mail_bot/static/tests/systray_messaging_menu_tests.js"></script>
             </xpath>
         </template>
diff --git a/addons/mass_mailing/views/assets.xml b/addons/mass_mailing/views/assets.xml
index 6143a5bd602..806d95ad4ff 100644
--- a/addons/mass_mailing/views/assets.xml
+++ b/addons/mass_mailing/views/assets.xml
@@ -38,7 +38,7 @@
         <link rel="stylesheet" type="text/scss" href="/mass_mailing/static/src/css/basic_theme_readonly.css"/>
     </template>
 
-    <template id="qunit_suite" inherit_id="web.qunit_suite">
+    <template id="qunit_suite" inherit_id="web.qunit_suite_tests">
         <xpath expr="." position="inside">
             <script type="text/javascript">
                 odoo.define('mass_mailing.FieldHtml.test', function (require) {
diff --git a/addons/mrp/views/mrp_templates.xml b/addons/mrp/views/mrp_templates.xml
index 24b891d49bd..b5796193dcd 100644
--- a/addons/mrp/views/mrp_templates.xml
+++ b/addons/mrp/views/mrp_templates.xml
@@ -24,7 +24,7 @@
         </xpath>
     </template>
 
-    <template id="qunit_suite" inherit_id="web.qunit_suite">
+    <template id="qunit_suite" inherit_id="web.qunit_suite_tests">
         <xpath expr="//script[last()]" position="after">
             <script type="text/javascript" src="/mrp/static/tests/mrp_tests.js"/>
             <script type="text/javascript" src="/mrp/static/tests/mrp_document_kanban_tests.js"/>
@@ -32,7 +32,7 @@
     </template>
 
     <template id="exception_on_mo">
-        <div class="alert alert-warning" role="alert"> 
+        <div class="alert alert-warning" role="alert">
             Exception(s) occurred on the manufacturing order(s):
             <a href="#" data-oe-model="mrp.production" t-att-data-oe-id="production_order.id"><t t-esc="production_order.name"/></a>.
             Manual actions may be needed.
diff --git a/addons/note/views/note_templates.xml b/addons/note/views/note_templates.xml
index a443fadfe4e..0076d8f0316 100644
--- a/addons/note/views/note_templates.xml
+++ b/addons/note/views/note_templates.xml
@@ -9,8 +9,8 @@
         </xpath>
     </template>
 
-    <template id="qunit_suite" name="note_tests" inherit_id="web.qunit_suite">
-        <xpath expr="//t[@t-set='head']" position="inside">
+    <template id="qunit_suite" name="note_tests" inherit_id="web.qunit_suite_tests">
+        <xpath expr="." position="inside">
             <script type="text/javascript" src="/note/static/tests/systray_activity_menu_tests.js"></script>
         </xpath>
     </template>
diff --git a/addons/pad/views/pad.xml b/addons/pad/views/pad.xml
index 63dccce615c..462797d4415 100644
--- a/addons/pad/views/pad.xml
+++ b/addons/pad/views/pad.xml
@@ -7,7 +7,7 @@
         </xpath>
     </template>
 
-    <template id="qunit_suite" name="pad tests" inherit_id="web.qunit_suite">
+    <template id="qunit_suite" name="pad tests" inherit_id="web.qunit_suite_tests">
         <xpath expr="//script[last()]" position="after">
             <script type="text/javascript" src="/pad/static/tests/pad_tests.js"></script>
         </xpath>
diff --git a/addons/partner_autocomplete/views/partner_autocomplete_assets.xml b/addons/partner_autocomplete/views/partner_autocomplete_assets.xml
index 1fa3ec375c0..5007b43fc87 100644
--- a/addons/partner_autocomplete/views/partner_autocomplete_assets.xml
+++ b/addons/partner_autocomplete/views/partner_autocomplete_assets.xml
@@ -15,7 +15,7 @@
         </xpath>
     </template>
 
-    <template id="qunit_suite" inherit_id="web.qunit_suite">
+    <template id="qunit_suite" inherit_id="web.qunit_suite_tests">
         <xpath expr="//script[last()]" position="after">
             <script type="text/javascript" src="/partner_autocomplete/static/tests/partner_autocomplete_tests.js"/>
         </xpath>
diff --git a/addons/product/views/product_templates.xml b/addons/product/views/product_templates.xml
index 8a8bfd7498f..5c33cfc280c 100644
--- a/addons/product/views/product_templates.xml
+++ b/addons/product/views/product_templates.xml
@@ -6,8 +6,8 @@
             <script type="text/javascript" src="/product/static/src/js/product_pricelist_report.js"></script>
         </xpath>
    </template>
-    <template id="qunit_suite" name="Product pricelist report tests" inherit_id="web.qunit_suite">
-        <xpath expr="//t[@t-set='head']" position="inside">
+    <template id="qunit_suite" name="Product pricelist report tests" inherit_id="web.qunit_suite_tests">
+        <xpath expr="." position="inside">
             <script type="text/javascript" src="/product/static/tests/product_pricelist_report_test.js"></script>
         </xpath>
     </template>
diff --git a/addons/purchase_product_matrix/views/assets.xml b/addons/purchase_product_matrix/views/assets.xml
index ff11e9907fd..fc356b012bc 100644
--- a/addons/purchase_product_matrix/views/assets.xml
+++ b/addons/purchase_product_matrix/views/assets.xml
@@ -7,8 +7,8 @@
       </xpath>
   </template>
 
-  <template id="qunit_suite" name="purchase_product_matrix tests" inherit_id="web.qunit_suite">
-      <xpath expr="//t[@t-set='head']" position="inside">
+  <template id="qunit_suite" name="purchase_product_matrix tests" inherit_id="web.qunit_suite_tests">
+      <xpath expr="." position="inside">
           <script type="text/javascript" src="/purchase_product_matrix/static/tests/section_and_note_widget_tests.js"></script>
       </xpath>
   </template>
diff --git a/addons/sale/views/assets.xml b/addons/sale/views/assets.xml
index e5fac59fb2e..cc7b45a960f 100644
--- a/addons/sale/views/assets.xml
+++ b/addons/sale/views/assets.xml
@@ -29,8 +29,8 @@
             <script type="text/javascript" src="/sale/static/tests/tours/sale_signature.js"></script>
         </xpath>
     </template>
-    <template id="qunit_suite" name="sale_tests" inherit_id="web.qunit_suite">
-        <xpath expr="//t[@t-set='head']" position="inside">
+    <template id="qunit_suite" name="sale_tests" inherit_id="web.qunit_suite_tests">
+        <xpath expr="." position="inside">
             <script type="text/javascript" src="/sale/static/tests/product_configurator_tests.js"></script>
             <script type="text/javascript" src="/sale/static/tests/sales_team_dashboard_tests.js"></script>
         </xpath>
diff --git a/addons/sale_expense/views/assets.xml b/addons/sale_expense/views/assets.xml
index 3b7f317b252..7f065c3a94b 100644
--- a/addons/sale_expense/views/assets.xml
+++ b/addons/sale_expense/views/assets.xml
@@ -6,7 +6,7 @@
         </xpath>
     </template>
 
-    <template id="qunit_suite" inherit_id="web.qunit_suite">
+    <template id="qunit_suite" inherit_id="web.qunit_suite_tests">
         <xpath expr="//script[last()]" position="after">
             <script type="text/javascript" src="/sale_expense/static/tests/sale_order_many2one_tests.js"/>
         </xpath>
diff --git a/addons/sale_product_configurator/views/assets.xml b/addons/sale_product_configurator/views/assets.xml
index 8917dc90c5e..5665e7ddb2b 100644
--- a/addons/sale_product_configurator/views/assets.xml
+++ b/addons/sale_product_configurator/views/assets.xml
@@ -20,8 +20,8 @@
             <script type="text/javascript" src="/sale_product_configurator/static/tests/tours/product_configurator_optional_products_ui.js"/>
         </xpath>
     </template>
-    <template id="qunit_suite" inherit_id="web.qunit_suite" name="sale_product_configurator_tests">
-        <xpath expr="//t[@t-set='head']" position="inside">
+    <template id="qunit_suite" inherit_id="web.qunit_suite_tests" name="sale_product_configurator_tests">
+        <xpath expr="." position="inside">
             <script type="text/javascript" src="/sale_product_configurator/static/tests/product_configurator.test.js"></script>
         </xpath>
     </template>
diff --git a/addons/sale_product_matrix/views/assets.xml b/addons/sale_product_matrix/views/assets.xml
index ffd28eff59e..bd2c99987fc 100644
--- a/addons/sale_product_matrix/views/assets.xml
+++ b/addons/sale_product_matrix/views/assets.xml
@@ -6,8 +6,8 @@
         </xpath>
     </template>
 
-    <template id="qunit_suite" name="sale_product_matrix tests" inherit_id="web.qunit_suite">
-        <xpath expr="//t[@t-set='head']" position="inside">
+    <template id="qunit_suite" name="sale_product_matrix tests" inherit_id="web.qunit_suite_tests">
+        <xpath expr="." position="inside">
             <script type="text/javascript" src="/sale_product_matrix/static/tests/section_and_note_widget_tests.js"></script>
         </xpath>
     </template>
diff --git a/addons/sms/views/assets.xml b/addons/sms/views/assets.xml
index be507fa3f92..4ca1b004d5b 100644
--- a/addons/sms/views/assets.xml
+++ b/addons/sms/views/assets.xml
@@ -14,7 +14,7 @@
             </xpath>
         </template>
 
-        <template id="qunit_suite" name="sms_widget_tests" inherit_id="web.qunit_suite">
+        <template id="qunit_suite" name="sms_widget_tests" inherit_id="web.qunit_suite_tests">
             <xpath expr="." position="inside">
                 <script type="text/javascript" src="/sms/static/tests/sms_widget_test.js"></script>
             </xpath>
diff --git a/addons/snailmail/views/assets.xml b/addons/snailmail/views/assets.xml
index 1dca06c355c..3aacde296c2 100644
--- a/addons/snailmail/views/assets.xml
+++ b/addons/snailmail/views/assets.xml
@@ -11,8 +11,8 @@
         </xpath>
     </template>
 
-    <template id="qunit_suite" name="snailmail_tests" inherit_id="web.qunit_suite">
-        <xpath expr="//t[@t-set='head']" position="inside">
+    <template id="qunit_suite" name="snailmail_tests" inherit_id="web.qunit_suite_tests">
+        <xpath expr="." position="inside">
             <script type="text/javascript" src="/snailmail/static/tests/chatter_snailmail_tests.js"></script>
         </xpath>
     </template>
diff --git a/addons/stock/views/stock_template.xml b/addons/stock/views/stock_template.xml
index dd9f333379c..d41b7eab162 100644
--- a/addons/stock/views/stock_template.xml
+++ b/addons/stock/views/stock_template.xml
@@ -17,8 +17,8 @@
         </xpath>
    </template>
 
-    <template id="qunit_suite" name="stock tests" inherit_id="web.qunit_suite">
-        <xpath expr="//t[@t-set='head']" position="inside">
+    <template id="qunit_suite" name="stock tests" inherit_id="web.qunit_suite_tests">
+        <xpath expr="." position="inside">
             <script type="text/javascript" src="/stock/static/tests/singleton_list_tests.js"/>
             <script type="text/javascript" src="/stock/static/tests/popover_widget_tests.js"/>
             <script type="text/javascript" src="/stock/static/tests/stock_traceability_report_backend_tests.js"/>
diff --git a/addons/web_editor/views/editor.xml b/addons/web_editor/views/editor.xml
index eee7c1fafd3..a9337494333 100644
--- a/addons/web_editor/views/editor.xml
+++ b/addons/web_editor/views/editor.xml
@@ -175,7 +175,7 @@
     </xpath>
 </template>
 
-<template id="qunit_suite" inherit_id="web.qunit_suite">
+<template id="qunit_suite" inherit_id="web.qunit_suite_tests">
     <xpath expr="//script[last()]" position="after">
         <script type="text/javascript">
             odoo.define('web_editor.wysiwyg.root.test', function (require) {
diff --git a/addons/web_kanban_gauge/views/web_kanban_gauge_templates.xml b/addons/web_kanban_gauge/views/web_kanban_gauge_templates.xml
index fbba1de789b..673f6cae119 100644
--- a/addons/web_kanban_gauge/views/web_kanban_gauge_templates.xml
+++ b/addons/web_kanban_gauge/views/web_kanban_gauge_templates.xml
@@ -6,8 +6,8 @@
             </xpath>
         </template>
 
-        <template id="qunit_suite" name="gauge_tests" inherit_id="web.qunit_suite">
-            <xpath expr="//t[@t-set='head']" position="inside">
+        <template id="qunit_suite" name="gauge_tests" inherit_id="web.qunit_suite_tests">
+            <xpath expr="." position="inside">
                 <script type="text/javascript" src="/web_kanban_gauge/static/tests/gauge_tests.js"></script>
             </xpath>
         </template>
diff --git a/addons/web_tour/views/tour_templates.xml b/addons/web_tour/views/tour_templates.xml
index 113ac3ab06c..766eeecbcc1 100644
--- a/addons/web_tour/views/tour_templates.xml
+++ b/addons/web_tour/views/tour_templates.xml
@@ -26,7 +26,7 @@
             </xpath>
         </template>
 
-        <template id="web_tour.qunit_suite" name="tour tests" inherit_id="web.qunit_suite">
+        <template id="web_tour.qunit_suite" name="tour tests" inherit_id="web.qunit_suite_tests">
             <xpath expr="//script[last()]" position="after">
                 <script type="text/javascript" src="/web_tour/static/tests/tour_manager_tests.js"/>
             </xpath>
diff --git a/addons/website/views/assets.xml b/addons/website/views/assets.xml
index 073f0d5a646..297d17c5e16 100644
--- a/addons/website/views/assets.xml
+++ b/addons/website/views/assets.xml
@@ -44,7 +44,7 @@
     </xpath>
 </template>
 
-<template id="qunit_suite" inherit_id="web.qunit_suite">
+<template id="qunit_suite" inherit_id="web.qunit_suite_tests">
     <xpath expr="//script[last()]" position="after">
         <script type="text/javascript" src="/website/static/tests/website_tests.js"/>
     </xpath>