From 6b9e366a4d6d0ac6a0424646e3d2ba32850371b8 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 7 Sep 2010 19:34:20 +0000 Subject: - Fix a bug in ``repoze.bfg.url.static_url`` URL generation: if two resource specifications were used to create two separate static views, but they shared a common prefix, it was possible that ``static_url`` would generate an incorrect URL. - Fix another bug in ``repoze.bfg.static_url`` URL generation: too many slashes in generated URL. --- repoze/bfg/tests/test_static.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'repoze/bfg/tests/test_static.py') diff --git a/repoze/bfg/tests/test_static.py b/repoze/bfg/tests/test_static.py index d9893ab2f..449860883 100644 --- a/repoze/bfg/tests/test_static.py +++ b/repoze/bfg/tests/test_static.py @@ -256,25 +256,25 @@ class TestStaticURLInfo(unittest.TestCase): def test_generate_slash_in_name1(self): inst = self._makeOne(None) - inst.registrations = [('http://example.com/foo/', 'package:path', True)] + 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', True)] + inst.registrations = [('http://example.com/foo/', 'package:path/',True)] request = DummyRequest() - result = inst.generate('package:path', request) + 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', False)] + inst.registrations = [('viewname/', 'package:path/', False)] def route_url(n, r, **kw): - self.assertEqual(n, 'viewname') + self.assertEqual(n, 'viewname/') self.assertEqual(r, request) - self.assertEqual(kw, {'subpath':'/abc', 'a':1}) + self.assertEqual(kw, {'subpath':'abc', 'a':1}) return 'url' request = DummyRequest() inst.route_url = route_url @@ -283,21 +283,21 @@ class TestStaticURLInfo(unittest.TestCase): def test_add_already_exists(self): inst = self._makeOne(None) - inst.registrations = [('http://example.com/', 'package:path')] - inst.add('http://example.com/', 'anotherpackage:path') - expected = [('http://example.com/', 'anotherpackage:path', True)] + inst.registrations = [('http://example.com/', 'package:path/', True)] + inst.add('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', True)] + 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', True)] + expected = [('http://example.com/', 'anotherpackage:path/', True)] self.assertEqual(inst.registrations, expected) def test_add_viewname(self): @@ -309,9 +309,9 @@ class TestStaticURLInfo(unittest.TestCase): config = Config() inst = self._makeOne(config) inst.add('view', 'anotherpackage:path', cache_max_age=1) - expected = [('view', 'anotherpackage:path', False)] + expected = [('view/', 'anotherpackage:path/', False)] self.assertEqual(inst.registrations, expected) - self.assertEqual(config.arg, ('view', 'view/*subpath')) + self.assertEqual(config.arg, ('view/', 'view/*subpath')) self.assertEqual(config.kw['_info'], None) self.assertEqual(config.kw['view_for'], self._getTargetClass()) self.assertEqual(config.kw['factory'](), inst) -- cgit v1.2.3