equal
deleted
inserted
replaced
15 # |
15 # |
16 # You should have received a copy of the GNU Lesser General Public License along |
16 # You should have received a copy of the GNU Lesser General Public License along |
17 # with CubicWeb. If not, see <http://www.gnu.org/licenses/>. |
17 # with CubicWeb. If not, see <http://www.gnu.org/licenses/>. |
18 """cubicweb.web.views.basecontrollers unit tests""" |
18 """cubicweb.web.views.basecontrollers unit tests""" |
19 |
19 |
20 from urlparse import urlsplit, urlunsplit, urljoin |
20 from six.moves.urllib.parse import urlsplit, urlunsplit, urljoin, parse_qs |
21 # parse_qs is deprecated in cgi and has been moved to urlparse in Python 2.6 |
|
22 try: |
|
23 from urlparse import parse_qs as url_parse_query |
|
24 except ImportError: |
|
25 from cgi import parse_qs as url_parse_query |
|
26 |
21 |
27 import lxml |
22 import lxml |
28 |
23 |
29 from logilab.common.testlib import unittest_main |
24 from logilab.common.testlib import unittest_main |
30 |
25 |
1040 |
1035 |
1041 TODO : implement assertion on the expected_params too |
1036 TODO : implement assertion on the expected_params too |
1042 """ |
1037 """ |
1043 with self.admin_access.web_request() as req: |
1038 with self.admin_access.web_request() as req: |
1044 scheme, netloc, path, query, fragment = urlsplit(url) |
1039 scheme, netloc, path, query, fragment = urlsplit(url) |
1045 query_dict = url_parse_query(query) |
1040 query_dict = parse_qs(query) |
1046 expected_url = urljoin(req.base_url(), expected_path) |
1041 expected_url = urljoin(req.base_url(), expected_path) |
1047 self.assertEqual( urlunsplit((scheme, netloc, path, None, None)), expected_url) |
1042 self.assertEqual( urlunsplit((scheme, netloc, path, None, None)), expected_url) |
1048 |
1043 |
1049 def test_redirect_redirectpath(self): |
1044 def test_redirect_redirectpath(self): |
1050 "Check that the potential __redirectpath is honored" |
1045 "Check that the potential __redirectpath is honored" |