From 762b809f71b55066f29ac8ea40a4a6fa26be2dc5 Mon Sep 17 00:00:00 2001 From: Romain Derie Date: Tue, 25 Jun 2019 16:39:50 +0000 Subject: [PATCH] [FIX] website_sale_delivery: adapt test to 55ed70f405a76 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is a conflict in saas-12.3. Indeed, the optional popup on a product when adding to cart got encapsulated into a new module with 55ed70f405a76. But 9308180089 introduced a new test in 12.0 about free delivery. The tour expects the popup to be shown, but it is not the case anymore. The tour needed to be adapted. Standard runbot was green since the test would luckily be executed after `website_sale_product_configurator` would be installed. That was not the case on runbot theme. The chance is also taken to ensure the test is executed on the correct delivery. closes odoo/odoo#34367 Signed-off-by: Jérémy Kersten (jke) --- .../static/src/js/website_free_delivery_tour.js | 14 +++++--------- addons/website_sale_delivery/tests/test_ui.py | 1 + 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/addons/website_sale_delivery/static/src/js/website_free_delivery_tour.js b/addons/website_sale_delivery/static/src/js/website_free_delivery_tour.js index a1093ca98ee..4ac148854f9 100644 --- a/addons/website_sale_delivery/static/src/js/website_free_delivery_tour.js +++ b/addons/website_sale_delivery/static/src/js/website_free_delivery_tour.js @@ -5,21 +5,16 @@ var tour = require("web_tour.tour"); tour.register('check_free_delivery', { test: true, - url: '/shop?search=conference chair', + url: '/shop?search=office chair black', }, [ { - content: "select conference chair", - trigger: '.oe_product_cart:first a:contains("Conference Chair")', + content: "select office chair black", + trigger: '.oe_product_cart:first a:contains("Office Chair Black")', }, { content: "click on add to cart", - extra_trigger: 'label:contains(Steel) input:propChecked', - trigger: '#product_detail form[action^="/shop/cart/update"] .btn-primary', - }, - { - content: "click in modal on 'Proceed to checkout' button", - trigger: 'button:contains("Proceed to Checkout")', + trigger: '#product_details #add_to_cart', }, { content: "go to checkout", @@ -28,6 +23,7 @@ tour.register('check_free_delivery', { }, { content: "Check Free Delivery value to be zero", + extra_trigger: '#delivery_carrier label:containsExact("Delivery Now Free Over 10")', trigger: "#delivery_carrier span:contains('0.0')" }, ]); diff --git a/addons/website_sale_delivery/tests/test_ui.py b/addons/website_sale_delivery/tests/test_ui.py index 1c61c00b9fb..1bf4ce3d3bf 100644 --- a/addons/website_sale_delivery/tests/test_ui.py +++ b/addons/website_sale_delivery/tests/test_ui.py @@ -7,6 +7,7 @@ class TestUi(odoo.tests.HttpCase): def test_01_free_delivery_when_exceed_threshold(self): self.env.ref("delivery.free_delivery_carrier").write({ + 'name': 'Delivery Now Free Over 10', 'fixed_price': 2, 'free_over': True, 'amount': 10,