- Fix a view lookup ordering bug whereby a view with a larger number

  of predicates registered first (literally first, not "earlier") for
  a triad would lose during view lookup to one registered with fewer.

1 files changed, 25 insertions, 0 deletions

diff --git a/repoze/bfg/tests/test_configuration.py b/repoze/bfg/tests/test_configuration.py
index db960e2e9..b8b114fb9 100644
--- a/repoze/bfg/tests/test_configuration.py
+++ b/repoze/bfg/tests/test_configuration.py
@@ -1030,6 +1030,31 @@ class ConfiguratorTests(unittest.TestCase):
         request = self._makeRequest(config)
         self._assertNotFound(wrapper, None, request)
 
+    def test_add_view_custom_predicate_bests_standard_predicate(self):
+        view = lambda *arg: 'OK'
+        view2 = lambda *arg: 'NOT OK'
+        config = self._makeOne()
+        def pred1(context, request):
+            return True
+        config.add_view(view=view, custom_predicates=(pred1,))
+        config.add_view(view=view2, request_method='GET')
+        wrapper = self._getViewCallable(config)
+        request = self._makeRequest(config)
+        request.method = 'GET'
+        self.assertEqual(wrapper(None, request), 'OK')
+
+    def test_add_view_custom_more_preds_first_bests_fewer_preds_last(self):
+        view = lambda *arg: 'OK'
+        view2 = lambda *arg: 'NOT OK'
+        config = self._makeOne()
+        config.add_view(view=view, request_method='GET', xhr=True)
+        config.add_view(view=view2, request_method='GET')
+        wrapper = self._getViewCallable(config)
+        request = self._makeRequest(config)
+        request.method = 'GET'
+        request.is_xhr = True
+        self.assertEqual(wrapper(None, request), 'OK')
+
     def _assertRoute(self, config, name, path, num_predicates=0):
         from repoze.bfg.interfaces import IRoutesMapper
         mapper = config.registry.getUtility(IRoutesMapper)