1
0
mirror of https://github.com/django/django.git synced 2024-11-18 15:34:16 +00:00
Commit Graph

108 Commits

Author SHA1 Message Date
Timo Graham
0ccbb5356a Fixed #17571 - Fixed documentation of skipUnlessDBFeature; thanks EnTeQuAk for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17459 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-05 15:53:09 +00:00
Adrian Holovaty
6ecadcbdd2 Made a bunch more edits up until [17418]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-03 20:45:45 +00:00
Carl Meyer
844a24bbb9 Fixed #16921 -- Added assertHTMLEqual and assertHTMLNotEqual assertions, and converted Django tests to use them where appropriate. Thanks Greg Müllegger.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-31 20:36:11 +00:00
Carl Meyer
a678e9ea65 Fixed #17604 - Added context-manager capability to assertTemplateUsed and assertTemplateNotUsed. Thanks Greg Müllegger.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17412 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-31 19:23:09 +00:00
Adrian Holovaty
ffb0519d44 Edited testing.txt changes from [17289]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 20:34:07 +00:00
Adrian Holovaty
32ee74f89e Edited testing.txt changes from [17283]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17306 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-30 20:29:27 +00:00
Julien Phalip
0bf2d33770 Added the ability to specify multiple ports available for the LiveServerTestCase WSGI server. This allows multiple processes to run the tests simultaneously and is particularly useful in a continuous integration context. Many thanks to Aymeric Augustin for the suggestions and feedback.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-29 20:22:13 +00:00
Julien Phalip
ec07a30e82 Indicated the exact version that is required to use the "WebDriverWait" example in the testing doc.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17285 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-29 07:28:21 +00:00
Julien Phalip
a343a84ce6 Added the wait_until() and wait_loaded_tag() methods to AdminSeleniumWebDriverTestCase to prevent some concurrency issues with in-memory SQLite database access in the admin Selenium tests. Thanks to Florian Apolloner, Anssi Kääriäinen and Aymeric Augustin for their help debugging this problem.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-28 22:20:30 +00:00
Julien Phalip
2f02a05ffb 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
2011-12-22 08:33:58 +00:00
Ramiro Morales
5a48cb5f61 Added note about assertFieldOutput being new in 1.4.
Thanks dpifke for report and patch.

Fixes #17433

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17230 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-19 11:53:16 +00:00
Adrian Holovaty
2494dd25f5 Fixed #17364 -- Fixed typos in topics/testing.txt. Thanks, movielady
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17214 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-17 02:03:56 +00:00
Aymeric Augustin
01f70349c9 Fixed #17248 -- Added a missing versionadded directive for TestCase.assertRaisesMessage.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-18 07:09:18 +00:00
Luke Plant
d1e5c55258 Fixed many more ReST indentation errors, somehow accidentally missed from [16955]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-14 00:12:01 +00:00
Carl Meyer
b6ad1afa68 Fixed #17011 - Made override_settings modify a decorated class in-place rather than creating a dynamic subclass, so as to avoid infinite recursion when used with super(). Thanks jsdalton for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-08 08:16:17 +00:00
Ramiro Morales
932b1b8d6d Converted links to external topics so they use intersphinx extension markup.
This allows to make these links more resilent to changes in the target URLs.
Thanks Jannis for the report and Aymeric Augustin for the patch.

Fixes #16586.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-04 21:17:30 +00:00
Malcolm Tredinnick
0686c6b0ee Add the ability to do unordered comparisons in assertQuerysetEqual.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16654 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 03:38:18 +00:00
Russell Keith-Magee
2664fa1896 Fixed #15838 -- Promoted assertFieldOutput to a general test utility. Thanks to Ramiro Morales for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 02:32:37 +00:00
Gabriel Hurley
41b31b4d09 Fixed #16608 -- Clarified the description of the destroy_test_db method and cleaned up various other reST/Sphinx-related bits in the testing docs. Thanks to Stan for the report and Julien for the draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-18 22:31:32 +00:00
Ramiro Morales
326949e444 Fixed #14503 -- Unified multiple implementations of test cases assert* methods that verify a given exception is raised by a callable throughout the Django test suite.
Replaced them with a new assertRaisesMessage method of a new SimpleTestCase, a lightweight subclass of unittest.TestCase. Both are also available for usage in user tests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-13 00:42:08 +00:00
Timo Graham
bbe63f07c4 Fixed #16528 - Documented test runner returns 1, regardless of the number of test failures; thanks teraom.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16584 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-06 18:54:21 +00:00
Chris Beaven
4f50d248a8 Fixes #16532 -- Clearer explanation of how the test client expects HTTP headers to be passed. Thanks for the patch, Ricardo Bánffy.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16554 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-28 22:09:26 +00:00
Russell Keith-Magee
046ffa483e Fixed #16185, #15675 -- Added the ability for test runners to define custom options, and to specify a custom test runner at the command line. Thanks to Dmitry Jemerov and Mikołaj Siedlarek for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16352 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-10 08:26:05 +00:00
Ramiro Morales
dff31de20a Fixed #16155 -- Removed Python 2.4 compatibility constructs from code and mentions from docs. Thanks Aymeric Augustin for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16349 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-09 20:01:28 +00:00
Jannis Leidel
49f57a5d28 Fixed #15992 -- Added more references to settings. Thanks, aaugustin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-29 17:41:04 +00:00
Gabriel Hurley
8ecda079a8 Correcting a typo and minor grammatical issues from [16237].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-18 19:39:50 +00:00
Jannis Leidel
a3a53e0b73 Fixed #15561 -- Extended test setting override code added in r16165 with a decorator and a signal for setting changes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-18 12:08:53 +00:00
Simon Meers
5ecb88c146 Fixed #16014 -- numerous documentation typos -- thanks psmith.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16220 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-13 04:33:42 +00:00
Chris Beaven
4d26f6512c Fixes #15595 -- emphasize the benefits of django.test.TestCase. Thanks for the patch Shawn Milochik
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16214 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-11 21:29:14 +00:00
Jannis Leidel
0dc6420b3e Added TestCase.settings context manager to easily override settings in test methods.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-05-06 13:29:24 +00:00
Timo Graham
2830872d60 Fixed #15876 - Document that test.client.RequestFactory doesn't support sessions or request-altering middleware; thanks slinkp for the suggestion, ShawnMilo for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16128 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-30 12:59:24 +00:00
Luke Plant
26cda43012 Switched to HTML5 doctype in all Django supplied templates.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-20 17:40:53 +00:00
Adrian Holovaty
9a279edc1c Fixed some ReST errors from e-mail -> email change in docs, and changed some docs that shouldn't have been changed (because translation strings haven't been converted yet)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-01 16:18:23 +00:00
Adrian Holovaty
94af19c43f Changed e-mail to email throughout documentation and codebase. The one exception is translation strings, which I didn't want to disrupt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-01 16:10:22 +00:00
Russell Keith-Magee
afd040d4d3 Updated test assertions that have been deprecated by the move to unittest2. In summary, this means:
assert_ -> assertTrue
 assertEquals -> assertEqual
 failUnless -> assertTrue

For full details, see http://www.voidspace.org.uk/python/articles/unittest2.shtml#deprecations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03 15:04:39 +00:00
Russell Keith-Magee
b31a1b9926 Refs #14661 -- Clarified the handling of initial data injected via custom SQL.
This is BACKWARDS INCOMPATIBLE CHANGE for anyone relying on SQL-injected initial data in a test case.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-18 16:43:01 +00:00
Timo Graham
5fd93e1c36 Fixed #13628 - Discourage the use of doctests; thanks d0ugal for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15227 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-16 19:22:36 +00:00
Timo Graham
2ea93f9327 Fixed #14000 - remove versionadded/changed tags for Django 1.0 and 1.1
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-26 00:37:14 +00:00
Ramiro Morales
c58d25cf8d Fixed a couple of typos and small errors from r14696 and r14822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-09 00:26:59 +00:00
Russell Keith-Magee
d53fd71acb Corrected incomplete and incorrect docs from r14822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 01:03:39 +00:00
Russell Keith-Magee
b11c21d69a Fixed #14799 -- Provided a full solution for test database creation order problems.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-05 00:44:34 +00:00
Luke Plant
a77fad23c2 Fixed ReST error in assertNumQueries docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-30 12:46:22 +00:00
Alex Gaynor
4a4d7bc27d Fixed #14771 -- corrected a typo in the testing docs. Thanks to Christian Oudard for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-24 19:51:31 +00:00
Adrian Holovaty
1356947fad Edited docs/topics/testing.txt change from [14058]
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14368 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-27 21:50:58 +00:00
Ramiro Morales
b874549807 Fixed #14173 -- Added sections about contrib apps-provided commands to django-admin.py docs.
Added documentation about changepassword, pointers to GeoDjango, sitemaps and
staticfiles commands, grouped them by app.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14327 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 16:37:51 +00:00
Gabriel Hurley
3321171952 Correcting a typo and a copy/paste problem in the RequestFactory docs from [14192].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14202 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-13 11:29:18 +00:00
Russell Keith-Magee
98dd10e62d Clarified the text and example describing the RequestFactory. Thanks to Alex for the feedback.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14192 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 23:55:38 +00:00
Russell Keith-Magee
eec45e8b71 Fixed #9002 -- Added a RequestFactory. This allows you to create request instances so you can unit test views as standalone functions. Thanks to Simon Willison for the suggestion and snippet on which this patch was originally based.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14191 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 23:37:47 +00:00
Alex Gaynor
5506653b77 Fixed #5416 -- Added TestCase.assertNumQueries, which tests that a given function executes the correct number of queries.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14183 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 03:33:19 +00:00
Gabriel Hurley
f85f79eb4a Fixed a few typos in the unittest2 docs introduced in [14139].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14149 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 19:19:01 +00:00