summaryrefslogtreecommitdiff
path: root/tests/test_config/test_views.py
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2018-11-01 21:05:04 -0500
committerMichael Merickel <michael@merickel.org>2018-11-02 09:54:28 -0500
commit0cef6bc5d627524354c47295df7a0aa84a64539e (patch)
tree05c3c6163ba096f8aeda882c25e4b405fce4423e /tests/test_config/test_views.py
parentaa1660f3d9a5dc654a91544d72de596af2fdf9ba (diff)
downloadpyramid-0cef6bc5d627524354c47295df7a0aa84a64539e.tar.gz
pyramid-0cef6bc5d627524354c47295df7a0aa84a64539e.tar.bz2
pyramid-0cef6bc5d627524354c47295df7a0aa84a64539e.zip
remove deprecated media range support from add_view and add_route
Diffstat (limited to 'tests/test_config/test_views.py')
-rw-r--r--tests/test_config/test_views.py29
1 files changed, 4 insertions, 25 deletions
diff --git a/tests/test_config/test_views.py b/tests/test_config/test_views.py
index 5e722c9a0..b72b9b36a 100644
--- a/tests/test_config/test_views.py
+++ b/tests/test_config/test_views.py
@@ -1815,25 +1815,12 @@ class TestViewsConfigurationMixin(unittest.TestCase):
request.accept = DummyAccept('text/html')
self._assertNotFound(wrapper, None, request)
- def test_add_view_with_range_accept_match(self):
- from pyramid.renderers import null_renderer
-
- view = lambda *arg: 'OK'
- config = self._makeOne(autocommit=True)
- config.add_view(view=view, accept='text/*', renderer=null_renderer)
- wrapper = self._getViewCallable(config)
- request = self._makeRequest(config)
- request.accept = DummyAccept('text/html', contains=True)
- self.assertEqual(wrapper(None, request), 'OK')
-
- def test_add_view_with_range_accept_nomatch(self):
+ def test_add_view_with_wildcard_accept_raises(self):
view = lambda *arg: 'OK'
config = self._makeOne(autocommit=True)
- config.add_view(view=view, accept='text/*')
- wrapper = self._getViewCallable(config)
- request = self._makeRequest(config)
- request.accept = DummyAccept('application/json', contains=False)
- self._assertNotFound(wrapper, None, request)
+ self.assertRaises(
+ ValueError, lambda: config.add_view(view=view, accept='text/*')
+ )
def test_add_view_with_containment_true(self):
from pyramid.renderers import null_renderer
@@ -3142,11 +3129,6 @@ class TestMultiView(unittest.TestCase):
self.assertEqual(mv.media_views['text/xml'], [(100, 'view5', None)])
self.assertEqual(set(mv.accepts), set(['text/xml', 'text/html']))
self.assertEqual(mv.views, [(99, 'view2', None), (100, 'view', None)])
- mv.add('view6', 98, accept='text/*')
- self.assertEqual(
- mv.views,
- [(98, 'view6', None), (99, 'view2', None), (100, 'view', None)],
- )
def test_add_with_phash(self):
mv = self._makeOne()
@@ -4266,9 +4248,6 @@ class DummyAccept(object):
results.append((match, 1.0))
return results
- def __contains__(self, value):
- return self.contains
-
class DummyConfig:
def __init__(self):