diff options
| author | Andrew Godwin <andrew@aeracode.org> | 2013-08-23 12:36:53 +0100 |
|---|---|---|
| committer | Andrew Godwin <andrew@aeracode.org> | 2013-08-23 12:36:53 +0100 |
| commit | 5569b0b92f0504aadf0376f9cf0cb09106cd3e92 (patch) | |
| tree | e82fda531a8ef41e8a32054f4fe55eb288457994 /docs/topics/testing | |
| parent | 9cc6cfc4057e07b73a1d72a1177d568362b0c517 (diff) | |
| parent | 57c82f909b212708a17edd11014be718bd02be3b (diff) | |
Merge remote-tracking branch 'core/master' into schema-alteration
Conflicts:
django/db/backends/oracle/base.py
django/db/backends/postgresql_psycopg2/base.py
django/db/models/signals.py
tests/queries/tests.py
Diffstat (limited to 'docs/topics/testing')
| -rw-r--r-- | docs/topics/testing/overview.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/topics/testing/overview.txt b/docs/topics/testing/overview.txt index dc12244d72..89b38f7573 100644 --- a/docs/topics/testing/overview.txt +++ b/docs/topics/testing/overview.txt @@ -328,7 +328,8 @@ Some of the things you can do with the test client are: everything from low-level HTTP (result headers and status codes) to page content. -* Test that the correct view is executed for a given URL. +* See the chain of redirects (if any) and check the URL and status code at + each step. * Test that a given request is rendered by a given Django template, with a template context that contains certain values. @@ -337,8 +338,8 @@ Note that the test client is not intended to be a replacement for Selenium_ or other "in-browser" frameworks. Django's test client has a different focus. In short: -* Use Django's test client to establish that the correct view is being - called and that the view is collecting the correct context data. +* Use Django's test client to establish that the correct template is being + rendered and that the template is passed the correct context data. * Use in-browser frameworks like Selenium_ to test *rendered* HTML and the *behavior* of Web pages, namely JavaScript functionality. Django also |