summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorUnai Zalakain <unai@gisa-elkartea.org>2013-10-28 20:34:09 +0100
committerUnai Zalakain <unai@gisa-elkartea.org>2013-11-07 19:06:32 +0100
commit9c5f6cd565f1bc519dec20e3e44313cb8d8e0e94 (patch)
tree47db482d5b97b863e78a5acaf816116511458831 /docs
parent9b95fa7777c4b484f8053b87f48d65c853945f19 (diff)
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.
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.7.txt3
-rw-r--r--docs/topics/testing/overview.txt7
2 files changed, 10 insertions, 0 deletions
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