diff --git a/pos_partner_deselection/__manifest__.py b/pos_partner_deselection/__manifest__.py index ac638d3..f98c68f 100644 --- a/pos_partner_deselection/__manifest__.py +++ b/pos_partner_deselection/__manifest__.py @@ -16,7 +16,7 @@ "pos_partner_deselection/static/src/js/partner_deselection.js", ], "web.assets_tests": [ - "pos_partner_deselection/static/src/js/test_pos_deselection.js", + "pos_partner_deselection/static/src/js/test_pos_deselection.esm.js", ], }, "demo": [], diff --git a/pos_partner_deselection/static/src/js/test_pos_deselection.esm.js b/pos_partner_deselection/static/src/js/test_pos_deselection.esm.js new file mode 100644 index 0000000..215690c --- /dev/null +++ b/pos_partner_deselection/static/src/js/test_pos_deselection.esm.js @@ -0,0 +1,37 @@ +/** @odoo-module */ + +import {registry} from "@web/core/registry"; +import {_t} from "@web/core/l10n/translation"; + +function setCustomer(name) { + return [ + { + extra_trigger: "body .pos:not(:has(.loader))", + trigger: ".button.set-partner", + content: _t("Open the customer screen"), + }, + { + extra_trigger: "body .pos:not(:has(.loader))", + trigger: `td:contains("${name}")`, + content: _t("Click the customer"), + }, + ]; +} + +function setCustomerAndCheckDeselection(name) { + return setCustomer(name).concat([ + { + extra_trigger: '.button.set-partner:contains("Customer")', + trigger: '.button.set-partner:contains("Customer")', + content: _t("Check that the customer is deselected"), + }, + ]); +} + +const steps = [...setCustomerAndCheckDeselection("Lumber Inc")]; + +registry.category("web_tour.tours").add("pos_partner_deselection_tour", { + test: true, + url: "/pos/ui", + steps: () => steps, +}); diff --git a/pos_partner_deselection/static/src/js/test_pos_deselection.js b/pos_partner_deselection/static/src/js/test_pos_deselection.js deleted file mode 100644 index a967c63..0000000 --- a/pos_partner_deselection/static/src/js/test_pos_deselection.js +++ /dev/null @@ -1,40 +0,0 @@ -odoo.define("pos_partner_deselection.tour", function (require) { - "use strict"; - - var {registry} = require("@web/core/registry"); - var {_t} = require("@web/core/l10n/translation"); - - function set_customer(name) { - return [ - { - extra_trigger: "body .pos:not(:has(.loader))", - trigger: ".button.set-partner", - content: "Open the customer screen", - }, - { - extra_trigger: "body .pos:not(:has(.loader))", - trigger: `td:contains("${name}")`, - content: _t("Click the customer"), - }, - ]; - } - - function set_customer_and_check_deselection(name) { - return set_customer(name).concat([ - { - extra_trigger: '.button.set-partner:contains("Customer")', - trigger: '.button.set-partner:contains("Customer")', - content: _t("Check that customer is deselected"), - }, - ]); - } - - var steps = []; - steps = steps.concat(set_customer_and_check_deselection("Lumber Inc")); - - registry.category("web_tour.tours").add("pos_partner_deselection_tour", { - test: true, - url: "/pos/ui", - steps: () => steps, - }); -}); diff --git a/pos_partner_deselection/tests/test_partner_deselection.py b/pos_partner_deselection/tests/test_partner_deselection.py index 9a75a9c..bcab72d 100644 --- a/pos_partner_deselection/tests/test_partner_deselection.py +++ b/pos_partner_deselection/tests/test_partner_deselection.py @@ -8,12 +8,12 @@ class TestUi(TestPointOfSaleHttpCommon): def test_01_partner_deselection(self): self.main_pos_config.write({"customer_deselection_interval": 1}) - self.main_pos_config.open_ui() + self.main_pos_config.with_user(self.pos_user).open_ui() self.start_tour( "/pos/ui?config_id=%d" % self.main_pos_config.id, "pos_partner_deselection_tour", 500, - login="admin", - timeout=200, + login="pos_user", + timeout=100, )