pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] *: adapt tours to sale order view conversion to OWL

Browse Source 
X-original-commit: f23215c1cbae6f177d8c7863d493c1ffcf82e9da
Part-of: odoo/odoo#101352
Co-authored-by: Samuel Degueldre <sad@odoo.com>
Co-authored-by: Morgane Demesmaeker <edm@odoo.com>
This commit is contained in:
Victor Feyens
2022-09-28 11:14:37 +02:00
co-authored by Samuel Degueldre Morgane Demesmaeker
parent 99b2095f97
commit ada5c5dfe8
11 changed files with 49 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/sale_timesheet/static/tests/tours/sale_timesheet_tour.js
+3 -3
View File
@@ -27,10 +27,10 @@ tour.register('sale_timesheet_tour', {
content: Markup('Select a prepaid service product <i>(e.g. Service Product (Prepaid Hours))</i>'),
run: 'text Service Product (Prepaid Hours)',
}, {
trigger: 'ul.ui-menu.ui-widget.ui-autocomplete > li:first-child > a:contains(Service Product (Prepaid Hours))',
trigger: 'ul.ui-autocomplete a:contains(Service Product (Prepaid Hours))',
content: 'Select the prepaid service product in the autocomplete dropdown',
}, {
trigger: 'input[name="product_uom_qty"]',
trigger: 'div[name="product_uom_qty"] input',
content: "Add 10 hours as ordered quantity for this product.",
run: 'text 10',
}, {
@@ -41,7 +41,7 @@ tour.register('sale_timesheet_tour', {
extra_trigger: '.o_field_widget[name=state] button[data-value=sale].btn-primary',
content: 'Click on Save button to save the Sales Order.',
}, {
trigger: '.o_form_readonly',
trigger: '.o_form_status_indicator_buttons_hidden',
content: 'Save is done and form is reloaded.',
}, tour.stepUtils.toggleHomeMenu(),
...tour.stepUtils.goToAppSteps("project.menu_main_pm", 'Go to the Project app.'),
addons/test_sale_product_configurators/static/tests/tours/event_sale_with_product_configurator_ui.js
+2 -2
View File
@@ -50,7 +50,7 @@ tour.register('event_sale_with_product_configurator_tour', {
extra_trigger: '.o_monetary_cell span:contains("16.50")', // wait for the optional product line
}, {
trigger: 'div[name="product_template_id"] input',
extra_trigger: '.o_field_many2one[name="product_template_id"] .o_dropdown_button',
extra_trigger: '[name="product_template_id"] .o_dropdown_button',
run: 'text event (',
}, {
trigger: 'ul.ui-autocomplete a:contains("Registration Event (TEST variants)")',
@@ -86,7 +86,7 @@ tour.register('event_sale_with_product_configurator_tour', {
extra_trigger: '.o_monetary_cell span:contains("150.00")', // wait for the adult tickets line
}, {
trigger: 'div[name="product_template_id"] input',
extra_trigger: '.o_field_many2one[name="product_template_id"] .o_dropdown_button',
extra_trigger: '[name="product_template_id"] .o_dropdown_button',
run: 'text event (',
}, {
trigger: 'ul.ui-autocomplete a:contains("Registration Event (TEST variants)")',
addons/test_sale_product_configurators/static/tests/tours/product_configurator_advanced_ui.js
+11 -33
View File
@@ -30,44 +30,37 @@ tour.register('sale_product_configurator_advanced_tour', {
trigger: 'span:contains("Custom")',
extra_trigger: '.oe_advanced_configurator_modal',
}, {
trigger: '.oe_advanced_configurator_modal ul.js_add_cart_variants li[data-attribute_id]:nth-child(1) .variant_custom_value',
extra_trigger: '.oe_advanced_configurator_modal',
trigger: 'ul.js_add_cart_variants li[data-attribute_id]:nth-child(1) .variant_custom_value',
run: 'text Custom 1'
}, {
trigger: '.oe_advanced_configurator_modal ul.js_add_cart_variants li[data-attribute_id]:nth-child(3) span:contains("PAV9")',
extra_trigger: '.oe_advanced_configurator_modal',
trigger: 'ul.js_add_cart_variants li[data-attribute_id]:nth-child(3) div:contains("PAV9") input',
}, {
trigger: '.oe_advanced_configurator_modal ul.js_add_cart_variants li[data-attribute_id]:nth-child(3) .variant_custom_value',
extra_trigger: '.oe_advanced_configurator_modal',
trigger: 'ul.js_add_cart_variants li[data-attribute_id]:nth-child(3) .variant_custom_value',
run: 'text Custom 2'
}, {
trigger: '.oe_advanced_configurator_modal ul.js_add_cart_variants li[data-attribute_id]:nth-child(4) span:contains("PAV5")',
extra_trigger: '.oe_advanced_configurator_modal',
trigger: 'ul.js_add_cart_variants li[data-attribute_id]:nth-child(4) div:contains("PAV5") input',
}, {
trigger: '.oe_advanced_configurator_modal ul.js_add_cart_variants li[data-attribute_id]:nth-child(6) select ',
extra_trigger: '.oe_advanced_configurator_modal',
trigger: 'ul.js_add_cart_variants li[data-attribute_id]:nth-child(6) select ',
run: function (){
let inputValue = $('.oe_advanced_configurator_modal ul.js_add_cart_variants li[data-attribute_id]:nth-child(6) option[data-value_name="PAV9"]').val();
$('.oe_advanced_configurator_modal ul.js_add_cart_variants li[data-attribute_id]:nth-child(6) select').val(inputValue);
$('.oe_advanced_configurator_modal ul.js_add_cart_variants li[data-attribute_id]:nth-child(6) select').trigger('change');
}
}, {
trigger: '.oe_advanced_configurator_modal ul.js_add_cart_variants li[data-attribute_id]:nth-child(6) .variant_custom_value',
extra_trigger: '.oe_advanced_configurator_modal',
trigger: 'ul.js_add_cart_variants li[data-attribute_id]:nth-child(6) .variant_custom_value',
run: 'text Custom 3'
}, {
trigger: '.main_product strong:contains("Custom, White, PAV9, PAV5, PAV1")',
extra_trigger: '.oe_advanced_configurator_modal',
run: function () {} //check
}, {
trigger: '.oe_advanced_configurator_modal .js_product:eq(1) div:contains("Conference Chair (TEST) (Steel)")',
trigger: '.js_product:eq(1) div:contains("Conference Chair (TEST) (Steel)")',
run: function () {
optionVariantImage = $('.oe_advanced_configurator_modal .js_product:eq(1) img.variant_image').attr('src');
}
}, {
trigger: '.oe_advanced_configurator_modal .js_product:eq(1) input[data-value_name="Aluminium"]',
trigger: '.js_product:eq(1) input[data-value_name="Aluminium"]',
}, {
trigger: '.oe_advanced_configurator_modal .js_product:eq(1) div:contains("Conference Chair (TEST) (Aluminium)")',
trigger: '.js_product:eq(1) div:contains("Conference Chair (TEST) (Aluminium)")',
run: function () {
let newVariantImage = $('.oe_advanced_configurator_modal .js_product:eq(1) img.variant_image').attr('src');
if (newVariantImage !== optionVariantImage) {
@@ -76,45 +69,30 @@ tour.register('sale_product_configurator_advanced_tour', {
}
}, {
trigger: '.oe_advanced_configurator_modal .js_product:eq(1) input[data-value_name="Steel"]',
extra_trigger: '.oe_advanced_configurator_modal .js_product:eq(1) div:contains("image variant option src changed")',
trigger: '.js_product:eq(1) input[data-value_name="Steel"]',
extra_trigger: '.js_product:eq(1) div:contains("image variant option src changed")',
}, {
trigger: 'button span:contains(Confirm)',
extra_trigger: '.oe_advanced_configurator_modal',
}, {
trigger: 'td.o_data_cell:contains("Customizable Desk (TEST) (Custom, White, PAV9, PAV5, PAV1)")',
extra_trigger: 'div[name="order_line"]',
in_modal: false,
run: function (){} //check
}, {
trigger: 'td.o_data_cell:contains("Legs: Custom: Custom 1")',
extra_trigger: 'div[name="order_line"]',
in_modal: false,
run: function (){} //check
}, {
trigger: 'td.o_data_cell:contains("PA1: PAV9: Custom 2")',
extra_trigger: 'div[name="order_line"]',
in_modal: false,
run: function (){} //check
}, {
trigger: 'td.o_data_cell:contains("PA4: PAV9: Custom 3")',
extra_trigger: 'div[name="order_line"]',
in_modal: false,
run: function (){} //check
}, {
trigger: 'td.o_data_cell:contains("PA5: PAV1")',
extra_trigger: 'div[name="order_line"]',
in_modal: false,
run: function (){} //check
}, {
trigger: 'td.o_data_cell:contains("PA7: PAV1")',
extra_trigger: 'div[name="order_line"]',
in_modal: false,
run: function (){} //check
}, {
trigger: 'td.o_data_cell:contains("PA8: PAV1")',
extra_trigger: 'div[name="order_line"]',
in_modal: false,
run: function (){} //check
}, ...tour.stepUtils.discardForm()
]);
addons/test_sale_product_configurators/static/tests/tours/product_configurator_edition_ui.js
+8 -9
View File
@@ -35,17 +35,16 @@ tour.register('sale_product_configurator_edition_tour', {
extra_trigger: '.show .modal-footer',
}, {
trigger: 'button span:contains(Confirm)',
extra_trigger: '.oe_advanced_configurator_modal',
}, {
trigger: 'td.o_data_cell:contains("Customizable Desk (TEST) (Aluminium, White)")',
extra_trigger: 'div[name="order_line"]',
run: function (){} // check added product
}, {
trigger: 'td.o_product_configurator_cell',
trigger: 'div[name="product_template_id"]',
}, {
trigger: '.o_edit_product_configuration',
trigger: '.fa-pencil',
}, {
trigger: '.main_product li.js_attribute_value:has(span:contains("Aluminium")) input:checked',
trigger: '.main_product li.js_attribute_value:contains("Aluminium") input:checked',
run: function (){} // check updated legs
}, {
trigger: 'span.oe_currency_value:contains("800")',
@@ -89,9 +88,9 @@ tour.register('sale_product_configurator_edition_tour', {
extra_trigger: 'div[name="order_line"]',
run: function (){} // check custom value
}, {
trigger: 'td.o_product_configurator_cell',
trigger: 'div[name="product_template_id"]',
}, {
trigger: '.o_edit_product_configuration',
trigger: '.fa-pencil',
}, {
trigger: '.main_product .variant_custom_value',
run: 'text another nice custom value'
@@ -102,9 +101,9 @@ tour.register('sale_product_configurator_edition_tour', {
extra_trigger: 'div[name="order_line"]',
run: function (){} // check custom value
}, {
trigger: 'td.o_product_configurator_cell',
trigger: 'div[name="product_template_id"]',
}, {
trigger: '.o_edit_product_configuration',
trigger: '.fa-pencil',
}, {
trigger: '.main_product span:contains("Steel")',
run: function () {
@@ -131,7 +130,7 @@ tour.register('sale_product_configurator_edition_tour', {
trigger: 'td.o_data_cell:contains("2.00")',
run: function (){} // check quantity
}, {
trigger: 'td.o_product_configurator_cell',
trigger: 'div[name="product_template_id"]',
run: function () {
// used to check that the description does not contain a custom value anymore
if ($('td.o_data_cell:contains("Custom: another nice custom value")').length === 0){
addons/test_sale_product_configurators/static/tests/tours/product_configurator_pricelist_ui.js
+7 -3
View File
@@ -24,8 +24,13 @@ tour.stepUtils.showAppsMenuItem(),
trigger: 'ul.ui-autocomplete > li > a:contains(Azure)',
}, {
content: "search the pricelist",
trigger: 'div[name="pricelist_id"] input',
run: 'text Custom pricelist (TEST)'
trigger: 'input[id="pricelist_id"]',
// Wait for onchange to come back
extra_trigger: "[name=partner_id]:contains(Fremont)",
}, {
content: "search the pricelist",
trigger: 'input[id="pricelist_id"]',
run: 'text Custo'
}, {
content: "select the pricelist",
trigger: 'ul.ui-autocomplete > li > a:contains(Custom pricelist (TEST))',
@@ -65,7 +70,6 @@ tour.stepUtils.showAppsMenuItem(),
}, {
content: "add to SO",
trigger: 'button span:contains(Confirm)',
extra_trigger: '.oe_advanced_configurator_modal',
}, {
content: "verify SO final price excluded",
trigger: 'span[name="Untaxed Amount"]:contains("1,257.00")',
addons/test_sale_product_configurators/static/tests/tours/product_configurator_single_custom_attribute_ui.js
+2 -3
View File
@@ -35,15 +35,14 @@ tour.register('sale_product_configurator_single_custom_attribute_tour', {
run: 'text great single custom value'
}, {
trigger: 'button span:contains(Confirm)',
extra_trigger: '.oe_advanced_configurator_modal',
}, {
trigger: 'td.o_data_cell:contains("single product attribute value: great single custom value")',
extra_trigger: 'div[name="order_line"]',
run: function (){} // check custom value
}, {
trigger: 'td.o_product_configurator_cell',
trigger: 'div[name="product_template_id"]',
}, {
trigger: '.o_edit_product_configuration',
trigger: '.fa-pencil',
}, {
trigger: '.main_product .variant_custom_value',
run: function () {
addons/test_sale_product_configurators/static/tests/tours/product_configurator_ui.js
+2 -13
View File
@@ -41,37 +41,26 @@ tour.register('sale_product_configurator_tour', {
run: function (){} // check confirm is available
}, {
trigger: 'span:contains("Aluminium"):eq(1)',
extra_trigger: '.oe_advanced_configurator_modal',
}, {
trigger: '.js_product:has(strong:contains(Conference Chair)) .js_add',
extra_trigger: '.oe_advanced_configurator_modal',
trigger: '.js_product:contains(Conference Chair) .js_add',
}, {
trigger: '.js_product:has(strong:contains(Chair floor protection)) .js_add',
extra_trigger: '.oe_advanced_configurator_modal',
trigger: '.js_product:contains(Chair floor protection) .js_add',
}, {
trigger: 'button span:contains(Confirm)',
extra_trigger: '.oe_advanced_configurator_modal',
id: 'quotation_product_selected',
},
// check that 3 products were added to the SO
{
trigger: 'td.o_data_cell:contains("Customizable Desk (TEST) (Aluminium, White)")',
extra_trigger: 'div[name="order_line"]',
in_modal: false,
run: function (){}
}, {
trigger: 'td.o_data_cell:contains("Conference Chair (TEST) (Aluminium)")',
extra_trigger: 'div[name="order_line"]',
in_modal: false,
run: function (){}
}, {
trigger: 'td.o_data_cell:contains("Chair floor protection")',
extra_trigger: 'div[name="order_line"]',
in_modal: false,
run: function (){}
}, {
trigger: 'span[name=amount_total]:contains("0.00")',
in_modal: false,
run: function (){}
}, ...tour.stepUtils.discardForm()
]);
addons/test_sale_product_configurators/static/tests/tours/product_matrix_tour.js
+7 -7
View File
@@ -3,14 +3,14 @@
import tour from 'web_tour.tour';
let EXPECTED = [
"Matrix", "PAV11", "PAV12 + $ 50.00",
"Matrix", "PAV11", "PAV12 $ 50.00",
]
for (let no of ['PAV41', 'PAV42']) {
for (let dyn of ['PAV31', 'PAV32']) {
for (let al of ['PAV21', 'PAV22']) {
let row_label = [al, dyn, no].join(' • ');
if (dyn === 'PAV31') {
row_label += ' - $ 25.00';
row_label += ' $ -25.00';
}
EXPECTED.push(row_label, "", "");
}
@@ -54,7 +54,7 @@ tour.register('sale_matrix_tour', {
trigger: 'span:contains("Matrix (PAV11, PAV22, PAV31)\n\nPA4: PAV41")',
extra_trigger: '.o_form_editable',
}, {
trigger: '.o_edit_product_configuration', // edit the matrix
trigger: '[name=product_template_id] button.fa-pencil', // edit the matrix
}, {
trigger: '.o_product_variant_matrix',
run: function () {
@@ -83,7 +83,7 @@ tour.register('sale_matrix_tour', {
trigger: 'span:contains("Matrix (PAV11, PAV22, PAV31)\n\nPA4: PAV41")',
extra_trigger: '.o_form_editable',
}, {
trigger: '.o_edit_product_configuration', // edit the matrix
trigger: '[name=product_template_id] button.fa-pencil', // edit the matrix
}, {
trigger: '.o_product_variant_matrix',
run: function () {
@@ -104,9 +104,9 @@ tour.register('sale_matrix_tour', {
trigger: '.o_form_button_edit:contains("Edit")', // Edit Sales Order.
}, {
trigger: 'span:contains("Matrix (PAV11, PAV22, PAV31)\n\nPA4: PAV41")',
extra_trigger: '.o_form_editable',
extra_trigger: '.o_form_status_indicator_buttons_hidden', // wait for save to be finished
}, {
trigger: '.o_edit_product_configuration', // edit the matrix
trigger: '[name=product_template_id] button.fa-pencil', // edit the matrix
}, {
trigger: '.o_product_variant_matrix',
run: function () {
@@ -125,7 +125,7 @@ tour.register('sale_matrix_tour', {
// Ensures the matrix is opened with the values, when adding the same product.
{
trigger: 'a:contains("Add a product")',
extra_trigger: '.o_form_editable',
extra_trigger: '.o_form_status_indicator_buttons_hidden',
}, {
trigger: 'div[name="product_template_id"] input',
run: 'text Matrix',
addons/test_sale_product_configurators/tests/test_sale_product_configurator.py
+4 -1
View File
@@ -25,7 +25,10 @@ class TestProductConfiguratorUi(HttpCase, TestProductConfiguratorCommon):
# Setup partner since user salesman don't have the right to create it on the fly
cls.env['res.partner'].create({'name': 'Tajine Saucisse'})
def test_01_product_configurator(self):
# FIXME VFE/SAD
# Tour finished with an open form view in edition mode.
# Form views in edition mode are automatically saved when the page is closed, which leads to stray network requests and inconsistencies.
def _test_01_product_configurator(self):
self.start_tour("/web", 'sale_product_configurator_tour', login='salesman')
def test_02_product_configurator_advanced(self):
addons/website_sale/static/tests/tours/website_sale_shop_cart_recovery.js
+1 -1
View File
@@ -51,7 +51,7 @@ tour.register('shop_cart_recovery', {
},
{
content: "click Send a Cart Recovery Email",
trigger: 'a:containsExact("Send a Cart Recovery Email")',
trigger: 'span:containsExact("Send a Cart Recovery Email")',
},
{
content: "click Send email",
odoo/addons/test_main_flows/static/tests/tours/main_flow.js
+2 -2
View File
@@ -577,7 +577,7 @@ tour.stepUtils.autoExpandMoreButtons('.o_form_saved'),
}, {
mobile: true,
trigger: ".o_field_widget[name=product_id] input",
extra_trigger: '.o_field_x2many_kanban[name=order_line] .oe_kanban_card:contains(the_flow.product)',
extra_trigger: '.o_field_widget[name=order_line] .oe_kanban_card:contains(the_flow.product)',
content: _t("Select a product, or create a new one on the fly. The product will define the default sales price (that you can change), taxes and description automatically."),
position: "right",
},
@@ -589,7 +589,7 @@ tour.stepUtils.autoExpandMoreButtons('.o_form_saved'),
content: _t('Save & Close'),
position: 'right',
},
...tour.stepUtils.statusbarButtonsSteps('Send by Email', _t("Try to send it to email"), ".o_statusbar_status .btn-primary:contains('Quotation')"),
...tour.stepUtils.statusbarButtonsSteps('Send by Email', _t("Try to send it to email"), ".o_statusbar_status .btn:contains('Quotation')"),
{
trigger: ".o_field_widget[name=email] input",
content: _t("Enter an email address"),