entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 35 Releases Activity

depreciation: rename DeprecationsScanAfterJob (#72093)
gitea/wcs/pipeline/head This commit looks good Details

This commit is contained in:
Lauréline Guérin 2024-03-04 17:23:41 +01:00 committed by Lauréline Guérin
parent b4c4181cde
commit 3477ee2f29
8 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tests/admin_pages/test_deprecations.py
View File

@ -7,7 +7,7 @@ import pytest
from quixote.http_request import Upload as QuixoteUpload from quixote.http_request import Upload as QuixoteUpload
from wcs import fields from wcs import fields
from wcs.backoffice.deprecations import DeprecatedElementsDetected, DeprecationsScanAfterJob from wcs.backoffice.deprecations import DeprecatedElementsDetected, DeprecationsScan
from wcs.blocks import BlockDef, BlockdefImportError from wcs.blocks import BlockDef, BlockdefImportError
from wcs.carddef import CardDef from wcs.carddef import CardDef
from wcs.data_sources import NamedDataSource, NamedDataSourceImportError from wcs.data_sources import NamedDataSource, NamedDataSourceImportError
@ -293,7 +293,7 @@ def test_deprecations_choice_label(pub):
accept = st0.add_action('choice', id='_choice') accept = st0.add_action('choice', id='_choice')
accept.label = '[test] action' accept.label = '[test] action'
job = DeprecationsScanAfterJob() job = DeprecationsScan()
job.execute() job.execute()
assert not job.report_lines assert not job.report_lines
@ -305,7 +305,7 @@ def test_deprecations_skip_invalid_ezt(pub):
display = st0.add_action('displaymsg') display = st0.add_action('displaymsg')
display.message = 'message with invalid [if-any] ezt' display.message = 'message with invalid [if-any] ezt'
job = DeprecationsScanAfterJob() job = DeprecationsScan()
job.execute() job.execute()
assert not job.report_lines assert not job.report_lines
@ -316,19 +316,19 @@ def test_deprecations_ignore_ezt_looking_tag(pub):
sendmail = st0.add_action('sendmail') sendmail = st0.add_action('sendmail')
sendmail.subject = '[REMINDER] your appointment' sendmail.subject = '[REMINDER] your appointment'
workflow.store() workflow.store()
job = DeprecationsScanAfterJob() job = DeprecationsScan()
job.execute() job.execute()
assert not job.report_lines assert not job.report_lines
sendmail.subject = '[reminder]' sendmail.subject = '[reminder]'
workflow.store() workflow.store()
job = DeprecationsScanAfterJob() job = DeprecationsScan()
job.execute() job.execute()
assert job.report_lines assert job.report_lines
sendmail.subject = '[if-any plop]test[end]' sendmail.subject = '[if-any plop]test[end]'
workflow.store() workflow.store()
job = DeprecationsScanAfterJob() job = DeprecationsScan()
job.execute() job.execute()
assert job.report_lines assert job.report_lines
@ -397,7 +397,7 @@ def test_deprecations_document_models(pub):
export_to2.by = ['_submitter'] export_to2.by = ['_submitter']
workflow.store() workflow.store()
job = DeprecationsScanAfterJob() job = DeprecationsScan()
job.execute() job.execute()
assert job.report_lines == [ assert job.report_lines == [
{ {
@ -446,7 +446,7 @@ def test_deprecations_inspect_pages(pub):
display.message = 'message with [ezt] info' display.message = 'message with [ezt] info'
workflow.store() workflow.store()
job = DeprecationsScanAfterJob() job = DeprecationsScan()
job.execute() job.execute()
create_superuser(pub) create_superuser(pub)
@ -485,7 +485,7 @@ def test_deprecations_inspect_pages(pub):
display.message = 'message with {{django}} info' display.message = 'message with {{django}} info'
workflow.store() workflow.store()
job = DeprecationsScanAfterJob() job = DeprecationsScan()
job.execute() job.execute()
resp = app.get(formdef.get_admin_url() + 'inspect') resp = app.get(formdef.get_admin_url() + 'inspect')
@ -506,7 +506,7 @@ def test_deprecations_inspect_pages_old_format(pub):
] ]
formdef.store() formdef.store()
job = DeprecationsScanAfterJob() job = DeprecationsScan()
job.execute() job.execute()
with open(os.path.join(pub.app_dir, 'deprecations.json')) as f: with open(os.path.join(pub.app_dir, 'deprecations.json')) as f:
@ -566,32 +566,32 @@ def test_deprecations_on_import(pub):
mail_template.body = 'plop [ezt] plop' mail_template.body = 'plop [ezt] plop'
mail_template.store() mail_template.store()
job = DeprecationsScanAfterJob() job = DeprecationsScan()
job.check_deprecated_elements_in_object(formdef) job.check_deprecated_elements_in_object(formdef)
formdef_xml = formdef.export_to_xml() formdef_xml = formdef.export_to_xml()
FormDef.import_from_xml_tree(formdef_xml) FormDef.import_from_xml_tree(formdef_xml)
job = DeprecationsScanAfterJob() job = DeprecationsScan()
job.check_deprecated_elements_in_object(blockdef) job.check_deprecated_elements_in_object(blockdef)
blockdef_xml = blockdef.export_to_xml() blockdef_xml = blockdef.export_to_xml()
BlockDef.import_from_xml_tree(blockdef_xml) BlockDef.import_from_xml_tree(blockdef_xml)
job = DeprecationsScanAfterJob() job = DeprecationsScan()
job.check_deprecated_elements_in_object(workflow) job.check_deprecated_elements_in_object(workflow)
workflow_xml = workflow.export_to_xml() workflow_xml = workflow.export_to_xml()
Workflow.import_from_xml_tree(workflow_xml) Workflow.import_from_xml_tree(workflow_xml)
job = DeprecationsScanAfterJob() job = DeprecationsScan()
job.check_deprecated_elements_in_object(data_source) job.check_deprecated_elements_in_object(data_source)
data_source_xml = data_source.export_to_xml() data_source_xml = data_source.export_to_xml()
NamedDataSource.import_from_xml_tree(data_source_xml) NamedDataSource.import_from_xml_tree(data_source_xml)
job = DeprecationsScanAfterJob() job = DeprecationsScan()
job.check_deprecated_elements_in_object(wscall) job.check_deprecated_elements_in_object(wscall)
wscall_xml = wscall.export_to_xml() wscall_xml = wscall.export_to_xml()
NamedWsCall.import_from_xml_tree(wscall_xml) NamedWsCall.import_from_xml_tree(wscall_xml)
job = DeprecationsScanAfterJob() job = DeprecationsScan()
job.check_deprecated_elements_in_object(mail_template) job.check_deprecated_elements_in_object(mail_template)
mail_template_xml = mail_template.export_to_xml() mail_template_xml = mail_template.export_to_xml()
MailTemplate.import_from_xml_tree(mail_template_xml) MailTemplate.import_from_xml_tree(mail_template_xml)
@ -602,7 +602,7 @@ def test_deprecations_on_import(pub):
with open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w') as fd: with open(os.path.join(pub.app_dir, 'site-options.cfg'), 'w') as fd:
pub.site_options.write(fd) pub.site_options.write(fd)
job = DeprecationsScanAfterJob() job = DeprecationsScan()
with pytest.raises(DeprecatedElementsDetected) as excinfo: with pytest.raises(DeprecatedElementsDetected) as excinfo:
job.check_deprecated_elements_in_object(formdef) job.check_deprecated_elements_in_object(formdef)
assert str(excinfo.value) == 'Python expression detected' assert str(excinfo.value) == 'Python expression detected'
@ -610,7 +610,7 @@ def test_deprecations_on_import(pub):
FormDef.import_from_xml_tree(formdef_xml) FormDef.import_from_xml_tree(formdef_xml)
assert str(excinfo.value) == 'Python expression detected' assert str(excinfo.value) == 'Python expression detected'
job = DeprecationsScanAfterJob() job = DeprecationsScan()
with pytest.raises(DeprecatedElementsDetected) as excinfo: with pytest.raises(DeprecatedElementsDetected) as excinfo:
job.check_deprecated_elements_in_object(blockdef) job.check_deprecated_elements_in_object(blockdef)
assert str(excinfo.value) == 'Python expression detected' assert str(excinfo.value) == 'Python expression detected'
@ -618,7 +618,7 @@ def test_deprecations_on_import(pub):
BlockDef.import_from_xml_tree(blockdef_xml) BlockDef.import_from_xml_tree(blockdef_xml)
assert str(excinfo.value) == 'Python expression detected' assert str(excinfo.value) == 'Python expression detected'
job = DeprecationsScanAfterJob() job = DeprecationsScan()
with pytest.raises(DeprecatedElementsDetected) as excinfo: with pytest.raises(DeprecatedElementsDetected) as excinfo:
job.check_deprecated_elements_in_object(workflow) job.check_deprecated_elements_in_object(workflow)
assert str(excinfo.value) == 'Python expression detected' assert str(excinfo.value) == 'Python expression detected'
@ -626,7 +626,7 @@ def test_deprecations_on_import(pub):
Workflow.import_from_xml_tree(workflow_xml) Workflow.import_from_xml_tree(workflow_xml)
assert str(excinfo.value) == 'Python expression detected' assert str(excinfo.value) == 'Python expression detected'
job = DeprecationsScanAfterJob() job = DeprecationsScan()
with pytest.raises(DeprecatedElementsDetected) as excinfo: with pytest.raises(DeprecatedElementsDetected) as excinfo:
job.check_deprecated_elements_in_object(data_source) job.check_deprecated_elements_in_object(data_source)
assert str(excinfo.value) == 'Python expression detected' assert str(excinfo.value) == 'Python expression detected'
@ -634,7 +634,7 @@ def test_deprecations_on_import(pub):
NamedDataSource.import_from_xml_tree(data_source_xml) NamedDataSource.import_from_xml_tree(data_source_xml)
assert str(excinfo.value) == 'Python expression detected' assert str(excinfo.value) == 'Python expression detected'
job = DeprecationsScanAfterJob() job = DeprecationsScan()
with pytest.raises(DeprecatedElementsDetected) as excinfo: with pytest.raises(DeprecatedElementsDetected) as excinfo:
job.check_deprecated_elements_in_object(wscall) job.check_deprecated_elements_in_object(wscall)
assert str(excinfo.value) == 'Python expression detected' assert str(excinfo.value) == 'Python expression detected'
@ -643,6 +643,6 @@ def test_deprecations_on_import(pub):
assert str(excinfo.value) == 'Python expression detected' assert str(excinfo.value) == 'Python expression detected'
# no python expressions # no python expressions
job = DeprecationsScanAfterJob() job = DeprecationsScan()
job.check_deprecated_elements_in_object(mail_template) job.check_deprecated_elements_in_object(mail_template)
MailTemplate.import_from_xml_tree(mail_template_xml) MailTemplate.import_from_xml_tree(mail_template_xml)

4
wcs/backoffice/deprecations.py
View File

@ -73,7 +73,7 @@ class DeprecationsDirectory(Directory):
def scan(self): def scan(self):
job = get_response().add_after_job( job = get_response().add_after_job(
DeprecationsScanAfterJob( DeprecationsScan(
label=_('Scanning for deprecations'), label=_('Scanning for deprecations'),
user_id=get_request().user.id, user_id=get_request().user.id,
return_url='/backoffice/studio/deprecations/', return_url='/backoffice/studio/deprecations/',
@ -134,7 +134,7 @@ class DeprecationsDirectory(Directory):
} }
class DeprecationsScanAfterJob(AfterJob): class DeprecationsScan(AfterJob):
def done_action_url(self): def done_action_url(self):
return self.kwargs['return_url'] return self.kwargs['return_url']

4
wcs/blocks.py
View File

@ -205,7 +205,7 @@ class BlockDef(StorableObject):
def import_from_xml_tree( def import_from_xml_tree(
cls, tree, include_id=False, check_datasources=True, check_deprecated=True, **kwargs cls, tree, include_id=False, check_datasources=True, check_deprecated=True, **kwargs
): ):
from wcs.backoffice.deprecations import DeprecatedElementsDetected, DeprecationsScanAfterJob from wcs.backoffice.deprecations import DeprecatedElementsDetected, DeprecationsScan
blockdef = cls() blockdef = cls()
if tree.find('name') is None or not tree.find('name').text: if tree.find('name') is None or not tree.find('name').text:
@ -290,7 +290,7 @@ class BlockDef(StorableObject):
if check_deprecated: if check_deprecated:
# check for deprecated elements # check for deprecated elements
job = DeprecationsScanAfterJob() job = DeprecationsScan()
try: try:
job.check_deprecated_elements_in_object(blockdef) job.check_deprecated_elements_in_object(blockdef)
except DeprecatedElementsDetected as e: except DeprecatedElementsDetected as e:

4
wcs/data_sources.py
View File

@ -918,7 +918,7 @@ class NamedDataSource(XmlStorableObject):
@classmethod @classmethod
def import_from_xml_tree(cls, tree, include_id=False, check_deprecated=True, **kwargs): def import_from_xml_tree(cls, tree, include_id=False, check_deprecated=True, **kwargs):
from wcs.backoffice.deprecations import DeprecatedElementsDetected, DeprecationsScanAfterJob from wcs.backoffice.deprecations import DeprecatedElementsDetected, DeprecationsScan
data_source = super().import_from_xml_tree( data_source = super().import_from_xml_tree(
tree, include_id=include_id, check_deprecated=check_deprecated, **kwargs tree, include_id=include_id, check_deprecated=check_deprecated, **kwargs
@ -927,7 +927,7 @@ class NamedDataSource(XmlStorableObject):
if check_deprecated: if check_deprecated:
# check for deprecated elements # check for deprecated elements
job = DeprecationsScanAfterJob() job = DeprecationsScan()
try: try:
job.check_deprecated_elements_in_object(data_source) job.check_deprecated_elements_in_object(data_source)
except DeprecatedElementsDetected as e: except DeprecatedElementsDetected as e:

4
wcs/formdef.py
View File

@ -1508,7 +1508,7 @@ class FormDef(StorableObject):
check_datasources=True, check_datasources=True,
check_deprecated=True, check_deprecated=True,
): ):
from wcs.backoffice.deprecations import DeprecatedElementsDetected, DeprecationsScanAfterJob from wcs.backoffice.deprecations import DeprecatedElementsDetected, DeprecationsScan
from wcs.carddef import CardDef from wcs.carddef import CardDef
formdef = cls() formdef = cls()
@ -1726,7 +1726,7 @@ class FormDef(StorableObject):
if check_deprecated: if check_deprecated:
# check for deprecated elements # check for deprecated elements
job = DeprecationsScanAfterJob() job = DeprecationsScan()
try: try:
job.check_deprecated_elements_in_object(formdef) job.check_deprecated_elements_in_object(formdef)
except DeprecatedElementsDetected as e: except DeprecatedElementsDetected as e:

4
wcs/publisher.py
View File

@ -183,9 +183,9 @@ class WcsPublisher(QommonPublisher):
formdef.register_cronjobs() formdef.register_cronjobs()
def update_deprecations_report(self, **kwargs): def update_deprecations_report(self, **kwargs):
from .backoffice.deprecations import DeprecationsScanAfterJob from .backoffice.deprecations import DeprecationsScan
DeprecationsScanAfterJob().execute() DeprecationsScan().execute()
def has_postgresql_config(self): def has_postgresql_config(self):
return bool(self.cfg.get('postgresql', {})) return bool(self.cfg.get('postgresql', {}))

4
wcs/workflows.py
View File

@ -1255,7 +1255,7 @@ class Workflow(StorableObject):
def import_from_xml_tree( def import_from_xml_tree(
cls, tree, include_id=False, snapshot=False, check_datasources=True, check_deprecated=True cls, tree, include_id=False, snapshot=False, check_datasources=True, check_deprecated=True
): ):
from wcs.backoffice.deprecations import DeprecatedElementsDetected, DeprecationsScanAfterJob from wcs.backoffice.deprecations import DeprecatedElementsDetected, DeprecationsScan
workflow = cls() workflow = cls()
if tree.find('name') is None or not tree.find('name').text: if tree.find('name') is None or not tree.find('name').text:
@ -1370,7 +1370,7 @@ class Workflow(StorableObject):
if check_deprecated: if check_deprecated:
# check for deprecated elements # check for deprecated elements
job = DeprecationsScanAfterJob() job = DeprecationsScan()
try: try:
job.check_deprecated_elements_in_object(workflow) job.check_deprecated_elements_in_object(workflow)
except DeprecatedElementsDetected as e: except DeprecatedElementsDetected as e:

4
wcs/wscalls.py
View File

@ -286,7 +286,7 @@ class NamedWsCall(XmlStorableObject):
@classmethod @classmethod
def import_from_xml_tree(cls, tree, include_id=False, check_deprecated=True, **kwargs): def import_from_xml_tree(cls, tree, include_id=False, check_deprecated=True, **kwargs):
from wcs.backoffice.deprecations import DeprecatedElementsDetected, DeprecationsScanAfterJob from wcs.backoffice.deprecations import DeprecatedElementsDetected, DeprecationsScan
wscall = super().import_from_xml_tree( wscall = super().import_from_xml_tree(
tree, include_id=include_id, check_deprecated=check_deprecated, **kwargs tree, include_id=include_id, check_deprecated=check_deprecated, **kwargs
@ -294,7 +294,7 @@ class NamedWsCall(XmlStorableObject):
if check_deprecated: if check_deprecated:
# check for deprecated elements # check for deprecated elements
job = DeprecationsScanAfterJob() job = DeprecationsScan()
try: try:
job.check_deprecated_elements_in_object(wscall) job.check_deprecated_elements_in_object(wscall)
except DeprecatedElementsDetected as e: except DeprecatedElementsDetected as e: