- Use ``caller_package`` function instead of ``caller_module``

  function within ``templating`` to avoid needing to name the caller
  module in resource overrides (actually match docs).

- Make it possible to override templates stored directly in a module
  with templates in a subdirectory of the same module, stored directly
  within another module, or stored in a subdirectory of another module
  (actually match docs).

1 files changed, 36 insertions, 0 deletions

diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py
index a8eec3d48..cba460a0a 100644
--- a/repoze/bfg/tests/test_zcml.py
+++ b/repoze/bfg/tests/test_zcml.py
@@ -897,6 +897,42 @@ class TestResourceDirective(unittest.TestCase):
         self.assertEqual(action['args'],
                          ('IDummy', 'foo.pt', 'IDummy', 'foo.pt'))
 
+    def test_override_module_with_directory(self):
+        from repoze.bfg.zcml import _override
+        context = DummyContext()
+        self._callFUT(context, 'a', 'b:foo/')
+        actions = context.actions
+        self.assertEqual(len(actions), 1)
+        action = actions[0]
+        self.assertEqual(action['callable'], _override)
+        self.assertEqual(action['discriminator'], None)
+        self.assertEqual(action['args'],
+                         ('IDummy', '', 'IDummy', 'foo/'))
+
+    def test_override_directory_with_module(self):
+        from repoze.bfg.zcml import _override
+        context = DummyContext()
+        self._callFUT(context, 'a:foo/', 'b')
+        actions = context.actions
+        self.assertEqual(len(actions), 1)
+        action = actions[0]
+        self.assertEqual(action['callable'], _override)
+        self.assertEqual(action['discriminator'], None)
+        self.assertEqual(action['args'],
+                         ('IDummy', 'foo/', 'IDummy', ''))
+
+    def test_override_module_with_module(self):
+        from repoze.bfg.zcml import _override
+        context = DummyContext()
+        self._callFUT(context, 'a', 'b')
+        actions = context.actions
+        self.assertEqual(len(actions), 1)
+        action = actions[0]
+        self.assertEqual(action['callable'], _override)
+        self.assertEqual(action['discriminator'], None)
+        self.assertEqual(action['args'],
+                         ('IDummy', '', 'IDummy', ''))
+
 class Test_OverrideFunction(unittest.TestCase):
     def setUp(self):
         cleanUp()