diff --git a/addons/website_sale/tests/test_delivery_controller.py b/addons/website_sale/tests/test_delivery_controller.py index 1fb5d8a4202..22191e93f8c 100644 --- a/addons/website_sale/tests/test_delivery_controller.py +++ b/addons/website_sale/tests/test_delivery_controller.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. from unittest.mock import patch @@ -12,6 +11,7 @@ from odoo.addons.sale.tests.common import SaleCommon from odoo.addons.website_sale.controllers.delivery import WebsiteSaleDelivery from odoo.addons.website.tools import MockRequest + @tagged('post_install', '-at_install') class TestWebsiteSaleDeliveryController(PaymentCommon, SaleCommon): def setUp(self): @@ -73,7 +73,6 @@ class TestWebsiteSaleDeliveryController(PaymentCommon, SaleCommon): self.env['delivery.carrier'].create([ { 'name': 'Over 300', - 'fixed_price': 20.0, 'delivery_type': 'base_on_rule', 'product_id': self.product_delivery_poste.id, 'website_published': True, @@ -82,16 +81,32 @@ class TestWebsiteSaleDeliveryController(PaymentCommon, SaleCommon): 'operator': '>=', 'max_value': 300, 'variable': 'price', - 'list_base_price': 0, - }) - ] + }), + ], }, { - 'name': 'No rules', - 'fixed_price': 20.0, + 'name': 'Under 300', 'delivery_type': 'base_on_rule', 'product_id': self.product_delivery_poste.id, 'website_published': True, - } + 'price_rule_ids': [ + Command.create({ + 'operator': '<', + 'max_value': 300, + 'variable': 'price', + }), + ], + }, { + 'name': 'No rules', + 'delivery_type': 'base_on_rule', + 'product_id': self.product_delivery_poste.id, + 'website_published': True, + }, { + 'name': 'Fixed', + 'product_id': self.product_delivery_poste.id, + 'website_published': True, + }, ]) - self.assertFalse(self.empty_order._get_delivery_methods()) + self.assertEqual( + self.empty_order._get_delivery_methods().mapped('name'), ['Under 300', 'Fixed'] + )