From 3bccc8a8d60518d3db6c0c536c927019703c62a8 Mon Sep 17 00:00:00 2001 From: Massimo Di Pierro Date: Sat, 4 Feb 2012 09:51:14 -0600 Subject: [PATCH] test_router and test_routes patch, thanks Jonathan --- VERSION | 2 +- gluon/tests/test_router.py | 6 ++++++ gluon/tests/test_routes.py | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ea953740..cb32ad35 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.4 (2012-02-04 09:49:34) stable +Version 1.99.4 (2012-02-04 09:51:12) stable diff --git a/gluon/tests/test_router.py b/gluon/tests/test_router.py index d01b518c..e258e88f 100644 --- a/gluon/tests/test_router.py +++ b/gluon/tests/test_router.py @@ -770,6 +770,12 @@ class TestRouter(unittest.TestCase): "/init/default/f ['', 'arg1']") self.assertEqual(filter_url('http://domain.com/init/default/f/arg1/arg2'), "/init/default/f ['arg1', 'arg2']") + self.assertEqual(filter_url('http://domain.com/init/default/f/arg1//arg2'), + "/init/default/f ['arg1', '', 'arg2']") + self.assertEqual(filter_url('http://domain.com/init/default/f/arg1//arg3/'), + "/init/default/f ['arg1', '', 'arg3']") + self.assertEqual(filter_url('http://domain.com/init/default/f/arg1//arg3//'), + "/init/default/f ['arg1', '', 'arg3', '']") self.assertEqual(filter_url('http://domain.com/init/default/f', out=True), "/f") self.assertEqual(map_url_out(None, None, 'init', 'default', 'f', None, None, None, None, None), "/f") diff --git a/gluon/tests/test_routes.py b/gluon/tests/test_routes.py index 9bc3cc46..7a0672db 100644 --- a/gluon/tests/test_routes.py +++ b/gluon/tests/test_routes.py @@ -237,6 +237,12 @@ routes_out = [ "/welcome/default/f ['', 'arg1']") self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1/arg2'), "/welcome/default/f ['arg1', 'arg2']") + self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1//arg2'), + "/welcome/default/f ['arg1', '', 'arg2']") + self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1//arg3/'), + "/welcome/default/f ['arg1', '', 'arg3']") + self.assertEqual(filter_url('http://domain.com/welcome/default/f/arg1//arg3//'), + "/welcome/default/f ['arg1', '', 'arg3', '']") self.assertEqual(filter_url('http://domain.com/welcome/default/f', out=True), "/f") self.assertEqual(regex_filter_out('/welcome/default/f'), "/f")