Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #17652 -- Removed all mentions to Windmill from the docs as tha…

…t 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
  • Loading branch information...
commit 41256d2341b8ecf4c4987e6acc3d84aafe2674c8 1 parent 2000f37
@jphalip jphalip authored
View
9 docs/releases/1.4-alpha-1.txt
@@ -50,14 +50,13 @@ What's new in Django 1.4
Support for in-browser testing frameworks
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Django 1.4 now supports integration with in-browser testing frameworks such
-as Selenium_ or Windmill_ thanks to the :class:`django.test.LiveServerTestCase`
-base class, allowing you to test the interactions between your site's front and
-back ends more comprehensively. See the
+Django 1.4 supports integration with in-browser testing frameworks like
+Selenium_. The new :class:`django.test.LiveServerTestCase` base class lets you
+test the interactions between your site's front and back ends more
+comprehensively. See the
:class:`documentation<django.test.LiveServerTestCase>` for more details and
concrete examples.
-.. _Windmill: http://www.getwindmill.com/
.. _Selenium: http://seleniumhq.org/
``SELECT FOR UPDATE`` support
View
9 docs/releases/1.4-beta-1.txt
@@ -50,14 +50,13 @@ What's new in Django 1.4
Support for in-browser testing frameworks
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Django 1.4 now supports integration with in-browser testing frameworks such
-as Selenium_ or Windmill_ thanks to the :class:`django.test.LiveServerTestCase`
-base class, allowing you to test the interactions between your site's front and
-back ends more comprehensively. See the
+Django 1.4 supports integration with in-browser testing frameworks like
+Selenium_. The new :class:`django.test.LiveServerTestCase` base class lets you
+test the interactions between your site's front and back ends more
+comprehensively. See the
:class:`documentation<django.test.LiveServerTestCase>` for more details and
concrete examples.
-.. _Windmill: http://www.getwindmill.com/
.. _Selenium: http://seleniumhq.org/
``SELECT FOR UPDATE`` support
View
9 docs/releases/1.4.txt
@@ -39,14 +39,13 @@ What's new in Django 1.4
Support for in-browser testing frameworks
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Django 1.4 supports integration with in-browser testing frameworks such
-as Selenium_ or Windmill_. The new :class:`django.test.LiveServerTestCase`
-base class lets you test the interactions between your site's front and
-back ends more comprehensively. See the
+Django 1.4 supports integration with in-browser testing frameworks like
+Selenium_. The new :class:`django.test.LiveServerTestCase` base class lets you
+test the interactions between your site's front and back ends more
+comprehensively. See the
:class:`documentation<django.test.LiveServerTestCase>` for more details and
concrete examples.
-.. _Windmill: http://www.getwindmill.com/
.. _Selenium: http://seleniumhq.org/
``SELECT FOR UPDATE`` support
View
19 docs/topics/testing.txt
@@ -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
a template context that contains certain values.
-Note that the test client is not intended to be a replacement for Windmill_,
-Selenium_, or other "in-browser" frameworks. Django's test client has
-a different focus. In short:
+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 in-browser frameworks such as Windmill_ and Selenium_ to test *rendered*
- HTML and the *behavior* of Web pages, namely JavaScript functionality. Django
- also provides special support for those frameworks; see the section on
+* Use in-browser frameworks like Selenium_ to test *rendered* HTML and the
+ *behavior* of Web pages, namely JavaScript functionality. Django also
+ provides special support for those frameworks; see the section on
:class:`~django.test.LiveServerTestCase` for more details.
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
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
-:ref:`Django dummy client <test-client>` such as, for example, the Selenium_ or
-Windmill_ clients, to execute a series of functional tests inside a browser and
-simulate a real user's actions.
+:ref:`Django dummy client <test-client>` such as, for example, the Selenium_
+client, to execute a series of functional tests inside a browser and simulate a
+real user's actions.
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
@@ -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
out the `full reference`_ for more details.
-.. _Windmill: http://www.getwindmill.com/
.. _Selenium: http://seleniumhq.org/
.. _selenium package: http://pypi.python.org/pypi/selenium
.. _full reference: http://readthedocs.org/docs/selenium-python/en/latest/api.html
Please sign in to comment.
Something went wrong with that request. Please try again.