From 2bf4ea647e75b6e77724d006dab7561bb8debbfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 26 Aug 2016 09:59:28 +0200 Subject: [PATCH] Use install_modules tools in scenario issue5794 --- tests/scenario_project_invoice_effort.rst | 21 ++++---------------- tests/scenario_project_invoice_progress.rst | 21 ++++---------------- tests/scenario_project_invoice_timesheet.rst | 21 ++++---------------- tests/test_project_invoice.py | 8 ++++---- 4 files changed, 16 insertions(+), 55 deletions(-) diff --git a/tests/scenario_project_invoice_effort.rst b/tests/scenario_project_invoice_effort.rst index 9ad3fc1d64..58f2bf21df 100644 --- a/tests/scenario_project_invoice_effort.rst +++ b/tests/scenario_project_invoice_effort.rst @@ -7,7 +7,8 @@ Imports:: >>> import datetime >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal - >>> from proteus import config, Model, Wizard + >>> from proteus import Model, Wizard + >>> from trytond.tests.tools import install_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_chart, \ @@ -16,33 +17,19 @@ Imports:: ... create_payment_term >>> today = datetime.date.today() -Create database:: - - >>> config = config.set_trytond() - >>> config.pool.test = True - Install project_invoice:: - >>> Module = Model.get('ir.module') - >>> module, = Module.find([ - ... ('name', '=', 'project_invoice'), - ... ]) - >>> module.click('install') - >>> Wizard('ir.module.install_upgrade').execute('upgrade') + >>> config = install_modules('project_invoice') Create company:: >>> _ = create_company() >>> company = get_company() -Reload the context:: +Create project user:: >>> User = Model.get('res.user') >>> Group = Model.get('res.group') - >>> config._context = User.get_preferences(True, config.context) - -Create project user:: - >>> project_user = User() >>> project_user.name = 'Project' >>> project_user.login = 'project' diff --git a/tests/scenario_project_invoice_progress.rst b/tests/scenario_project_invoice_progress.rst index 1aa003d9f5..b63527f5d2 100644 --- a/tests/scenario_project_invoice_progress.rst +++ b/tests/scenario_project_invoice_progress.rst @@ -7,7 +7,8 @@ Imports:: >>> import datetime >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal - >>> from proteus import config, Model, Wizard + >>> from proteus import Model, Wizard + >>> from trytond.tests.tools import install_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_chart, \ @@ -16,33 +17,19 @@ Imports:: ... create_payment_term >>> today = datetime.date.today() -Create database:: - - >>> config = config.set_trytond() - >>> config.pool.test = True - Install project_invoice:: - >>> Module = Model.get('ir.module') - >>> module, = Module.find([ - ... ('name', '=', 'project_invoice'), - ... ]) - >>> module.click('install') - >>> Wizard('ir.module.install_upgrade').execute('upgrade') + >>> config = install_modules('project_invoice') Create company:: >>> _ = create_company() >>> company = get_company() -Reload the context:: +Create project user:: >>> User = Model.get('res.user') >>> Group = Model.get('res.group') - >>> config._context = User.get_preferences(True, config.context) - -Create project user:: - >>> project_user = User() >>> project_user.name = 'Project' >>> project_user.login = 'project' diff --git a/tests/scenario_project_invoice_timesheet.rst b/tests/scenario_project_invoice_timesheet.rst index 2c82af60cd..ce93a27db6 100644 --- a/tests/scenario_project_invoice_timesheet.rst +++ b/tests/scenario_project_invoice_timesheet.rst @@ -7,7 +7,8 @@ Imports:: >>> import datetime >>> from dateutil.relativedelta import relativedelta >>> from decimal import Decimal - >>> from proteus import config, Model, Wizard + >>> from proteus import Model, Wizard + >>> from trytond.tests.tools import install_modules >>> from trytond.modules.company.tests.tools import create_company, \ ... get_company >>> from trytond.modules.account.tests.tools import create_chart, \ @@ -16,33 +17,19 @@ Imports:: ... create_payment_term >>> today = datetime.date.today() -Create database:: - - >>> config = config.set_trytond() - >>> config.pool.test = True - Install project_invoice:: - >>> Module = Model.get('ir.module') - >>> module, = Module.find([ - ... ('name', '=', 'project_invoice'), - ... ]) - >>> module.click('install') - >>> Wizard('ir.module.install_upgrade').execute('upgrade') + >>> config = install_modules('project_invoice') Create company:: >>> _ = create_company() >>> company = get_company() -Reload the context:: +Create project user:: >>> User = Model.get('res.user') >>> Group = Model.get('res.group') - >>> config._context = User.get_preferences(True, config.context) - -Create project user:: - >>> project_user = User() >>> project_user.name = 'Project' >>> project_user.login = 'project' diff --git a/tests/test_project_invoice.py b/tests/test_project_invoice.py index 66a03a19e8..bb3b3497ce 100644 --- a/tests/test_project_invoice.py +++ b/tests/test_project_invoice.py @@ -4,7 +4,7 @@ import unittest import doctest import trytond.tests.test_tryton from trytond.tests.test_tryton import ModuleTestCase -from trytond.tests.test_tryton import doctest_setup, doctest_teardown +from trytond.tests.test_tryton import doctest_teardown from trytond.tests.test_tryton import doctest_checker @@ -19,17 +19,17 @@ def suite(): ProjectInvoiceTestCase)) suite.addTests(doctest.DocFileSuite( 'scenario_project_invoice_timesheet.rst', - setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8', + tearDown=doctest_teardown, encoding='utf-8', checker=doctest_checker, optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) suite.addTests(doctest.DocFileSuite( 'scenario_project_invoice_effort.rst', - setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8', + tearDown=doctest_teardown, encoding='utf-8', checker=doctest_checker, optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) suite.addTests(doctest.DocFileSuite( 'scenario_project_invoice_progress.rst', - setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8', + tearDown=doctest_teardown, encoding='utf-8', checker=doctest_checker, optionflags=doctest.REPORT_ONLY_FIRST_FAILURE)) return suite