summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-10-06 05:22:14 -0400
committerChris McDonough <chrism@plope.com>2011-10-06 05:22:14 -0400
commitfe219cdea55e40782c2ee8f825812530b4018ca4 (patch)
treef594657ea2967c4cb281b625c4b195040f405fa3
parentd206187ac822274e4583a8d5514e7b28f91a319e (diff)
downloadpyramid-fe219cdea55e40782c2ee8f825812530b4018ca4.tar.gz
pyramid-fe219cdea55e40782c2ee8f825812530b4018ca4.tar.bz2
pyramid-fe219cdea55e40782c2ee8f825812530b4018ca4.zip
add tests for scaffold init stuff
-rw-r--r--pyramid/scaffolds/__init__.py9
-rw-r--r--pyramid/tests/test_scaffolds/test_init.py21
2 files changed, 24 insertions, 6 deletions
diff --git a/pyramid/scaffolds/__init__.py b/pyramid/scaffolds/__init__.py
index 93a5db12a..a42e18ab7 100644
--- a/pyramid/scaffolds/__init__.py
+++ b/pyramid/scaffolds/__init__.py
@@ -1,10 +1,7 @@
import binascii
import os
-from pyramid.compat import (
- print_,
- native_
- )
+from pyramid.compat import native_
from pyramid.scaffolds.template import Template
@@ -18,12 +15,12 @@ class PyramidTemplate(Template):
vars['package_logger'] = package_logger
return Template.pre(self, command, output_dir, vars)
- def post(self, command, output_dir, vars):
+ def post(self, command, output_dir, vars): # pragma: no cover
self.out('Welcome to Pyramid. Sorry for the convenience.')
return Template.post(self, command, output_dir, vars)
def out(self, msg): # pragma: no cover (replaceable testing hook)
- print_(msg)
+ print(msg)
class StarterProjectTemplate(PyramidTemplate):
_template_dir = 'starter'
diff --git a/pyramid/tests/test_scaffolds/test_init.py b/pyramid/tests/test_scaffolds/test_init.py
new file mode 100644
index 000000000..6b038914a
--- /dev/null
+++ b/pyramid/tests/test_scaffolds/test_init.py
@@ -0,0 +1,21 @@
+import unittest
+
+class TestPyramidTemplate(unittest.TestCase):
+ def _makeOne(self):
+ from pyramid.scaffolds import PyramidTemplate
+ return PyramidTemplate('name')
+
+ def test_pre(self):
+ inst = self._makeOne()
+ vars = {'package':'one'}
+ inst.pre('command', 'output dir', vars)
+ self.assertTrue(vars['random_string'])
+ self.assertEqual(vars['package_logger'], 'one')
+
+ def test_pre_root(self):
+ inst = self._makeOne()
+ vars = {'package':'root'}
+ inst.pre('command', 'output dir', vars)
+ self.assertTrue(vars['random_string'])
+ self.assertEqual(vars['package_logger'], 'app')
+