summaryrefslogtreecommitdiff
path: root/tests/regressiontests/templates
AgeCommit message (Collapse)Author
2012-03-24[1.3.X] Fixed #16677 -- Fixed the future version of the ssi template tag to ↵Aymeric Augustin
work with template file names that contain spaces. Backport of r16687 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@17804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-22[1.3.X] Don't let ALLOWED_INCLUDE_ROOTS be accidentally set to a string ↵Chris Beaven
rather than a tuple. Backport of r17571 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@17572 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-04-22[1.3.X] Fixes regression #15721 -- {% include %} and RequestContext not ↵Chris Beaven
working together. Refs #15814. Backport of r16031, plus the utility from r16030. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@16089 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15Added file mistakenly ommitted from r15819Russell Keith-Magee
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15821 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-15Fixed #14960 -- Added tests for inclusion tags. Thanks to Julien Phalip for ↵Russell Keith-Magee
the report, and to avenet and Paul Bissex for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-14Fixed #15609 -- Fixed some 'raise' statements to use the newer style syntax. ↵Adrian Holovaty
Thanks, DaNmarner git-svn-id: http://code.djangoproject.com/svn/django/trunk@15811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-10Fixed #15572 - include with "only" option discards context properties (such ↵Luke Plant
as autoescape) Thanks to dfoerster for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-08Fixed #15570 -- Corrected a flaw in the design of the silent flag on {% ↵Russell Keith-Magee
cycle %}. Thanks to Brian Neal for the report, and to Andrew and Jannis for the design consult. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-03Updated test assertions that have been deprecated by the move to unittest2. ↵Russell Keith-Magee
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-03Fixed #15502 -- Ensure that nested TemplateDoesNotExist errors are ↵Russell Keith-Magee
propegated with a meaningful error message when loaded using select_template. Thanks to jaylett for the report, and GDorn for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15717 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-02Fixed #15535 -- Stopped the blocktrans template tag from raising a KeyError ↵Jannis Leidel
if an included variable can't be found in the context. Thanks, melinath. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15709 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-20Ensure render_to_string leaves the context instance stack in the state it ↵Chris Beaven
was originally passed in. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-04Fixed #14046 -- Made {% include %} behave the same, regardless of whether ↵Russell Keith-Magee
the template included is named by variable or constant string. Thanks to defcube for the report, and George Karpenkov for the draft patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27Fixed #14818 -- Added explicit tests for the way that the cycle tag handles ↵Russell Keith-Magee
escaping. Thanks to steveire. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15335 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-27Fixed #15041 -- Added tests for the spaceless tag interacting with escaping. ↵Russell Keith-Magee
Thanks to steveire. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15334 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24Fixed #15012 -- Added post-rendering callbacks to TemplateResponse so that ↵Russell Keith-Magee
decorators (in particular, the cache decorator) can defer processing until after rendering has occurred. Thanks to Joshua Ginsberg for the draft patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-21Fixed a few translation related tests:Jannis Leidel
* Extended the admin i18n view to also take the admin translation catalogues into account. * Use a translation string from the core translations to test LOCALE_PATHS. * Fixed Russian translation of singular forms. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15273 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-16Fixed #15083 -- Corrected the order of TemplateResponse middleware handling, ↵Russell Keith-Magee
ensuring that custom URLConfs are valid, and that ResponseMiddleware is invoked if the TemplateResponseMiddleware causes errors. Thanks to Sayane for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-05Fixed #15010 -- Added current_app parameter to close gap between ↵Jannis Leidel
TemplateResponse and render method. Thanks, acdha. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21Fixed #11675 -- Added support for the PyLibMC cache library. In order to ↵Russell Keith-Magee
support this, and clean up some other 1.3 caching additions, this patch also includes some changes to the way caches are defined. This means you can now have multiple caches, in the same way you have multiple databases. A huge thanks to Jacob Burch for the work on the PyLibMC backend, and to Jannis for his work on the cache definition changes. git-svn-id: http://code.djangoproject.com/svn/django/trunk@15005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19Fixed #7153 -- _resolve_lookup now does a better job of resolving callables ↵Chris Beaven
and correctly catches all silent_variable_exceptions git-svn-id: http://code.djangoproject.com/svn/django/trunk@14992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19Fixed #14908 -- Added a 'takes_context' argument to simple_tag. Thanks to ↵Russell Keith-Magee
Julien Phalip for driving the issue and providing the final patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18Fixes #7817 and #9456.Chris Beaven
- The include tag now has a 'with' option to include to provide extra context vairables to the included template. - The include tag now has an 'only' option to exclude the current context when rendering the included template. - The with tag now accepts multiple variable assignments. - The with, include and blocktrans tags now use a new keyword argument format for variable assignments (e.g. `{% with foo=1 bar=2 %}`). git-svn-id: http://code.djangoproject.com/svn/django/trunk@14922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-12Fixed #4030 -- Added ability to translate language names. Thanks to Antti ↵Jannis Leidel
Kaihola and Ramiro Morales for the initial patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-07Fixed #12815 -- Added TemplateResponse, a lazy-evaluated Response class. ↵Russell Keith-Magee
Thanks to Simon Willison for the original idea, and to Mikhail Korobov and Ivan Sagalaev for their assistance, including the draft patch from Mikhail. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14850 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-27Fixed #12248 -- Refactored django.template to get code out of __init__.py, ↵Russell Keith-Magee
to help with avoiding circular import dependencies. Thanks to Tom Tobin for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-20Fixed #14389, #9666 -- Started the migration path to make the first argument ↵Russell Keith-Magee
to url and ssi template tags syntactically consistent with other tags. Thanks to Sean Brant for the draft patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17Fixed #14693, #14709 -- Backwards incompatible change to rectify the ↵Jannis Leidel
confusion around the STATICFILES_URL and STATICFILES_ROOT settings. * Two new global settings that will be used by -- **but are not limited to** -- the staticfiles app: STATIC_ROOT and STATIC_URL. * Moving the 'django.contrib.staticfiles.templatetags.staticfiles' template tag to the core ('django.templatetags.static') and renaming it to 'get_static_prefix'. * Moving the context processor 'django.contrib.staticfiles.context_processors.staticfiles' to the core ('django.core.context_processors.static') and renaming it to 'static'. * Paths in media definitions will use STATIC_URL as the prefix if the value is not None, and falls back to the previously used MEDIA_URL. Thanks again to the community for constructive criticism and Carl and Russ for sanity-inducing discussions on IRC. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11Fixed #14508 - test suite silences warnings.Luke Plant
Utility functions get_warnings_state and save_warnings_state have been added to django.test.utils, and methods to django.test.TestCase for convenience. The implementation is based on the catch_warnings context manager from Python 2.6. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14526 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-04Converted templates doctests into unittests. We have always been at war ↵Alex Gaynor
with doctests. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14448 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02Fixed #13567 -- Added a 'silent' argument to the cycle tag, so that you can ↵Russell Keith-Magee
declare a cycle without producing a value in the template. Thanks to anentropic for the suggestion and initial patch, and Łukasz Rekucki for the final patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-02Fixed a few more cases of the tests not properly restoring sys.path (follow ↵Alex Gaynor
up on [14429]). git-svn-id: http://code.djangoproject.com/svn/django/trunk@14431 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-16Fixed #14126 -- Fixed an issue with changes to the blocktrans tag introduced ↵Jannis Leidel
in r13967 related to multiple plural forms. Thanks, mark0978, svetlyak40wt and Ramiro. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11Fixed #12991 -- Added unittest2 support. Thanks to PaulM for the draft ↵Russell Keith-Magee
patch, and to Luke, Karen, Justin, Alex, Łukasz Rekucki, and Chuck Harmston for their help testing and reviewing the final patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11Fixed #14436 -- Escalated 1.2 PendingDeprecationWarnings to ↵Russell Keith-Magee
DeprecationWarnings, and removed 1.1 deprecated code. git-svn-id: http://code.djangoproject.com/svn/django/trunk@14138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-01Fixed #13568 -- Fixed the blocktrans tag to not raise a KeyError if the ↵Jannis Leidel
number of variables in the singular and the plural block differ. Thanks, deloide. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13Fixed #13765 - 'safe' parameter for urlencode filterLuke Plant
Thanks to KyleMac for the suggestion and SmileyChris for the patch git-svn-id: http://code.djangoproject.com/svn/django/trunk@13849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12Modified the egg template loader tests; firstly to ensure that we are ↵Russell Keith-Magee
testing the new, non-deprecated interface; secondly to ensure that the old deprecated interface is also tested, but deprecation warnings are silenced. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12Fixed #13702 -- Made sure to actually fall back to the l10n format strings ↵Jannis Leidel
provided in the settings, when disabled. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13770 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-07Fixed #13475 - for tag raises an exception when trying to unpack a ↵Luke Plant
non-iterable item Thanks to SmileyChris for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-03Fixed #11377: the template join filter now correctly escapes the joiner, too.Jacob Kaplan-Moss
Thanks, Stephen Kelly. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13464 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-03Fixed #11376: added some extra tests for autoescaping subtleties.Jacob Kaplan-Moss
Thanks, Stephen Kelly. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13461 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-03Fixed #11288: added some tests for the handling of number-like variables in ↵Jacob Kaplan-Moss
templates. Thanks, Stephen Kelly. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13460 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-21Fixed #13573 -- Corrected problem with template caching when template ↵Russell Keith-Magee
directories are provided. Thanks to lamby for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13295 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-19Fixed #13373 -- Ensured that {% if %} statements will short circuit template ↵Russell Keith-Magee
logic and not evaluate clauses that don't require evaluation. Thanks to Jerry Stratton for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13001 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15Add file mistakenly left out of r12986. Refs #13334.Karen Tracey
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15Fixed #13334: Restored ability to load template tags from eggs. Again thanks ↵Karen Tracey
Ramiro and metzen for pointers on how to find out if a module loaded from an egg has a particular submodule, and Russ for review. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12Refs #13167 -- Corrected a regression in the way non-existent variables are ↵Russell Keith-Magee
handled by {% if %} tags. Thanks to ohmi2 for pointing out the regression in 1.2, and Karen for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-10Fixed #13275 -- Modified the parsing logic of the {% url %} tag to avoid ↵Russell Keith-Magee
catastrophic backtracking. Thanks to SmileyChris for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-30Fixed #12945 -- Corrected the parsing of arguments in {% url %} when the ↵Russell Keith-Magee
argument list has spaces between commas. This is a revised version of r12503, which was a fix for #12072. Thanks to SmileyChris for the patch, and to dmoisset for finding all the places in the docs that the old style syntax was used. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12889 bcc190cf-cafb-0310-a4f2-bffc1f526a37