From de6c4af05dcd8f4baa593d640391e3fc1f67a269 Mon Sep 17 00:00:00 2001
From: Romain Derie <rde@odoo.com>
Date: Fri, 5 Jul 2019 13:40:25 +0000
Subject: [PATCH] [FIX] website_sale_delivery: move test file in correct
 folder/asset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This test was merged in 12.0 at 9308180089dd where the new folder hierarchy and
asset did not exists (introduced in saas-12.4 at fdbf11643fd04).

This commit fixes it.

closes odoo/odoo#34629

Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
---
 .../tours/website_free_delivery.js}                        | 0
 addons/website_sale_delivery/tests/test_ui.py              | 2 +-
 .../views/website_sale_delivery_templates.xml              | 7 ++++++-
 3 files changed, 7 insertions(+), 2 deletions(-)
 rename addons/website_sale_delivery/static/{src/js/website_free_delivery_tour.js => tests/tours/website_free_delivery.js} (100%)

diff --git a/addons/website_sale_delivery/static/src/js/website_free_delivery_tour.js b/addons/website_sale_delivery/static/tests/tours/website_free_delivery.js
similarity index 100%
rename from addons/website_sale_delivery/static/src/js/website_free_delivery_tour.js
rename to addons/website_sale_delivery/static/tests/tours/website_free_delivery.js
diff --git a/addons/website_sale_delivery/tests/test_ui.py b/addons/website_sale_delivery/tests/test_ui.py
index 1bf4ce3d3bf..34dcf086a48 100644
--- a/addons/website_sale_delivery/tests/test_ui.py
+++ b/addons/website_sale_delivery/tests/test_ui.py
@@ -12,4 +12,4 @@ class TestUi(odoo.tests.HttpCase):
             'free_over': True,
             'amount': 10,
         })
-        self.phantom_js("/", "odoo.__DEBUG__.services['web_tour.tour'].run('check_free_delivery')", "odoo.__DEBUG__.services['web_tour.tour'].tours.check_free_delivery.ready", login="admin")
+        self.start_tour("/", 'check_free_delivery', login="admin")
diff --git a/addons/website_sale_delivery/views/website_sale_delivery_templates.xml b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
index 201fe46d843..079f79bf183 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery_templates.xml
@@ -19,10 +19,15 @@
       <xpath expr="." position="inside">
         <script type="text/javascript" src="/website_sale_delivery/static/src/js/website_sale_delivery.js"></script>
         <link rel="stylesheet" type="text/scss" href="/website_sale_delivery/static/src/scss/website_sale_delivery.scss"/>
-        <script type="text/javascript" src="/website_sale_delivery/static/src/js/website_free_delivery_tour.js"></script>
       </xpath>
     </template>
 
+    <template id="assets_tests" name="Website Sale Delivery Assets Tests" inherit_id="web.assets_tests">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/website_sale_delivery/static/tests/tours/website_free_delivery.js"></script>
+        </xpath>
+    </template>
+
     <template id="payment_delivery_methods">
         <input t-att-value="delivery.id" t-att-id="'delivery_%i' % delivery.id" type="radio" name="delivery_type" t-att-checked="order.carrier_id and order.carrier_id.id == delivery.id and 'checked' or False" t-att-class="'d-none' if delivery_nb == 1 else ''"/>
         <label class="label-optional" t-field="delivery.name"/>