--- a/cubicweb/test/unittest_req.py Fri Nov 04 11:57:09 2016 +0100
+++ b/cubicweb/test/unittest_req.py Fri Nov 04 13:12:10 2016 +0100
@@ -45,31 +45,6 @@
self.assertRaises(AssertionError, req.build_url, 'one', 'two not allowed')
self.assertRaises(AssertionError, req.build_url, 'view', test=None)
- def test_build_url_language_from_url(self):
- # need req.vreg.config to exist because lang is read in it at set_language() call
- vreg = MockVReg()
- vreg.config.global_set_option('language-mode', 'url-prefix')
- req = RequestSessionBase(vreg)
- req.base_url = lambda secure=None: 'http://testing.fr/cubicweb/'
- self.assertIsNone(req.lang) # language unset yet.
- self.assertEqual(req.build_url(), 'http://testing.fr/cubicweb/view')
- self.assertEqual(req.build_url('foo'), 'http://testing.fr/cubicweb/foo')
- req.set_language('fr')
- self.assertEqual(req.lang, 'fr')
- self.assertEqual(req.build_url(), 'http://testing.fr/cubicweb/fr/view')
- self.assertEqual(req.build_url('foo'), 'http://testing.fr/cubicweb/fr/foo')
- req.set_language('en')
- self.assertEqual(req.lang, 'en')
- self.assertEqual(req.build_url(), 'http://testing.fr/cubicweb/en/view')
- self.assertEqual(req.build_url('foo'), 'http://testing.fr/cubicweb/en/foo')
- # no language prefix in URL
- vreg.config.global_set_option('language-mode', '')
- self.assertEqual(req.build_url(), 'http://testing.fr/cubicweb/view')
- self.assertEqual(req.build_url('foo'), 'http://testing.fr/cubicweb/foo')
- req.set_language('fr')
- self.assertEqual(req.build_url(), 'http://testing.fr/cubicweb/view')
- self.assertEqual(req.build_url('foo'), 'http://testing.fr/cubicweb/foo')
-
def test_ensure_no_rql(self):
req = RequestSessionBase(None)
self.assertEqual(req.ensure_ro_rql('Any X WHERE X is CWUser'), None)
@@ -78,13 +53,6 @@
self.assertRaises(Unauthorized, req.ensure_ro_rql, ' SET X login "toto" WHERE X is CWUser ')
-class MockVReg(object):
- """Fake VReg with just a basic config in it.
- """
- def __init__(self):
- self.config = ApptestConfiguration('data', __file__)
-
-
class RequestCWTC(CubicWebTC):
def test_base_url(self):