summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-08-28 06:43:36 -0400
committerChris McDonough <chrism@plope.com>2011-08-28 06:43:36 -0400
commit366a7c38c5d59fc4e9b2e72332671c4f440354a0 (patch)
treed29b003e566333690aa2531b5a36fdaf72afba77
parentfdb5d1f3fae9c4206295d5d620a9cadefec020dd (diff)
downloadpyramid-366a7c38c5d59fc4e9b2e72332671c4f440354a0.tar.gz
pyramid-366a7c38c5d59fc4e9b2e72332671c4f440354a0.tar.bz2
pyramid-366a7c38c5d59fc4e9b2e72332671c4f440354a0.zip
add an integration test that uses relative renderer names
-rw-r--r--pyramid/tests/rendererscanapp/__init__.py9
-rw-r--r--pyramid/tests/rendererscanapp/one.pt4
-rw-r--r--pyramid/tests/rendererscanapp/two/__init__.py6
-rw-r--r--pyramid/tests/rendererscanapp/two/two.pt4
-rw-r--r--pyramid/tests/test_integration.py10
5 files changed, 33 insertions, 0 deletions
diff --git a/pyramid/tests/rendererscanapp/__init__.py b/pyramid/tests/rendererscanapp/__init__.py
new file mode 100644
index 000000000..1baec0940
--- /dev/null
+++ b/pyramid/tests/rendererscanapp/__init__.py
@@ -0,0 +1,9 @@
+from pyramid.view import view_config
+
+@view_config(name='one', renderer='one.pt')
+def one(request):
+ return {'name':'One!'}
+
+def includeme(config):
+ config.scan()
+
diff --git a/pyramid/tests/rendererscanapp/one.pt b/pyramid/tests/rendererscanapp/one.pt
new file mode 100644
index 000000000..42114d94f
--- /dev/null
+++ b/pyramid/tests/rendererscanapp/one.pt
@@ -0,0 +1,4 @@
+<div xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:tal="http://xml.zope.org/namespaces/tal">
+ ${name}
+</div>
diff --git a/pyramid/tests/rendererscanapp/two/__init__.py b/pyramid/tests/rendererscanapp/two/__init__.py
new file mode 100644
index 000000000..be0077fcb
--- /dev/null
+++ b/pyramid/tests/rendererscanapp/two/__init__.py
@@ -0,0 +1,6 @@
+from pyramid.view import view_config
+
+@view_config(name='two', renderer='two.pt')
+def two(request):
+ return {'nameagain':'Two!'}
+
diff --git a/pyramid/tests/rendererscanapp/two/two.pt b/pyramid/tests/rendererscanapp/two/two.pt
new file mode 100644
index 000000000..7eff97c22
--- /dev/null
+++ b/pyramid/tests/rendererscanapp/two/two.pt
@@ -0,0 +1,4 @@
+<div xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:tal="http://xml.zope.org/namespaces/tal">
+ ${nameagain}
+</div>
diff --git a/pyramid/tests/test_integration.py b/pyramid/tests/test_integration.py
index f391e65cb..a45b9e5a5 100644
--- a/pyramid/tests/test_integration.py
+++ b/pyramid/tests/test_integration.py
@@ -471,6 +471,16 @@ class WSGIApp2AppTest(unittest.TestCase):
res = self.testapp.get('/hello', status=200)
self.assertTrue('Hello' in res.body)
+class RendererScanAppTest(IntegrationBase):
+ package = 'pyramid.tests.rendererscanapp'
+ def test_root(self):
+ res = self.testapp.get('/one', status=200)
+ self.assertTrue('One!' in res.body)
+
+ def test_two(self):
+ res = self.testapp.get('/two', status=200)
+ self.assertTrue('Two!' in res.body)
+
class DummyContext(object):
pass