sartography/cr-connect-workflow
1
0
Fork 0
mirror of https://github.com/sartography/cr-connect-workflow.git synced 2025-02-22 20:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #493 from sartography/jinja-included-includes-670

Browse Source 
Jinja included includes #670
This commit is contained in:
Dan Funk 2022-03-14 16:49:56 -04:00 committed by GitHub
commit 8ea8993421
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crc/services/jinja_service.py
View File

@ -39,7 +39,8 @@ Cool Right?
references = JinjaService.template_references(input_template) references = JinjaService.template_references(input_template)
for ref in references: for ref in references:
if ref in data.keys(): if ref in data.keys():
templates[ref] = data[ref] sub_content = JinjaService.get_content(data[ref], data)
templates[ref] = sub_content
else: else:
raise ApiError("missing_template", f"Your documentation imports a template that doest not exist: {ref}") raise ApiError("missing_template", f"Your documentation imports a template that doest not exist: {ref}")
templates['main_template'] = input_template templates['main_template'] = input_template

25
tests/test_jinja_service.py
View File

@ -1,8 +1,6 @@
import os import os
from io import BytesIO from io import BytesIO
from lxml import etree
from tests.base_test import BaseTest from tests.base_test import BaseTest
from crc.services.workflow_processor import WorkflowProcessor from crc.services.workflow_processor import WorkflowProcessor
from crc.services.workflow_service import WorkflowService from crc.services.workflow_service import WorkflowService
@ -29,6 +27,27 @@ class TestJinjaService(BaseTest):
docs = WorkflowService._process_documentation(task) docs = WorkflowService._process_documentation(task)
self.assertEqual("Hi Dan, This is a jinja template too! Cool Right?", docs) self.assertEqual("Hi Dan, This is a jinja template too! Cool Right?", docs)
def test_jinja_service_included_includes(self):
"""This is an obnoxious test for nested includes.
Also tests for multiple includes within a single template"""
workflow = self.create_workflow('random_fact')
processor = WorkflowProcessor(workflow)
processor.do_engine_steps()
task = processor.next_task()
data = {"my_template": "Hi {% include 'my_name_template' %} from {% include 'my_org_template' %},\n{% include 'my_content_template' %}",
"my_name_template": "{{name}}",
"my_org_template": "{{org}}",
"my_content_template": "This is an included {% include 'my_jinja_template' %} template too!",
"my_jinja_template": "Jinja",
"name": "Dan",
"org": "Bucky's"}
task.data = data
task.task_spec.documentation = """This is an included template:\n {% include 'my_template' %} \nCool Right?"""
docs = WorkflowService._process_documentation(task)
self.assertEqual('This is an included template:\n Hi Dan from Bucky\'s,\nThis is an included Jinja template too! \nCool Right?', docs)
def test_jinja_service_email(self): def test_jinja_service_email(self):
workflow = self.create_workflow('jinja_email') workflow = self.create_workflow('jinja_email')
workflow_api = self.get_workflow_api(workflow) workflow_api = self.get_workflow_api(workflow)
@ -46,8 +65,6 @@ class TestJinjaService(BaseTest):
self.assertIn("My Email Subject", workflow_api.next_task.documentation) self.assertIn("My Email Subject", workflow_api.next_task.documentation)
self.assertIn("user@example.com", workflow_api.next_task.documentation) self.assertIn("user@example.com", workflow_api.next_task.documentation)
print(f'test_jinja_service_email: {workflow_api.next_task.data}')
def test_jinja_service_tools_markdown(self): def test_jinja_service_tools_markdown(self):
template = "This is my template. {% include 'include_me' %} Was something included?" template = "This is my template. {% include 'include_me' %} Was something included?"
data = {"name": "World", data = {"name": "World",