summaryrefslogtreecommitdiff
path: root/tests/test_functional
diff options
context:
space:
mode:
authorBen Bangert <ben@groovie.org>2010-01-23 15:22:48 -0800
committerBen Bangert <ben@groovie.org>2010-01-23 15:22:48 -0800
commitfd0942df2c68f604504807f7143e2bd063613ccf (patch)
tree19f4cb56bdffe6d5812240533f622eec892c28cc /tests/test_functional
parent5251795380fe9695906d78bba6226b7b599cf00d (diff)
downloadroutes-fd0942df2c68f604504807f7143e2bd063613ccf.tar.gz
Backout explicit change.
--HG-- branch : trunk
Diffstat (limited to 'tests/test_functional')
-rw-r--r--tests/test_functional/test_nonminimization.py2
-rw-r--r--tests/test_functional/test_recognition.py1
-rw-r--r--tests/test_functional/test_submapper.py4
-rw-r--r--tests/test_functional/test_utils.py2
4 files changed, 6 insertions, 3 deletions
diff --git a/tests/test_functional/test_nonminimization.py b/tests/test_functional/test_nonminimization.py
index 8e98fa2..aca8dcf 100644
--- a/tests/test_functional/test_nonminimization.py
+++ b/tests/test_functional/test_nonminimization.py
@@ -56,6 +56,7 @@ def test_full():
def test_action_required():
m = Mapper()
m.minimization = False
+ m.explicit = True
m.connect('/:controller/index', action='index')
m.create_regs(['content'])
@@ -66,6 +67,7 @@ def test_action_required():
def test_query_params():
m = Mapper()
m.minimization = False
+ m.explicit = True
m.connect('/:controller/index', action='index')
m.create_regs(['content'])
diff --git a/tests/test_functional/test_recognition.py b/tests/test_functional/test_recognition.py
index c606beb..d6400dd 100644
--- a/tests/test_functional/test_recognition.py
+++ b/tests/test_functional/test_recognition.py
@@ -920,6 +920,7 @@ class TestRecognition(unittest.TestCase):
def test_home_noargs(self):
m = Mapper(controller_scan=None, directory=None, always_scan=False)
m.minimization = True
+ m.explicit = True
m.connect('')
m.create_regs([])
diff --git a/tests/test_functional/test_submapper.py b/tests/test_functional/test_submapper.py
index 66d934e..2efcd94 100644
--- a/tests/test_functional/test_submapper.py
+++ b/tests/test_functional/test_submapper.py
@@ -30,7 +30,7 @@ class TestSubmapper(unittest.TestCase):
assert_raises(Exception, url_for, 'entry', id='foo')
def test_submapper_action(self):
- m = Mapper()
+ m = Mapper(explicit=True)
c = m.submapper(path_prefix='/entries', controller='entry')
c.action(name='entries', action='list')
@@ -43,7 +43,7 @@ class TestSubmapper(unittest.TestCase):
assert_raises(Exception, url_for, 'entries', method='DELETE')
def test_submapper_link(self):
- m = Mapper()
+ m = Mapper(explicit=True)
c = m.submapper(path_prefix='/entries', controller='entry')
c.link(rel='new')
diff --git a/tests/test_functional/test_utils.py b/tests/test_functional/test_utils.py
index dbd153f..d661d3f 100644
--- a/tests/test_functional/test_utils.py
+++ b/tests/test_functional/test_utils.py
@@ -684,7 +684,7 @@ class TestUtils(unittest.TestCase):
class TestUtilsWithExplicit(unittest.TestCase):
def setUp(self):
- m = Mapper()
+ m = Mapper(explicit=True)
m.minimization = True
m.connect('archive/:year/:month/:day', controller='blog', action='view', month=None, day=None,
requirements={'month':'\d{1,2}','day':'\d{1,2}'})