Merge branch 'master' of github.com:junaidali/pyramid into junaidali-master

2 files changed, 26 insertions, 2 deletions

diff --git a/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl b/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
index a26cd9eeb..e6425eb91 100644
--- a/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
@@ -6,7 +6,7 @@ from pyramid import testing
 from .models import DBSession
 
 
-class TestMyView(unittest.TestCase):
+class TestMyViewSuccessCondition(unittest.TestCase):
     def setUp(self):
         self.config = testing.setUp()
         from sqlalchemy import create_engine
@@ -25,9 +25,31 @@ class TestMyView(unittest.TestCase):
         DBSession.remove()
         testing.tearDown()
 
-    def test_it(self):
+    def test_passing_view(self):
         from .views import my_view
         request = testing.DummyRequest()
         info = my_view(request)
         self.assertEqual(info['one'].name, 'one')
         self.assertEqual(info['project'], '{{project}}')
+
+
+class TestMyViewFailureCondition(unittest.TestCase):
+    def setUp(self):
+        self.config = testing.setUp()
+        from sqlalchemy import create_engine
+        engine = create_engine('sqlite://')
+        from .models import (
+            Base,
+            MyModel,
+            )
+        DBSession.configure(bind=engine)
+
+    def tearDown(self):
+        DBSession.remove()
+        testing.tearDown()
+
+    def test_failing_view(self):
+        from .views import my_view
+        request = testing.DummyRequest()
+        info = my_view(request)
+        self.assertEqual(info.status_int, 500)
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 0cff30439..bab271159 100644
--- a/setup.py
+++ b/setup.py
@@ -52,6 +52,8 @@ install_requires=[
 
 tests_require = [
     'WebTest >= 1.3.1', # py3 compat
+    'webtest',
+    'zope.component',
     ]
 
 if not PY3: