Commit b168c1b1 authored by Andrew Godwin's avatar Andrew Godwin
Browse files

[1.2.X] Fixed #14939: Don't strip ;-parameters from URLs in the test client. 

Backport of [15027] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15045 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 6c32577d

django/test/client.py

+13 −6
Original line number Diff line number Diff line
@@ -198,6 +198,13 @@ class Client(object): 
        return {}

    session = property(_session)



    def _get_path(self, parsed):

        # If there are parameters, add them

        if parsed[3]:

             return urllib.unquote(parsed[2] + ";" + parsed[3])

        else:

             return urllib.unquote(parsed[2])



    def request(self, **request):

        """

        The master request method. Composes the environment dictionary
@@ -288,7 +295,7 @@ class Client(object): 
        parsed = urlparse(path)

        r = {

            'CONTENT_TYPE':    'text/html; charset=utf-8',

            'PATH_INFO':       urllib.unquote(parsed[2]),

            'PATH_INFO':       self._get_path(parsed),

            'QUERY_STRING':    urlencode(data, doseq=True) or parsed[4],

            'REQUEST_METHOD': 'GET',

            'wsgi.input':      FakePayload('')
@@ -320,7 +327,7 @@ class Client(object): 
        r = {

            'CONTENT_LENGTH': len(post_data),

            'CONTENT_TYPE':   content_type,

            'PATH_INFO':      urllib.unquote(parsed[2]),

            'PATH_INFO':      self._get_path(parsed),

            'QUERY_STRING':   parsed[4],

            'REQUEST_METHOD': 'POST',

            'wsgi.input':     FakePayload(post_data),
@@ -339,7 +346,7 @@ class Client(object): 
        parsed = urlparse(path)

        r = {

            'CONTENT_TYPE':    'text/html; charset=utf-8',

            'PATH_INFO':       urllib.unquote(parsed[2]),

            'PATH_INFO':       self._get_path(parsed),

            'QUERY_STRING':    urlencode(data, doseq=True) or parsed[4],

            'REQUEST_METHOD': 'HEAD',

            'wsgi.input':      FakePayload('')
@@ -357,7 +364,7 @@ class Client(object): 
        """

        parsed = urlparse(path)

        r = {

            'PATH_INFO':       urllib.unquote(parsed[2]),

            'PATH_INFO':       self._get_path(parsed),

            'QUERY_STRING':    urlencode(data, doseq=True) or parsed[4],

            'REQUEST_METHOD': 'OPTIONS',

            'wsgi.input':      FakePayload('')
@@ -389,7 +396,7 @@ class Client(object): 
        r = {

            'CONTENT_LENGTH': len(post_data),

            'CONTENT_TYPE':   content_type,

            'PATH_INFO':      urllib.unquote(parsed[2]),

            'PATH_INFO':      self._get_path(parsed),

            'QUERY_STRING':   query_string or parsed[4],

            'REQUEST_METHOD': 'PUT',

            'wsgi.input':     FakePayload(post_data),
@@ -407,7 +414,7 @@ class Client(object): 
        """

        parsed = urlparse(path)

        r = {

            'PATH_INFO':       urllib.unquote(parsed[2]),

            'PATH_INFO':       self._get_path(parsed),

            'QUERY_STRING':    urlencode(data, doseq=True) or parsed[4],

            'REQUEST_METHOD': 'DELETE',

            'wsgi.input':      FakePayload('')

tests/modeltests/test_client/models.py

+7 −0
Original line number Diff line number Diff line
@@ -266,6 +266,13 @@ class ClientTest(TestCase): 
        # Check that the response was a 404

        self.assertEqual(response.status_code, 404)



    def test_url_parameters(self):

        "Make sure that URL ;-parameters are not stripped."

        response = self.client.get('/test_client/unknown_view/;some-parameter')



        # Check that the path in the response includes it (ignore that it's a 404)

        self.assertEqual(response.request['PATH_INFO'], '/test_client/unknown_view/;some-parameter')



    def test_view_with_login(self):

        "Request a page that is protected with @login_required"