From 9ea293ae360f85d079cd7c3c4e635884f6a1cde8 Mon Sep 17 00:00:00 2001 From: Benjamin Vray Date: Tue, 16 Mar 2021 08:17:31 +0000 Subject: [PATCH] [IMP] product, website_sale, *: reword some product names * = website_sale_comparison Remove the "(Config)" from Customizable desk and conference chair. task-2009483 Part of #66736 --- addons/product/data/product_demo.xml | 4 ++-- addons/website_sale/tests/test_sale_process.py | 2 +- .../static/tests/tours/website_sale_comparison.js | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/product/data/product_demo.xml b/addons/product/data/product_demo.xml index ba80566393e..a9c43ca192c 100644 --- a/addons/product/data/product_demo.xml +++ b/addons/product/data/product_demo.xml @@ -172,7 +172,7 @@ - Customizable Desk (CONFIG) + Customizable Desk 500.0 750.0 @@ -347,7 +347,7 @@ - Conference Chair (CONFIG) + Conference Chair 14 16.50 diff --git a/addons/website_sale/tests/test_sale_process.py b/addons/website_sale/tests/test_sale_process.py index 558e9965f2c..d9d0d5ab6a9 100644 --- a/addons/website_sale/tests/test_sale_process.py +++ b/addons/website_sale/tests/test_sale_process.py @@ -35,7 +35,7 @@ class TestUi(HttpCaseWithUserDemo): 'sequence': 2, }) self.product_product_11_product_template = self.env['product.template'].create({ - 'name': 'Conference Chair (CONFIG)', + 'name': 'Conference Chair', 'list_price': 16.50, 'accessory_product_ids': [(4, product_product_7.id)], }) diff --git a/addons/website_sale_comparison/static/tests/tours/website_sale_comparison.js b/addons/website_sale_comparison/static/tests/tours/website_sale_comparison.js index 8f4eb16f7e3..87f8a76167d 100644 --- a/addons/website_sale_comparison/static/tests/tours/website_sale_comparison.js +++ b/addons/website_sale_comparison/static/tests/tours/website_sale_comparison.js @@ -63,7 +63,7 @@ odoo.define('website_sale_comparison.tour_comparison', function (require) { { content: "check the comparelist is now open and contains 3rd product with correct variant", extra_trigger: '.comparator-popover', - trigger: '.o_product_row:contains("Customizable Desk (CONFIG) (Steel, White)")', + trigger: '.o_product_row:contains("Customizable Desk (Steel, White)")', run: function () {}, }, { @@ -82,7 +82,7 @@ odoo.define('website_sale_comparison.tour_comparison', function (require) { { content: "comparelist contains 4th product with correct variant", extra_trigger: '.o_product_circle:contains(4)', - trigger: '.o_product_row:contains("Customizable Desk (CONFIG) (Steel, Black)")', + trigger: '.o_product_row:contains("Customizable Desk (Steel, Black)")', run: function () {}, }, { @@ -111,17 +111,17 @@ odoo.define('website_sale_comparison.tour_comparison', function (require) { // test on compare page { content: "check 1st product contains correct variant", - trigger: '.o_product_comparison_table:contains("Conference Chair (CONFIG) (Steel)")', + trigger: '.o_product_comparison_table:contains("Conference Chair (Steel)")', run: function () {}, }, { content: "check 2nd product contains correct variant", - trigger: '.o_product_comparison_table:contains("Customizable Desk (CONFIG) (Steel, White)")', + trigger: '.o_product_comparison_table:contains("Customizable Desk (Steel, White)")', run: function () {}, }, { content: "check 3rd product is correctly added", - trigger: '.o_product_comparison_table:contains("Customizable Desk (CONFIG) (Steel, Black)")', + trigger: '.o_product_comparison_table:contains("Customizable Desk (Steel, Black)")', run: function () {}, }, { @@ -130,12 +130,12 @@ odoo.define('website_sale_comparison.tour_comparison', function (require) { run: function () {}, }, { - content: "remove Customizable Desk (CONFIG) (Steel, Black) from compare table", + content: "remove Customizable Desk (Steel, Black) from compare table", trigger: '#o_comparelist_table .o_comparelist_remove:eq(2)', }, { content: "check customizable table with black variant is removed", - trigger: '#o_comparelist_table:not(:contains("Customizable Desk (CONFIG) (Steel, Black)"))', + trigger: '#o_comparelist_table:not(:contains("Customizable Desk (Steel, Black)"))', run: function () {}, }, {