Fixed #17652 -- Removed all mentions to Windmill from the docs as that project doesn't integrate well with Django at this time.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17524 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Julien Phalip 2012-02-15 17:33:51 +00:00
parent 2000f375cd
commit 41256d2341
4 changed files with 21 additions and 25 deletions

View File

@ -50,14 +50,13 @@ What's new in Django 1.4
Support for in-browser testing frameworks Support for in-browser testing frameworks
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Django 1.4 now supports integration with in-browser testing frameworks such Django 1.4 supports integration with in-browser testing frameworks like
as Selenium_ or Windmill_ thanks to the :class:`django.test.LiveServerTestCase` Selenium_. The new :class:`django.test.LiveServerTestCase` base class lets you
base class, allowing you to test the interactions between your site's front and test the interactions between your site's front and back ends more
back ends more comprehensively. See the comprehensively. See the
:class:`documentation<django.test.LiveServerTestCase>` for more details and :class:`documentation<django.test.LiveServerTestCase>` for more details and
concrete examples. concrete examples.
.. _Windmill: http://www.getwindmill.com/
.. _Selenium: http://seleniumhq.org/ .. _Selenium: http://seleniumhq.org/
``SELECT FOR UPDATE`` support ``SELECT FOR UPDATE`` support

View File

@ -50,14 +50,13 @@ What's new in Django 1.4
Support for in-browser testing frameworks Support for in-browser testing frameworks
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Django 1.4 now supports integration with in-browser testing frameworks such Django 1.4 supports integration with in-browser testing frameworks like
as Selenium_ or Windmill_ thanks to the :class:`django.test.LiveServerTestCase` Selenium_. The new :class:`django.test.LiveServerTestCase` base class lets you
base class, allowing you to test the interactions between your site's front and test the interactions between your site's front and back ends more
back ends more comprehensively. See the comprehensively. See the
:class:`documentation<django.test.LiveServerTestCase>` for more details and :class:`documentation<django.test.LiveServerTestCase>` for more details and
concrete examples. concrete examples.
.. _Windmill: http://www.getwindmill.com/
.. _Selenium: http://seleniumhq.org/ .. _Selenium: http://seleniumhq.org/
``SELECT FOR UPDATE`` support ``SELECT FOR UPDATE`` support

View File

@ -39,14 +39,13 @@ What's new in Django 1.4
Support for in-browser testing frameworks Support for in-browser testing frameworks
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Django 1.4 supports integration with in-browser testing frameworks such Django 1.4 supports integration with in-browser testing frameworks like
as Selenium_ or Windmill_. The new :class:`django.test.LiveServerTestCase` Selenium_. The new :class:`django.test.LiveServerTestCase` base class lets you
base class lets you test the interactions between your site's front and test the interactions between your site's front and back ends more
back ends more comprehensively. See the comprehensively. See the
:class:`documentation<django.test.LiveServerTestCase>` for more details and :class:`documentation<django.test.LiveServerTestCase>` for more details and
concrete examples. concrete examples.
.. _Windmill: http://www.getwindmill.com/
.. _Selenium: http://seleniumhq.org/ .. _Selenium: http://seleniumhq.org/
``SELECT FOR UPDATE`` support ``SELECT FOR UPDATE`` support

View File

@ -581,16 +581,16 @@ Some of the things you can do with the test client are:
* Test that a given request is rendered by a given Django template, with * Test that a given request is rendered by a given Django template, with
a template context that contains certain values. a template context that contains certain values.
Note that the test client is not intended to be a replacement for Windmill_, Note that the test client is not intended to be a replacement for Selenium_ or
Selenium_, or other "in-browser" frameworks. Django's test client has other "in-browser" frameworks. Django's test client has a different focus. In
a different focus. In short: short:
* Use Django's test client to establish that the correct view is being * Use Django's test client to establish that the correct view is being
called and that the view is collecting the correct context data. called and that the view is collecting the correct context data.
* Use in-browser frameworks such as Windmill_ and Selenium_ to test *rendered* * Use in-browser frameworks like Selenium_ to test *rendered* HTML and the
HTML and the *behavior* of Web pages, namely JavaScript functionality. Django *behavior* of Web pages, namely JavaScript functionality. Django also
also provides special support for those frameworks; see the section on provides special support for those frameworks; see the section on
:class:`~django.test.LiveServerTestCase` for more details. :class:`~django.test.LiveServerTestCase` for more details.
A comprehensive test suite should use a combination of both test types. A comprehensive test suite should use a combination of both test types.
@ -1840,9 +1840,9 @@ Live test server
:class:`~django.test.TransactionTestCase` with one extra feature: it launches a :class:`~django.test.TransactionTestCase` with one extra feature: it launches a
live Django server in the background on setup, and shuts it down on teardown. live Django server in the background on setup, and shuts it down on teardown.
This allows the use of automated test clients other than the This allows the use of automated test clients other than the
:ref:`Django dummy client <test-client>` such as, for example, the Selenium_ or :ref:`Django dummy client <test-client>` such as, for example, the Selenium_
Windmill_ clients, to execute a series of functional tests inside a browser and client, to execute a series of functional tests inside a browser and simulate a
simulate a real user's actions. real user's actions.
By default the live server's address is `'localhost:8081'` and the full URL By default the live server's address is `'localhost:8081'` and the full URL
can be accessed during the tests with ``self.live_server_url``. If you'd like can be accessed during the tests with ``self.live_server_url``. If you'd like
@ -1928,7 +1928,6 @@ case you do not have Firefox installed or wish to use another browser. The
example above is just a tiny fraction of what the Selenium client can do; check example above is just a tiny fraction of what the Selenium client can do; check
out the `full reference`_ for more details. out the `full reference`_ for more details.
.. _Windmill: http://www.getwindmill.com/
.. _Selenium: http://seleniumhq.org/ .. _Selenium: http://seleniumhq.org/
.. _selenium package: http://pypi.python.org/pypi/selenium .. _selenium package: http://pypi.python.org/pypi/selenium
.. _full reference: http://readthedocs.org/docs/selenium-python/en/latest/api.html .. _full reference: http://readthedocs.org/docs/selenium-python/en/latest/api.html