Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
Julien Phalip authored February 15, 2012
9  docs/releases/1.4-alpha-1.txt
@@ -50,14 +50,13 @@ What's new in Django 1.4
50 50
 Support for in-browser testing frameworks
51 51
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
52 52
 
53  
-Django 1.4 now supports integration with in-browser testing frameworks such
54  
-as Selenium_ or Windmill_ thanks to the :class:`django.test.LiveServerTestCase`
55  
-base class, allowing you to test the interactions between your site's front and
56  
-back ends more comprehensively. See the
  53
+Django 1.4 supports integration with in-browser testing frameworks like
  54
+Selenium_. The new :class:`django.test.LiveServerTestCase` base class lets you
  55
+test the interactions between your site's front and back ends more
  56
+comprehensively. See the
57 57
 :class:`documentation<django.test.LiveServerTestCase>` for more details and
58 58
 concrete examples.
59 59
 
60  
-.. _Windmill: http://www.getwindmill.com/
61 60
 .. _Selenium: http://seleniumhq.org/
62 61
 
63 62
 ``SELECT FOR UPDATE`` support
9  docs/releases/1.4-beta-1.txt
@@ -50,14 +50,13 @@ What's new in Django 1.4
50 50
 Support for in-browser testing frameworks
51 51
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
52 52
 
53  
-Django 1.4 now supports integration with in-browser testing frameworks such
54  
-as Selenium_ or Windmill_ thanks to the :class:`django.test.LiveServerTestCase`
55  
-base class, allowing you to test the interactions between your site's front and
56  
-back ends more comprehensively. See the
  53
+Django 1.4 supports integration with in-browser testing frameworks like
  54
+Selenium_. The new :class:`django.test.LiveServerTestCase` base class lets you
  55
+test the interactions between your site's front and back ends more
  56
+comprehensively. See the
57 57
 :class:`documentation<django.test.LiveServerTestCase>` for more details and
58 58
 concrete examples.
59 59
 
60  
-.. _Windmill: http://www.getwindmill.com/
61 60
 .. _Selenium: http://seleniumhq.org/
62 61
 
63 62
 ``SELECT FOR UPDATE`` support
9  docs/releases/1.4.txt
@@ -39,14 +39,13 @@ What's new in Django 1.4
39 39
 Support for in-browser testing frameworks
40 40
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
41 41
 
42  
-Django 1.4 supports integration with in-browser testing frameworks such
43  
-as Selenium_ or Windmill_. The new :class:`django.test.LiveServerTestCase`
44  
-base class lets you test the interactions between your site's front and
45  
-back ends more comprehensively. See the
  42
+Django 1.4 supports integration with in-browser testing frameworks like
  43
+Selenium_. The new :class:`django.test.LiveServerTestCase` base class lets you
  44
+test the interactions between your site's front and back ends more
  45
+comprehensively. See the
46 46
 :class:`documentation<django.test.LiveServerTestCase>` for more details and
47 47
 concrete examples.
48 48
 
49  
-.. _Windmill: http://www.getwindmill.com/
50 49
 .. _Selenium: http://seleniumhq.org/
51 50
 
52 51
 ``SELECT FOR UPDATE`` support
19  docs/topics/testing.txt
@@ -581,16 +581,16 @@ Some of the things you can do with the test client are:
581 581
 * Test that a given request is rendered by a given Django template, with
582 582
   a template context that contains certain values.
583 583
 
584  
-Note that the test client is not intended to be a replacement for Windmill_,
585  
-Selenium_, or other "in-browser" frameworks. Django's test client has
586  
-a different focus. In short:
  584
+Note that the test client is not intended to be a replacement for Selenium_ or
  585
+other "in-browser" frameworks. Django's test client has a different focus. In
  586
+short:
587 587
 
588 588
 * Use Django's test client to establish that the correct view is being
589 589
   called and that the view is collecting the correct context data.
590 590
 
591  
-* Use in-browser frameworks such as Windmill_ and Selenium_ to test *rendered*
592  
-  HTML and the *behavior* of Web pages, namely JavaScript functionality. Django
593  
-  also provides special support for those frameworks; see the section on
  591
+* Use in-browser frameworks like Selenium_ to test *rendered* HTML and the
  592
+  *behavior* of Web pages, namely JavaScript functionality. Django also
  593
+  provides special support for those frameworks; see the section on
594 594
   :class:`~django.test.LiveServerTestCase` for more details.
595 595
 
596 596
 A comprehensive test suite should use a combination of both test types.
@@ -1840,9 +1840,9 @@ Live test server
1840 1840
 :class:`~django.test.TransactionTestCase` with one extra feature: it launches a
1841 1841
 live Django server in the background on setup, and shuts it down on teardown.
1842 1842
 This allows the use of automated test clients other than the
1843  
-:ref:`Django dummy client <test-client>` such as, for example, the Selenium_ or
1844  
-Windmill_ clients, to execute a series of functional tests inside a browser and
1845  
-simulate a real user's actions.
  1843
+:ref:`Django dummy client <test-client>` such as, for example, the Selenium_
  1844
+client, to execute a series of functional tests inside a browser and simulate a
  1845
+real user's actions.
1846 1846
 
1847 1847
 By default the live server's address is `'localhost:8081'` and the full URL
1848 1848
 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
1928 1928
 example above is just a tiny fraction of what the Selenium client can do; check
1929 1929
 out the `full reference`_ for more details.
1930 1930
 
1931  
-.. _Windmill: http://www.getwindmill.com/
1932 1931
 .. _Selenium: http://seleniumhq.org/
1933 1932
 .. _selenium package: http://pypi.python.org/pypi/selenium
1934 1933
 .. _full reference: http://readthedocs.org/docs/selenium-python/en/latest/api.html

0 notes on commit 41256d2

Please sign in to comment.
Something went wrong with that request. Please try again.