From 9c5f6cd565f1bc519dec20e3e44313cb8d8e0e94 Mon Sep 17 00:00:00 2001 From: Unai Zalakain Date: Mon, 28 Oct 2013 20:34:09 +0100 Subject: Fixed #13725 -- take url scheme into account in assertRedirects Scheme is handled correctly when making comparisons between two URLs. If there isn't any scheme specified in the location where we are redirected to, the original request's scheme is used. If present, the scheme in ``expected_url`` is the one used to make the comparations to. --- docs/releases/1.7.txt | 3 +++ docs/topics/testing/overview.txt | 7 +++++++ 2 files changed, 10 insertions(+) (limited to 'docs') diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt index 2e596b3dc8..e48e3a1669 100644 --- a/docs/releases/1.7.txt +++ b/docs/releases/1.7.txt @@ -444,6 +444,9 @@ Tests client can't fetch externals URLs, this allows you to use ``assertRedirects`` with redirects that aren't part of your Django app. +* Correct handling of scheme when making comparisons in + :meth:`~django.test.SimpleTestCase.assertRedirects`. + * The ``secure`` argument was added to all the request methods of :class:`~django.test.Client`. If ``True``, the request will be made through HTTPS. diff --git a/docs/topics/testing/overview.txt b/docs/topics/testing/overview.txt index 7093138188..133931559e 100644 --- a/docs/topics/testing/overview.txt +++ b/docs/topics/testing/overview.txt @@ -1576,6 +1576,13 @@ your test suite. loaded. Since the test client can't fetch externals URLs, this is particularly useful if ``expected_url`` isn't part of your Django app. + .. versionadded:: 1.7 + + Scheme is handled correctly when making comparisons between two URLs. If + there isn't any scheme specified in the location where we are redirected to, + the original request's scheme is used. If present, the scheme in + ``expected_url`` is the one used to make the comparisons to. + .. method:: SimpleTestCase.assertHTMLEqual(html1, html2, msg=None) Asserts that the strings ``html1`` and ``html2`` are equal. The comparison -- cgit v1.3