a few more tests

[bluechips.git] / bluechips / tests / functional / test_transfer.py

diff --git a/bluechips/tests/functional/test_transfer.py b/bluechips/tests/functional/test_transfer.py
index 36a6bb8a3d170b05fe7f7aed334f0003e28320fc..b38f71cc65d96a4c6c532c7c2c646801d34d9fd0 100644 (file)
--- a/bluechips/tests/functional/test_transfer.py
+++ b/bluechips/tests/functional/test_transfer.py
@@ -28,7 +28,7 @@ class TestTransferController(TestController):
 
         response = form.submit()
         response = response.follow()
-        response.mustcontain('Transfer updated.')
+        response.mustcontain('Transfer', 'created.')
 
         t = meta.Session.query(model.Transfer).\
                 order_by(model.Transfer.id.desc()).first()
@@ -37,8 +37,6 @@ class TestTransferController(TestController):
         assert t.amount == 12345
         assert t.date == today
         assert t.description == u'A test transfer from Rich to Ben'
-        meta.Session.delete(t)
-        meta.Session.commit()
 
     def test_edit(self):
         user_rich = meta.Session.query(model.User).\
@@ -66,10 +64,19 @@ class TestTransferController(TestController):
 
         response = form.submit()
         response = response.follow()
-        response.mustcontain('Transfer updated.')
+        response.mustcontain('Transfer', 'updated.')
 
         t = meta.Session.query(model.Transfer).\
                 order_by(model.Transfer.id.desc()).first()
         assert t.description == u'A new description'
-        meta.Session.delete(t)
+
+    def test_edit_nonexistent(self):
+        response = self.app.get(url_for(controller='transfer',
+                                        action='edit',
+                                        id=21424), status=404)
+
+    def tearDown(self):
+        transfers = meta.Session.query(model.Transfer).all()
+        for t in transfers:
+            meta.Session.delete(t)
         meta.Session.commit()