Add app with template fixture

bmwant · bmwant · commit cffe05379098 · 2017-09-11T12:56:44.000+03:00
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -0,0 +1,20 @@
+import pytest
+import jinja2
+import aiohttp_jinja2
+from aiohttp import web
+
+
+@pytest.fixture()
+def app_with_template(loop):
+    def aiohttp_app(template):
+        app = web.Application(loop=loop)
+        aiohttp_jinja2.setup(
+            app,
+            loader=jinja2.DictLoader({
+                'tmpl.jinja2': template
+            }),
+            enable_async=False,
+         )
+        return app
+
+    return aiohttp_app
diff --git a/tests/test_jinja_filters.py b/tests/test_jinja_filters.py
@@ -21,7 +21,8 @@ def add_2(value):
     aiohttp_jinja2.setup(
         app,
         loader=jinja2.DictLoader({'tmpl.jinja2': "{{ 5|add_2 }}"}),
-        filters={'add_2': add_2}
+        filters={'add_2': add_2},
+        enable_async=False,
     )
 
     app.router.add_route('GET', '/', index)
diff --git a/tests/test_jinja_globals.py b/tests/test_jinja_globals.py
@@ -8,8 +8,13 @@
 
 def test_get_env(loop):
     app = web.Application(loop=loop)
-    aiohttp_jinja2.setup(app, loader=jinja2.DictLoader(
-        {'tmpl.jinja2': "tmpl"}))
+    aiohttp_jinja2.setup(
+        app,
+        loader=jinja2.DictLoader({
+            'tmpl.jinja2': "tmpl"
+        }),
+        enable_async=False,
+    )
 
     env = aiohttp_jinja2.get_env(app)
     assert isinstance(env, jinja2.Environment)
@@ -29,9 +34,13 @@ def other(request):
         return
 
     app = web.Application(loop=loop)
-    aiohttp_jinja2.setup(app, loader=jinja2.DictLoader(
-        {'tmpl.jinja2':
-         "{{ url('other', name='John_Doe')}}"}))
+    aiohttp_jinja2.setup(
+        app,
+        loader=jinja2.DictLoader({
+            'tmpl.jinja2': "{{ url('other', name='John_Doe')}}"
+         }),
+        enable_async=False,
+    )
 
     app.router.add_route('GET', '/', index)
     app.router.add_route('GET', '/user/{name}', other, name='other')
@@ -52,9 +61,13 @@ def index(request):
         return {}
 
     app = web.Application(loop=loop)
-    aiohttp_jinja2.setup(app, loader=jinja2.DictLoader(
-        {'tmpl.jinja2':
-         "{{ url('index', query_={'foo': 'bar'})}}"}))
+    aiohttp_jinja2.setup(
+        app,
+        loader=jinja2.DictLoader({
+            'tmpl.jinja2': "{{ url('index', query_={'foo': 'bar'})}}"
+        }),
+        enable_async=False,
+     )
 
     app.router.add_get('/', index, name='index')
     client = yield from test_client(app)
@@ -81,8 +94,10 @@ def other(request):
     aiohttp_jinja2.setup(
         app,
         default_helpers=False,
-        loader=jinja2.DictLoader(
-            {'tmpl.jinja2': "{{ url('index')}}"})
+        loader=jinja2.DictLoader({
+            'tmpl.jinja2': "{{ url('index')}}"
+        }),
+        enable_async=False,
     )
 
     app.router.add_route('GET', '/', index)
@@ -102,9 +117,13 @@ def index(request):
         return {}
 
     app = web.Application(loop=loop)
-    aiohttp_jinja2.setup(app, loader=jinja2.DictLoader(
-        {'tmpl.jinja2':
-         "{{ static('whatever.js') }}"}))
+    aiohttp_jinja2.setup(
+        app,
+        loader=jinja2.DictLoader({
+            'tmpl.jinja2': "{{ static('whatever.js') }}"
+        }),
+        enable_async=False,
+    )
 
     app['static_root_url'] = '/static'
     app.router.add_route('GET', '/', index)
@@ -125,9 +144,13 @@ def index(request):
         return {}
 
     app = web.Application(loop=loop)
-    aiohttp_jinja2.setup(app, loader=jinja2.DictLoader(
-        {'tmpl.jinja2':
-         "{{ static('whatever.js') }}"}))
+    aiohttp_jinja2.setup(
+        app,
+        loader=jinja2.DictLoader({
+            'tmpl.jinja2': "{{ static('whatever.js') }}"
+        }),
+        enable_async=False,
+    )
 
     app.router.add_route('GET', '/', index)
     client = yield from test_client(app)
diff --git a/tests/test_simple_renderer.py b/tests/test_simple_renderer.py
@@ -9,18 +9,15 @@
 
 
 @asyncio.coroutine
-def test_func(loop, test_client):
+def test_func(app_with_template, 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 = app_with_template(template)
 
     app.router.add_route('*', '/', func)
 

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