summaryrefslogtreecommitdiff
path: root/docs/ref/django-admin.txt
diff options
context:
space:
mode:
authorJulien Phalip <jphalip@gmail.com>2011-12-22 08:33:58 +0000
committerJulien Phalip <jphalip@gmail.com>2011-12-22 08:33:58 +0000
commit2f02a05ffb45be68b4164b4785ff1826833150a3 (patch)
treed51f7454aeb97a5c35b3045d5d5413691aaf1d00 /docs/ref/django-admin.txt
parent45e3dff5ac697f16829697bc2a899eaeac8986ea (diff)
Fixed #2879 -- Added support for the integration with Selenium and other in-browser testing frameworks. Also added the first Selenium tests for `contrib.admin`. Many thanks to everyone for their contributions and feedback: Mikeal Rogers, Dirk Datzert, mir, Simon G., Almad, Russell Keith-Magee, Denis Golomazov, devin, robertrv, andrewbadr, Idan Gazit, voidspace, Tom Christie, hjwp2, Adam Nelson, Jannis Leidel, Anssi Kääriäinen, Preston Holmes, Bruno Renié and Jacob Kaplan-Moss.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/django-admin.txt')
-rw-r--r--docs/ref/django-admin.txt17
1 files changed, 12 insertions, 5 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 8b83a43179..fac18f3b48 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -976,15 +976,22 @@ information.
.. versionadded:: 1.2
.. django-admin-option:: --failfast
-Use the :djadminopt:`--failfast` option to stop running tests and report the failure
-immediately after a test fails.
+The ``--failfast`` option can be used to stop running tests and report the
+failure immediately after a test fails.
.. versionadded:: 1.4
.. django-admin-option:: --testrunner
-The :djadminopt:`--testrunner` option can be used to control the test runner
-class that is used to execute tests. If this value is provided, it overrides
-the value provided by the :setting:`TEST_RUNNER` setting.
+The ``--testrunner`` option can be used to control the test runner class that
+is used to execute tests. If this value is provided, it overrides the value
+provided by the :setting:`TEST_RUNNER` setting.
+
+.. versionadded:: 1.4
+.. django-admin-option:: --liveserver
+
+The ``--liveserver`` option can be used to override the default address where
+the live server (used with :class:`~django.test.LiveServerTestCase`) is
+expected to run from. The default value is ``localhost:8081``.
testserver <fixture fixture ...>
--------------------------------