summaryrefslogtreecommitdiff
path: root/repoze/bfg/tests/test_static.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2010-07-12 13:37:51 +0000
committerChris McDonough <chrism@agendaless.com>2010-07-12 13:37:51 +0000
commit9336d44d79232b021cc5f871aa43a384958e1920 (patch)
treee601ad3e09d6cbc0833767dc83022e94b271da46 /repoze/bfg/tests/test_static.py
parent8139c97cbea01dc4e4f3ce2840e7359389775621 (diff)
downloadpyramid-9336d44d79232b021cc5f871aa43a384958e1920.tar.gz
pyramid-9336d44d79232b021cc5f871aa43a384958e1920.tar.bz2
pyramid-9336d44d79232b021cc5f871aa43a384958e1920.zip
- Fix regression in
``repoze.bfg.configuration.Configurator.add_static_view``. Before 1.3a4, view names that contained a slash were supported as route prefixes. 1.3a4 broke this by trying to treat them as full URLs.
Diffstat (limited to 'repoze/bfg/tests/test_static.py')
-rw-r--r--repoze/bfg/tests/test_static.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/repoze/bfg/tests/test_static.py b/repoze/bfg/tests/test_static.py
index f857f63a8..508db0d90 100644
--- a/repoze/bfg/tests/test_static.py
+++ b/repoze/bfg/tests/test_static.py
@@ -256,21 +256,21 @@ class TestStaticURLInfo(unittest.TestCase):
def test_generate_slash_in_name1(self):
inst = self._makeOne(None)
- inst.registrations = [('http://example.com/foo/', 'package:path')]
+ inst.registrations = [('http://example.com/foo/', 'package:path', True)]
request = DummyRequest()
result = inst.generate('package:path/abc', request)
self.assertEqual(result, 'http://example.com/foo/abc')
def test_generate_slash_in_name2(self):
inst = self._makeOne(None)
- inst.registrations = [('http://example.com/foo/', 'package:path')]
+ inst.registrations = [('http://example.com/foo/', 'package:path', True)]
request = DummyRequest()
result = inst.generate('package:path', request)
self.assertEqual(result, 'http://example.com/foo/')
def test_generate_route_url(self):
inst = self._makeOne(None)
- inst.registrations = [('viewname', 'package:path')]
+ inst.registrations = [('viewname', 'package:path', False)]
def route_url(n, r, **kw):
self.assertEqual(n, 'viewname')
self.assertEqual(r, request)
@@ -285,19 +285,19 @@ class TestStaticURLInfo(unittest.TestCase):
inst = self._makeOne(None)
inst.registrations = [('http://example.com/', 'package:path')]
inst.add('http://example.com/', 'anotherpackage:path')
- expected = [('http://example.com/', 'anotherpackage:path')]
+ expected = [('http://example.com/', 'anotherpackage:path', True)]
self.assertEqual(inst.registrations, expected)
def test_add_url_withendslash(self):
inst = self._makeOne(None)
inst.add('http://example.com/', 'anotherpackage:path')
- expected = [('http://example.com/', 'anotherpackage:path')]
+ expected = [('http://example.com/', 'anotherpackage:path', True)]
self.assertEqual(inst.registrations, expected)
def test_add_url_noendslash(self):
inst = self._makeOne(None)
inst.add('http://example.com', 'anotherpackage:path')
- expected = [('http://example.com/', 'anotherpackage:path')]
+ expected = [('http://example.com/', 'anotherpackage:path', True)]
self.assertEqual(inst.registrations, expected)
def test_add_viewname(self):
@@ -309,7 +309,7 @@ class TestStaticURLInfo(unittest.TestCase):
config = Config()
inst = self._makeOne(config)
inst.add('view', 'anotherpackage:path', cache_max_age=1)
- expected = [('view', 'anotherpackage:path')]
+ expected = [('view', 'anotherpackage:path', False)]
self.assertEqual(inst.registrations, expected)
self.assertEqual(config.arg, ('view', 'view*subpath'))
self.assertEqual(config.kw['_info'], None)