summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Miller <rob@mochimedia.com>2010-12-29 14:22:34 -0800
committerRob Miller <rob@mochimedia.com>2010-12-29 14:22:34 -0800
commit613287762f6ca2f8d50651fc0b4eee2e9a5f8772 (patch)
tree9938e6e0103b54cc555c3d6f35c103321f9bae79
parent9c1d34a3de11286c98dce52592ef05a3c05046a5 (diff)
downloadpyramid-613287762f6ca2f8d50651fc0b4eee2e9a5f8772.tar.gz
pyramid-613287762f6ca2f8d50651fc0b4eee2e9a5f8772.tar.bz2
pyramid-613287762f6ca2f8d50651fc0b4eee2e9a5f8772.zip
adjust tests to work w/ latest merge and changes
-rw-r--r--pyramid/tests/test_config.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/pyramid/tests/test_config.py b/pyramid/tests/test_config.py
index b094caae9..e088ea2fc 100644
--- a/pyramid/tests/test_config.py
+++ b/pyramid/tests/test_config.py
@@ -1985,18 +1985,18 @@ class ConfiguratorTests(unittest.TestCase):
config.add_view = dummy_add_view
class MyHandler(object):
@classmethod
- def _action_decorator(cls, fn): # pragma: no cover
+ def __action_decorator__(cls, fn): # pragma: no cover
return fn
def action(self): # pragma: no cover
return 'response'
config.add_handler('name', '/{action}', MyHandler)
self.assertEqual(len(views), 1)
- self.assertEqual(views[0]['decorator'], MyHandler._action_decorator)
+ self.assertEqual(views[0]['decorator'], MyHandler.__action_decorator__)
- def test_add_handler_with_action_decorator_no_classmethod(self):
+ def test_add_handler_with_action_decorator_fail_on_instancemethod(self):
config = self._makeOne(autocommit=True)
class MyHandler(object):
- def _action_decorator(self, fn): # pragma: no cover
+ def __action_decorator__(self, fn): # pragma: no cover
return fn
def action(self): # pragma: no cover
return 'response'