From d8fd45d545c43aabde56014466bf1f6c3dc92cb4 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 25 Jun 2012 14:14:44 -0500 Subject: [PATCH] routes patch, thanks Jonathan --- VERSION | 2 +- gluon/tests/test_router.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index b8a09e83..73152e83 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-06-23 09:11:52) dev +Version 2.00.0 (2012-06-25 14:14:39) dev diff --git a/gluon/tests/test_router.py b/gluon/tests/test_router.py index c8097298..50b2e2c1 100644 --- a/gluon/tests/test_router.py +++ b/gluon/tests/test_router.py @@ -619,9 +619,11 @@ class TestRouter(unittest.TestCase): BASE = dict( default_application = 'init', applications = 'INIT', - default_controller = 'default', + ), + init = dict( + #default_controller = 'default', controllers = ['default', 'ctr'], - default_function = 'index', + #default_function = 'index', functions = ['index','user','register','basicRegister', 'download','call','data','error'] ), @@ -639,6 +641,7 @@ class TestRouter(unittest.TestCase): self.assertEqual(str(URL(a='init', c='ctr', f='index', args=['arg'])), "/ctr/index/arg") self.assertEqual(str(URL(a='init', c='ctr', f='ctrf1', args=['arg'])), "/ctr/ctrf1/arg") self.assertEqual(str(URL(a='init', c='ctr', f='ctrf1', args=['ctrf2'])), "/ctr/ctrf1/ctrf2") + self.assertEqual(str(URL(a='init', c='default', f='register')), "/register") # inbound self.assertEqual(filter_url('http://d.com/arg'), "/init/default/index ['arg']")