From 67f36e8b2f58c87c854aa75058b766f657ddcdf8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Mon, 25 Jul 2022 05:56:54 +0000
Subject: [PATCH] [FIX] *: properly finish a bunch of form editions

Cancel or properly wait for save to finish, depending on tour.

Part-of: odoo/odoo#96517
---
 .../static/tests/tours/event_configurator_ui.js    |  3 ++-
 .../im_livechat_chatbot_steps_sequence_tour.js     | 14 +++++++++-----
 .../js/tours/mass_mailing_snippets_menu_tabs.js    |  1 +
 .../tests/tours/purchase_product_matrix_tour.js    |  6 +-----
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/event_sale/static/tests/tours/event_configurator_ui.js b/addons/event_sale/static/tests/tours/event_configurator_ui.js
index 26ea664e804..5bf4fc4ffaf 100644
--- a/addons/event_sale/static/tests/tours/event_configurator_ui.js
+++ b/addons/event_sale/static/tests/tours/event_configurator_ui.js
@@ -80,6 +80,7 @@ tour.register('event_configurator_tour', {
 }, {
     trigger: 'textarea[name="name"].tour_success_2',
     run: function () {} // check
-}]);
+}, ...tour.stepUtils.discardForm()
+]);
 
 });
diff --git a/addons/im_livechat/static/tests/tours/im_livechat_chatbot_steps_sequence_tour.js b/addons/im_livechat/static/tests/tours/im_livechat_chatbot_steps_sequence_tour.js
index 01afde50762..8806e9854fe 100644
--- a/addons/im_livechat/static/tests/tours/im_livechat_chatbot_steps_sequence_tour.js
+++ b/addons/im_livechat/static/tests/tours/im_livechat_chatbot_steps_sequence_tour.js
@@ -45,12 +45,14 @@ const commonSteps = [tour.stepUtils.showAppsMenuItem(), {
  tour.register('im_livechat_chatbot_steps_sequence_tour', {
     test: true,
     url: '/web',
-}, [].concat(commonSteps, [{
+}, [
+    ...commonSteps, {
     trigger: 'button:contains("Save & Close")'
 }, {
     trigger: 'body.o_web_client:not(.modal-open)',
-    run: () => {}
-}]));
+    run() {},
+}, ...tour.stepUtils.discardForm()
+]);
 
 /**
  * Same as above, with an extra drag&drop at the end.
@@ -58,7 +60,8 @@ const commonSteps = [tour.stepUtils.showAppsMenuItem(), {
 tour.register('im_livechat_chatbot_steps_sequence_with_move_tour', {
     test: true,
     url: '/web',
-}, [].concat(commonSteps, [{
+}, [
+    ...commonSteps, {
     trigger: 'button:contains("Save & New")'
 }, {
     trigger: 'tr:contains("Step 3")',
@@ -135,4 +138,5 @@ tour.register('im_livechat_chatbot_steps_sequence_with_move_tour', {
     trigger: 'tr:contains("Step 6")',
     in_modal: false,
     run: () => {}
-}]));
+}, ...tour.stepUtils.discardForm(),
+]);
diff --git a/addons/mass_mailing/static/src/js/tours/mass_mailing_snippets_menu_tabs.js b/addons/mass_mailing/static/src/js/tours/mass_mailing_snippets_menu_tabs.js
index 4b5201181eb..daa951f235c 100644
--- a/addons/mass_mailing/static/src/js/tours/mass_mailing_snippets_menu_tabs.js
+++ b/addons/mass_mailing/static/src/js/tours/mass_mailing_snippets_menu_tabs.js
@@ -48,4 +48,5 @@ tour.register('mass_mailing_snippets_menu_tabs', {
         trigger: 'iframe .o_we_customize_panel .snippet-option-DesignTab',
         run: () => null, // it's a check
     },
+    ...tour.stepUtils.discardForm(),
 ]);
diff --git a/addons/purchase_product_matrix/static/tests/tours/purchase_product_matrix_tour.js b/addons/purchase_product_matrix/static/tests/tours/purchase_product_matrix_tour.js
index 45dc92b1b54..9366face458 100644
--- a/addons/purchase_product_matrix/static/tests/tours/purchase_product_matrix_tour.js
+++ b/addons/purchase_product_matrix/static/tests/tours/purchase_product_matrix_tour.js
@@ -101,11 +101,7 @@ tour.register('purchase_matrix_tour', {
 }, {
     trigger: 'span:contains("Confirm")',
     run: 'click' // apply the matrix
-}, {
-    trigger: '.o_form_button_save:contains("Save")',
-    extra_trigger: '.o_field_cell.o_data_cell.o_list_number:contains("8.20")',
-    run: 'click' // SAVE Sales Order, after matrix has been applied (extra_trigger).
-},
+}, ...tour.stepUtils.saveForm('.o_field_cell.o_data_cell.o_list_number:contains("8.20")')
 ]);