Finally enable_async everywhere

bmwant · bmwant · commit efc112850d13 · 2017-09-13T12:37:33.000+03:00
diff --git a/aiohttp_jinja2/__init__.py b/aiohttp_jinja2/__init__.py
@@ -60,7 +60,7 @@ def render_string(template_name, request, context, *, app_key=APP_KEY):
         raise web.HTTPInternalServerError(reason=text, text=text)
     if request.get(REQUEST_CONTEXT_KEY):
         context = dict(request[REQUEST_CONTEXT_KEY], **context)
-    text = yield from template.render(context)
+    text = yield from template.render_async(context)
     return text
 
 
diff --git a/tests/test_async_enabled.py b/tests/test_async_enabled.py
@@ -6,28 +6,5 @@
 
 
 @asyncio.coroutine
-def test_func(loop, test_client):
-
-    @aiohttp_jinja2.template('tmpl.jinja2')
-    @asyncio.coroutine
-    def func(request):
-        return {'head': 'HEAD', 'text': 'text'}
-
-    template = '<html><body><h1>{{head}}</h1>{{text}}</body></html>'
-
-    app = web.Application(loop=loop)
-    aiohttp_jinja2.setup(
-        app,
-        loader=jinja2.DictLoader({
-            'tmpl.jinja2': template
-        }),
-    )
-
-    app.router.add_route('*', '/', func)
-
-    client = yield from test_client(app)
-
-    resp = yield from client.get('/')
-    assert 200 == resp.status
-    txt = yield from resp.text()
-    assert '<html><body><h1>HEAD</h1>text</body></html>' == txt
+def test_func(test_client, test_server):
+    pass
diff --git a/tests/test_context_processors.py b/tests/test_context_processors.py
@@ -22,7 +22,7 @@ def func(request):
             'tmpl.jinja2': ("foo: {{ foo }}, bar: {{ bar }}, "
                             "path: {{ request.path }}")
         }),
-        enable_async=False,
+        enable_async=True,
     )
 
     app['aiohttp_jinja2_context_processors'] = (
@@ -76,7 +76,7 @@ def func(request):
             'tmpl.jinja2': template
         }),
         context_processors=(aiohttp_jinja2.request_processor, ctx_coro),
-        enable_async=False,
+        enable_async=True,
     )
 
     app.router.add_route('GET', '/', func)
@@ -104,7 +104,7 @@ def func(request):
         app,
         loader=jinja2.DictLoader({'tmpl.jinja2': 'foo: {{ foo }}'}),
         context_processors=[ctx_coro],
-        enable_async=False,
+        enable_async=True,
     )
 
     app.router.add_get('/', func)
diff --git a/tests/test_jinja_filters.py b/tests/test_jinja_filters.py
@@ -22,7 +22,7 @@ def add_2(value):
         app,
         loader=jinja2.DictLoader({'tmpl.jinja2': "{{ 5|add_2 }}"}),
         filters={'add_2': add_2},
-        enable_async=False,
+        enable_async=True,
     )
 
     app.router.add_route('GET', '/', index)
diff --git a/tests/test_simple_renderer.py b/tests/test_simple_renderer.py
@@ -242,7 +242,6 @@ def func(request):
 
     client = yield from test_client(app)
     resp = yield from client.get('/')
-
     assert 200 == resp.status
     txt = yield from resp.text()
     assert '<html><body><p></p></body></html>' == txt

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ def add_2(value):`
`22`	`22`	`app,`
`23`	`23`	`loader=jinja2.DictLoader({'tmpl.jinja2': "{{ 5\|add_2 }}"}),`
`24`	`24`	`filters={'add_2': add_2},`
`25`		`- enable_async=False,`
	`25`	`+ enable_async=True,`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`app.router.add_route('GET', '/', index)`