From b1f392ce580d320fb1dc2e90cf4cecf82e64a90f Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Tue, 5 Dec 2023 14:19:03 +0100 Subject: [PATCH] [FIX] payment: Make tests demo data independent Part-of: odoo/odoo#146649 --- addons/payment_asiapay/tests/common.py | 7 ++++--- addons/payment_asiapay/tests/test_payment_provider.py | 2 +- addons/payment_ogone/tests/common.py | 8 ++++---- addons/payment_payulatam/tests/common.py | 7 ++++--- addons/payment_payulatam/tests/test_payulatam.py | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/addons/payment_asiapay/tests/common.py b/addons/payment_asiapay/tests/common.py index 75e6582cc2f..e7790079c4b 100644 --- a/addons/payment_asiapay/tests/common.py +++ b/addons/payment_asiapay/tests/common.py @@ -3,13 +3,14 @@ from odoo import Command from odoo.addons.payment.tests.common import PaymentCommon +from odoo.addons.account.tests.common import AccountTestInvoicingCommon -class AsiaPayCommon(PaymentCommon): +class AsiaPayCommon(AccountTestInvoicingCommon, PaymentCommon): @classmethod - def setUpClass(cls): - super().setUpClass() + def setUpClass(cls, chart_template_ref=None): + super().setUpClass(chart_template_ref=chart_template_ref) cls.asiapay = cls._prepare_provider('asiapay', update_values={ 'asiapay_merchant_id': '123456789', diff --git a/addons/payment_asiapay/tests/test_payment_provider.py b/addons/payment_asiapay/tests/test_payment_provider.py index 590c0d673a6..26d2f7b4245 100644 --- a/addons/payment_asiapay/tests/test_payment_provider.py +++ b/addons/payment_asiapay/tests/test_payment_provider.py @@ -13,7 +13,7 @@ class TestPaymentProvider(AsiaPayCommon): """ Test that AsiaPay providers are filtered out from compatible providers when the currency is not supported. """ compatible_providers = self.env['payment.provider']._get_compatible_providers( - self.company_id, self.partner.id, self.amount, currency_id=self.env.ref('base.AFN').id + self.env.company.id, self.partner.id, self.amount, currency_id=self.env.ref('base.AFN').id ) self.assertNotIn(self.asiapay, compatible_providers) diff --git a/addons/payment_ogone/tests/common.py b/addons/payment_ogone/tests/common.py index 843a19e82e8..5f9a79145fa 100644 --- a/addons/payment_ogone/tests/common.py +++ b/addons/payment_ogone/tests/common.py @@ -1,13 +1,13 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from odoo.addons.payment.tests.common import PaymentCommon +from odoo.addons.account.tests.common import AccountTestInvoicingCommon - -class OgoneCommon(PaymentCommon): +class OgoneCommon(AccountTestInvoicingCommon, PaymentCommon): @classmethod - def setUpClass(cls): - super().setUpClass() + def setUpClass(cls, chart_template_ref=None): + super().setUpClass(chart_template_ref=chart_template_ref) cls.ogone = cls._prepare_provider('ogone', update_values={ 'ogone_pspid': 'dummy', diff --git a/addons/payment_payulatam/tests/common.py b/addons/payment_payulatam/tests/common.py index 3f113a3c8be..f9b75247254 100644 --- a/addons/payment_payulatam/tests/common.py +++ b/addons/payment_payulatam/tests/common.py @@ -1,13 +1,14 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from odoo.addons.payment.tests.common import PaymentCommon +from odoo.addons.account.tests.common import AccountTestInvoicingCommon -class PayULatamCommon(PaymentCommon): +class PayULatamCommon(AccountTestInvoicingCommon, PaymentCommon): @classmethod - def setUpClass(cls): - super().setUpClass() + def setUpClass(cls, chart_template_ref=None): + super().setUpClass(chart_template_ref=chart_template_ref) cls.payulatam = cls._prepare_provider('payulatam', update_values={ 'payulatam_account_id': 'dummy', diff --git a/addons/payment_payulatam/tests/test_payulatam.py b/addons/payment_payulatam/tests/test_payulatam.py index c81a9afc877..923d4e2361f 100644 --- a/addons/payment_payulatam/tests/test_payulatam.py +++ b/addons/payment_payulatam/tests/test_payulatam.py @@ -21,7 +21,7 @@ class PayULatamTest(PayULatamCommon, PaymentHttpCommon): def test_incompatibility_with_unsupported_currency(self): """ Test that the PayULatam provider is not compatible with an unsupported currency. """ compatible_providers = self.env['payment.provider']._get_compatible_providers( - self.company.id, self.partner.id, self.amount, currency_id=self.currency_euro.id + self.env.company.id, self.partner.id, self.amount, currency_id=self.currency_euro.id ) self.assertNotIn(self.payulatam, compatible_providers)