From 2f02a05ffb45be68b4164b4785ff1826833150a3 Mon Sep 17 00:00:00 2001 From: Julien Phalip Date: Thu, 22 Dec 2011 08:33:58 +0000 Subject: 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. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.djangoproject.com/svn/django/trunk@17241 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/django-admin.txt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'docs/ref') 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 -------------------------------- -- cgit v1.3