From d2d7a280a748e7a9f1c160a9bb11d3bd2f82cc57 Mon Sep 17 00:00:00 2001 From: Pierre Paridans Date: Tue, 11 Oct 2022 12:19:36 +0000 Subject: [PATCH] [MOV] web: matching folder structure in web/tests/mobile as web/tests X-original-commit: 6d12386ce2a82a4851d021194fa9326ff0f4b334 Part-of: odoo/odoo#103102 --- .../tests/mobile/{ => core}/action_swiper_tests.js | 0 .../mobile/{ => search}/control_panel_tests.js | 0 .../tests/mobile/{ => search}/search_panel_tests.js | 0 .../fields/statusbar_field_tests.js} | 4 ++-- .../form_view_tests.js} | 4 ++-- .../list_view_tests.js} | 8 ++++---- .../mobile/{ => webclient}/burger_menu_tests.js | 13 +++---------- .../settings_form_view_tests.js} | 0 8 files changed, 11 insertions(+), 18 deletions(-) rename addons/web/static/tests/mobile/{ => core}/action_swiper_tests.js (100%) rename addons/web/static/tests/mobile/{ => search}/control_panel_tests.js (100%) rename addons/web/static/tests/mobile/{ => search}/search_panel_tests.js (100%) rename addons/web/static/tests/mobile/{mobile_statusbar_field_tests.js => views/fields/statusbar_field_tests.js} (97%) rename addons/web/static/tests/mobile/{mobile_form_view_tests.js => views/form_view_tests.js} (99%) rename addons/web/static/tests/mobile/{mobile_list_view_tests.js => views/list_view_tests.js} (96%) rename addons/web/static/tests/mobile/{ => webclient}/burger_menu_tests.js (93%) rename addons/web/static/tests/mobile/{settings_form_view_mobile_tests.js => webclient/settings_form_view_tests.js} (100%) diff --git a/addons/web/static/tests/mobile/action_swiper_tests.js b/addons/web/static/tests/mobile/core/action_swiper_tests.js similarity index 100% rename from addons/web/static/tests/mobile/action_swiper_tests.js rename to addons/web/static/tests/mobile/core/action_swiper_tests.js diff --git a/addons/web/static/tests/mobile/control_panel_tests.js b/addons/web/static/tests/mobile/search/control_panel_tests.js similarity index 100% rename from addons/web/static/tests/mobile/control_panel_tests.js rename to addons/web/static/tests/mobile/search/control_panel_tests.js diff --git a/addons/web/static/tests/mobile/search_panel_tests.js b/addons/web/static/tests/mobile/search/search_panel_tests.js similarity index 100% rename from addons/web/static/tests/mobile/search_panel_tests.js rename to addons/web/static/tests/mobile/search/search_panel_tests.js diff --git a/addons/web/static/tests/mobile/mobile_statusbar_field_tests.js b/addons/web/static/tests/mobile/views/fields/statusbar_field_tests.js similarity index 97% rename from addons/web/static/tests/mobile/mobile_statusbar_field_tests.js rename to addons/web/static/tests/mobile/views/fields/statusbar_field_tests.js index 91f50eaa4c6..39c16ae173d 100644 --- a/addons/web/static/tests/mobile/mobile_statusbar_field_tests.js +++ b/addons/web/static/tests/mobile/views/fields/statusbar_field_tests.js @@ -1,7 +1,7 @@ /** @odoo-module **/ -import { click, getFixture } from "../helpers/utils"; -import { makeView, setupViewRegistries } from "../views/helpers"; +import { click, getFixture } from "@web/../tests/helpers/utils"; +import { makeView, setupViewRegistries } from "@web/../tests/views/helpers"; let fixture; let serverData; diff --git a/addons/web/static/tests/mobile/mobile_form_view_tests.js b/addons/web/static/tests/mobile/views/form_view_tests.js similarity index 99% rename from addons/web/static/tests/mobile/mobile_form_view_tests.js rename to addons/web/static/tests/mobile/views/form_view_tests.js index bb29f0f4452..452f22e0a3a 100644 --- a/addons/web/static/tests/mobile/mobile_form_view_tests.js +++ b/addons/web/static/tests/mobile/views/form_view_tests.js @@ -9,8 +9,8 @@ import { makeDeferred, nextTick, patchWithCleanup, -} from "../helpers/utils"; -import { makeView, setupViewRegistries } from "../views/helpers"; +} from "@web/../tests/helpers/utils"; +import { makeView, setupViewRegistries } from "@web/../tests/views/helpers"; let fixture; let serverData; diff --git a/addons/web/static/tests/mobile/mobile_list_view_tests.js b/addons/web/static/tests/mobile/views/list_view_tests.js similarity index 96% rename from addons/web/static/tests/mobile/mobile_list_view_tests.js rename to addons/web/static/tests/mobile/views/list_view_tests.js index cf99b872d5a..5330c9f4ce4 100644 --- a/addons/web/static/tests/mobile/mobile_list_view_tests.js +++ b/addons/web/static/tests/mobile/views/list_view_tests.js @@ -2,10 +2,10 @@ import { browser } from "@web/core/browser/browser"; import { registry } from "@web/core/registry"; -import { makeFakeUserService } from "../helpers/mock_services"; -import { click, getFixture, patchWithCleanup, triggerEvents } from "../helpers/utils"; -import { getMenuItemTexts, toggleActionMenu } from "../search/helpers"; -import { makeView, setupViewRegistries } from "../views/helpers"; +import { makeFakeUserService } from "@web/../tests/helpers/mock_services"; +import { click, getFixture, patchWithCleanup, triggerEvents } from "@web/../tests/helpers/utils"; +import { getMenuItemTexts, toggleActionMenu } from "@web/../tests/search/helpers"; +import { makeView, setupViewRegistries } from "@web/../tests/views/helpers"; let serverData; let fixture; diff --git a/addons/web/static/tests/mobile/burger_menu_tests.js b/addons/web/static/tests/mobile/webclient/burger_menu_tests.js similarity index 93% rename from addons/web/static/tests/mobile/burger_menu_tests.js rename to addons/web/static/tests/mobile/webclient/burger_menu_tests.js index 8873054522a..474f3419e4e 100644 --- a/addons/web/static/tests/mobile/burger_menu_tests.js +++ b/addons/web/static/tests/mobile/webclient/burger_menu_tests.js @@ -67,14 +67,9 @@ QUnit.test("Burger Menu on an App", async (assert) => { await click(document.body, ".o_mobile_menu_toggle"); assert.containsOnce(document.body, ".o_burger_menu"); - assert.containsOnce( - document.body, - ".o_burger_menu nav.o_burger_menu_content li" - ); + assert.containsOnce(document.body, ".o_burger_menu nav.o_burger_menu_content li"); assert.strictEqual( - document.body.querySelector( - ".o_burger_menu nav.o_burger_menu_content li" - ).textContent, + document.body.querySelector(".o_burger_menu nav.o_burger_menu_content li").textContent, "SubMenu" ); assert.hasClass(document.body.querySelector(".o_burger_menu_content"), "o_burger_menu_dark"); @@ -145,9 +140,7 @@ QUnit.test("Burger menu closes when click on menu item", async (assert) => { await click(document.body, ".o_mobile_menu_toggle"); assert.containsOnce(document.body, ".o_burger_menu"); assert.strictEqual( - document.body.querySelector( - ".o_burger_menu nav.o_burger_menu_content li" - ).textContent, + document.body.querySelector(".o_burger_menu nav.o_burger_menu_content li").textContent, "SubMenu" ); await click(document.body, ".o_burger_menu nav.o_burger_menu_content li"); diff --git a/addons/web/static/tests/mobile/settings_form_view_mobile_tests.js b/addons/web/static/tests/mobile/webclient/settings_form_view_tests.js similarity index 100% rename from addons/web/static/tests/mobile/settings_form_view_mobile_tests.js rename to addons/web/static/tests/mobile/webclient/settings_form_view_tests.js