Permalink
Browse files

Fixed #19497 -- Refactored testing docs.

Thanks Tim Graham for the review and suggestions.
  • Loading branch information...
1 parent 52a2588 commit d19109fd37e75ccf29d2ca64370102753dbc7c5b @ramiro ramiro committed Dec 22, 2012
View
@@ -180,7 +180,11 @@ testing of Django applications:
:doc:`Overview <ref/django-admin>` |
:doc:`Adding custom commands <howto/custom-management-commands>`
-* **Testing:** :doc:`Overview <topics/testing>`
+* **Testing:**
+ :doc:`Overview <topics/testing/index>` |
+ :doc:`Writing and running tests <topics/testing/overview>` |
+ :doc:`Advanced topics <topics/testing/advanced>` |
+ :doc:`Doctests <topics/testing/doctests>`
* **Deployment:**
:doc:`Overview <howto/deployment/index>` |
@@ -15,8 +15,8 @@ The tests cover:
We appreciate any and all contributions to the test suite!
The Django tests all use the testing infrastructure that ships with Django for
-testing applications. See :doc:`Testing Django applications </topics/testing>`
-for an explanation of how to write new tests.
+testing applications. See :doc:`Testing Django applications
+</topics/testing/overview>` for an explanation of how to write new tests.
.. _running-unit-tests:
@@ -281,7 +281,7 @@ correctly in a couple different situations.
computer programming, so there's lots of information out there:
* A good first look at writing tests for Django can be found in the
- documentation on :doc:`Testing Django applications</topics/testing/>`.
+ documentation on :doc:`Testing Django applications </topics/testing/overview>`.
* Dive Into Python (a free online book for beginning Python developers)
includes a great `introduction to Unit Testing`__.
* After reading those, if you want something a little meatier to sink
@@ -632,7 +632,7 @@ a piece of code, it usually means that code should be refactored or removed.
Coverage will help to identify dead code. See
:ref:`topics-testing-code-coverage` for details.
-:doc:`Testing Django applications </topics/testing>` has comprehensive
+:doc:`Testing Django applications </topics/testing/index>` has comprehensive
information about testing.
.. _Selenium: http://seleniumhq.org/
@@ -71,7 +71,7 @@ of 1.0. This includes these APIs:
external template tags. Before adding any such tags, we'll ensure that
Django raises an error if it tries to load tags with duplicate names.
-- :doc:`Testing </topics/testing>`
+- :doc:`Testing </topics/testing/index>`
- :doc:`django-admin utility </ref/django-admin>`.
@@ -1036,7 +1036,7 @@ test <app or test identifier>
.. django-admin:: test
-Runs tests for all installed models. See :doc:`/topics/testing` for more
+Runs tests for all installed models. See :doc:`/topics/testing/index` for more
information.
.. django-admin-option:: --failfast
@@ -1072,15 +1072,15 @@ For example, this command::
...would perform the following steps:
-1. Create a test database, as described in :doc:`/topics/testing`.
+1. Create a test database, as described in :ref:`the-test-database`.
2. Populate the test database with fixture data from the given fixtures.
(For more on fixtures, see the documentation for ``loaddata`` above.)
3. Runs the Django development server (as in ``runserver``), pointed at
this newly created test database instead of your production database.
This is useful in a number of ways:
-* When you're writing :doc:`unit tests </topics/testing>` of how your views
+* When you're writing :doc:`unit tests </topics/testing/overview>` of how your views
act with certain fixture data, you can use ``testserver`` to interact with
the views in a Web browser, manually.
@@ -562,7 +562,7 @@ If the default value (``None``) is used with the SQLite database engine, the
tests will use a memory resident database. For all other database engines the
test database will use the name ``'test_' + DATABASE_NAME``.
-See :doc:`/topics/testing`.
+See :ref:`the-test-database`.
.. setting:: TEST_CREATE
@@ -1982,9 +1982,7 @@ TEST_RUNNER
Default: ``'django.test.simple.DjangoTestSuiteRunner'``
The name of the class to use for starting the test suite. See
-:doc:`/topics/testing`.
-
-.. _Testing Django Applications: ../testing/
+:ref:`other-testing-frameworks`.
.. setting:: THOUSAND_SEPARATOR
@@ -476,7 +476,7 @@ Test signals
.. module:: django.test.signals
:synopsis: Signals sent during testing.
-Signals only sent when :doc:`running tests </topics/testing>`.
+Signals only sent when :ref:`running tests <running-tests>`.
setting_changed
---------------
@@ -220,7 +220,7 @@ supported :doc:`serialization formats </topics/serialization>`, that will be
loaded into your database at the start of your tests. This makes testing with
real data much easier.
-See :doc:`the testing documentation </topics/testing>` for the full details.
+See :doc:`the testing documentation </topics/testing/index>` for the full details.
Improvements to the admin interface
-----------------------------------
@@ -51,7 +51,7 @@ Performance improvements
.. currentmodule:: django.test
-Tests written using Django's :doc:`testing framework </topics/testing>` now run
+Tests written using Django's :doc:`testing framework </topics/testing/index>` now run
dramatically faster (as much as 10 times faster in many cases).
This was accomplished through the introduction of transaction-based tests: when
@@ -102,7 +102,7 @@ Testing improvements
.. currentmodule:: django.test.client
A couple of small but very useful improvements have been made to the
-:doc:`testing framework </topics/testing>`:
+:doc:`testing framework </topics/testing/index>`:
* The test :class:`Client` now can automatically follow redirects with the
``follow`` argument to :meth:`Client.get` and :meth:`Client.post`. This
@@ -264,14 +264,14 @@ Testing improvements
--------------------
A few notable improvements have been made to the :doc:`testing framework
-</topics/testing>`.
+</topics/testing/index>`.
Test performance improvements
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. currentmodule:: django.test
-Tests written using Django's :doc:`testing framework </topics/testing>` now run
+Tests written using Django's :doc:`testing framework </topics/testing/index>` now run
dramatically faster (as much as 10 times faster in many cases).
This was accomplished through the introduction of transaction-based tests: when
@@ -13,7 +13,7 @@ Introductions to all the key parts of Django you'll need to know:
templates
class-based-views/index
files
- testing
+ testing/index
auth
cache
conditional-view-processing
@@ -135,7 +135,7 @@ table once ``syncdb`` has created it. After creating a database user with these
permissions, you'll specify the details in your project's settings file,
see :setting:`DATABASES` for details.
-If you're using Django's :doc:`testing framework</topics/testing>` to test
+If you're using Django's :doc:`testing framework</topics/testing/index>` to test
database queries, Django will need permission to create a test database.
.. _PostgreSQL: http://www.postgresql.org/
Oops, something went wrong.

0 comments on commit d19109f

Please sign in to comment.