mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-30 23:37:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'core/master' into schema-alteration

Browse source 
Conflicts:
	django/db/backends/oracle/base.py
	django/db/backends/postgresql_psycopg2/base.py
	django/db/models/signals.py
	tests/queries/tests.py
This commit is contained in:
Andrew Godwin 2013-08-23 12:36:53 +01:00
commit 5569b0b92f
30 changed files with 411 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

7
docs/topics/testing/overview.txt
View file

@ -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