summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbbangert <none@none>2006-03-26 18:15:02 -0800
committerbbangert <none@none>2006-03-26 18:15:02 -0800
commitf006bab02b6abbea913d458892a4550572ea8915 (patch)
tree6fb5992a65b60dd51cc53aa98f9a2f7b438147b9
parent08e6dc6793d3e18b41d1951a81412d483dc8dd19 (diff)
downloadroutes-f006bab02b6abbea913d458892a4550572ea8915.tar.gz
[svn] Added tests for recognition
--HG-- branch : trunk
-rw-r--r--setup.py2
-rw-r--r--tests/test_recognition.py11
2 files changed, 12 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index c739d95..81cb162 100644
--- a/setup.py
+++ b/setup.py
@@ -21,4 +21,4 @@ A Routing package for Python that matches URL's to dicts and vice versa
author_email='ben@groovie.org',
url='http://routes.groovie.org/',
packages=find_packages(exclude=['tests', 'ez_setup']),
- ) \ No newline at end of file
+ )
diff --git a/tests/test_recognition.py b/tests/test_recognition.py
index f985a04..467df2e 100644
--- a/tests/test_recognition.py
+++ b/tests/test_recognition.py
@@ -246,6 +246,17 @@ class TestRecognition(unittest.TestCase):
self.assertEqual({'controller':'blog','action':'view','id':'2'}, m.match('/view/2/blog/super'))
self.assertEqual({'controller':'admin/user','action':'view','id':'4'}, m.match('/view/4/admin/user/super'))
+ def test_dynamic_with_trailing_non_keyword_strings(self):
+ m = Mapper()
+ m.connect('somewhere/:over/rainbow', controller='blog')
+ m.connect('somewhere/:over', controller='post')
+ m.create_regs(['post','blog','admin/user'])
+
+ self.assertEqual(None, m.match('/'))
+ self.assertEqual(None, m.match('/somewhere'))
+ self.assertEqual({'controller':'blog','action':'index','over':'near'}, m.match('/somewhere/near/rainbow'))
+ self.assertEqual({'controller':'post','action':'index','over':'tomorrow'}, m.match('/somewhere/tomorrow'))
+
def test_dynamic_with_trailing_dyanmic_defaults(self):
for path in ['archives/:action/:article', 'archives/:(action)/:(article)']:
m = Mapper()