From 271dfe9ba3ba06f4ea58be54471d3affc269d53a Mon Sep 17 00:00:00 2001 From: Mathieu Duckerts-Antoine Date: Mon, 25 May 2020 18:14:03 +0000 Subject: [PATCH] [IMP] web: adapt test_utils_control_panel The control panel test helpers related to the "time range" menu have been removed and a new helper for the "comparison" menu has been added. Task ID: 2245719 Co-authored-by: Mathieu Duckerts-Antoine Co-authored-by: Julien Mougenot --- addons/web/static/tests/helpers/test_utils.js | 9 +-- .../tests/helpers/test_utils_control_panel.js | 65 ++----------------- 2 files changed, 6 insertions(+), 68 deletions(-) diff --git a/addons/web/static/tests/helpers/test_utils.js b/addons/web/static/tests/helpers/test_utils.js index f462df514a1..8789ea53adc 100644 --- a/addons/web/static/tests/helpers/test_utils.js +++ b/addons/web/static/tests/helpers/test_utils.js @@ -154,13 +154,8 @@ odoo.define('web.test_utils', async function (require) { editFavoriteName: testUtilsControlPanel.editFavoriteName, saveFavorite: testUtilsControlPanel.saveFavorite, deleteFavorite: testUtilsControlPanel.deleteFavorite, - // TimeRangeMenu interactions - toggleTimeRangeMenu: testUtilsControlPanel.toggleTimeRangeMenu, - selectField: testUtilsControlPanel.selectField, - selectRange: testUtilsControlPanel.selectRange, - selectComparisonRange: testUtilsControlPanel.selectComparisonRange, - toggleTimeRangeMenuBox: testUtilsControlPanel.toggleTimeRangeMenuBox, - applyTimeRange: testUtilsControlPanel.applyTimeRange, + // ComparisonMenu interactions + toggleComparisonMenu: testUtilsControlPanel.toggleComparisonMenu, // SearchBar interactions getFacetTexts: testUtilsControlPanel.getFacetTexts, removeFacet: testUtilsControlPanel.removeFacet, diff --git a/addons/web/static/tests/helpers/test_utils_control_panel.js b/addons/web/static/tests/helpers/test_utils_control_panel.js index 36a0a6b9bbf..1f5bff32fd6 100644 --- a/addons/web/static/tests/helpers/test_utils_control_panel.js +++ b/addons/web/static/tests/helpers/test_utils_control_panel.js @@ -225,60 +225,8 @@ odoo.define('web.test_utils_control_panel', function (require) { * @param {EventTarget} el * @returns {Promise} */ - async function toggleTimeRangeMenu(el) { - await click(getNode(el).querySelector(`div.o_time_range_menu > button`)); - } - - /** - * @param {EventTarget} el - * @param {string} fieldName - * @returns {Promise} - */ - async function selectField(el, fieldName) { - await editSelect( - findItem(getNode(el), `div.o_time_range_section select`, 0), - fieldName - ); - } - - /** - * @param {EventTarget} el - * @param {string} range - * @returns {Promise} - */ - async function selectRange(el, range) { - await editSelect( - findItem(getNode(el), `div.o_time_range_section select`, 1), - range - ); - } - - /** - * @param {EventTarget} el - * @param {string} comparisonRange - * @returns {Promise} - */ - async function selectComparisonRange(el, comparisonRange) { - await editSelect( - findItem(getNode(el), `div.o_time_range_section select`, 2), - comparisonRange - ); - } - - /** - * @param {EventTarget} el - * @returns {Promise} - */ - async function toggleTimeRangeMenuBox(el) { - await click(getNode(el).querySelector(`div.o_time_range_section input`)); - } - - /** - * @param {EventTarget} el - * @returns {Promise} - */ - async function applyTimeRange(el) { - await click(getNode(el).querySelector(`div.o_time_range_menu ul button`)); + async function toggleComparisonMenu(el) { + await click(getNode(el).querySelector(`div.o_comparison_menu > button`)); } /** @@ -420,13 +368,8 @@ odoo.define('web.test_utils_control_panel', function (require) { editFavoriteName, saveFavorite, deleteFavorite, - // TimeRangeMenu interactions - toggleTimeRangeMenu, - selectField, - selectRange, - selectComparisonRange, - toggleTimeRangeMenuBox, - applyTimeRange, + // ComparisonMenu interactions + toggleComparisonMenu, // SearchBar interactions getFacetTexts, removeFacet,