aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures
Commit message (Collapse)AuthorAgeFilesLines
* Add a test for 'render :layout'Anton Astashov2011-02-031-0/+4
| | | | | | | | | To make sure it will show block contents if it is placed after 'render :partial' [#5557 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Recreate symlink in layouts for testsPiotr Sarnacki2010-12-311-0/+1
|
* ActionController::Base.helpers.sanitize ignores case in protocolTimothy N. Tsvetkov2010-12-301-1/+0
| | | | | | [#6044 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Make TranslationHelper#translate use the :rescue_format option in I18n 0.5.0Sven Fuchs2010-12-045-2/+3
| | | | | | Don't catch exceptions here. Instead only declare that we want exceptions to be rescued as :html, but also let users configure reactions to exceptions in I18n. Signed-off-by: José Valim <jose.valim@gmail.com>
* add the fixture fileNeeraj Singh2010-11-221-0/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Tests added for rendering partial with layout, when the partial contains ↵Santiago Pastorino2010-11-133-0/+10
| | | | another render layout with block call added missing fixtures
* Fix render partial with layout and no blockCarlos Antonio da Silva2010-11-111-0/+2
| | | | | | | | When using a render :partial with :layout call, without giving a block, if the given :partial had another render :partial call, the layout was not being rendered. This commit fixes this context by storing variables before rendering the partial, so they are not overrided in any successive call to render partials down the path. All ActionPack tests are ok.
* Fix issue with rendering partials and then yielding inside a render layout callCarlos Antonio da Silva2010-11-114-0/+6
| | | | | | | The given block was never being executed when another render :partial call existed before the yield call, due to the block being overriden. This commit also adds some more tests to render with :layout option.
* Deprecate old template handler API. Remove old handlers.José Valim2010-10-1015-6/+6
|
* fix rendering a partial with an array as its :object [#5746 state:resolved]Michael Koziarski2010-10-081-0/+1
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> Conflicts: actionpack/lib/action_view/render/partials.rb
* Test correct method behaviour.Emilio Tagua2010-09-291-1/+1
|
* Use redefine_method since baz is already defined.Emilio Tagua2010-09-281-1/+1
|
* Remove useless string line causing a warning.Emilio Tagua2010-09-281-1/+0
|
* Modified ActionDispatch::Static to allow passing multiple rootsPiotr Sarnacki2010-09-034-0/+4
|
* Be sure to call helper :all just on direct children. (Tests by Jesse Storimer)José Valim2010-08-262-0/+6
|
* Add clear_helpers as a way to clean up all helpers added to this controller, ↵José Valim2010-08-261-0/+5
| | | | maintaing just the helper with the same name as the controller.
* Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵Santiago Pastorino2010-08-146-15/+15
| | | | 's/[ \t]*$//' -i {} \;)
* layout_for works again with objects as specified in the documentation and ↵José Valim & Carlos Antonio da Silva2010-08-112-0/+2
| | | | Rails 2.3 [#5357 state:resolved]
* Fixed that an ArgumentError is thrown when request.session_options[:id] is ↵Michael Lovitt2010-06-271-0/+10
| | | | | | | | read in the following scenario: when the cookie store is used, and the session contains a serialized object of an unloaded class, and no session data accesses have occurred yet. Pushed the stale_session_check responsibility out of the SessionHash and down into the session store, closer to where the deserialization actually occurs. Added some test coverage for this case and others related to deserialization of unloaded types. [#4938] Signed-off-by: José Valim <jose.valim@gmail.com>
* Make sure a namespaced <%= render form %> still renders the _form partial ↵Jan De Poorter2010-06-201-0/+1
| | | | | | [#4784 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* render(:inline) in a layout before yield replaces original contentNeeraj Singh2010-06-131-0/+2
| | | | | | [#4777 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* fix translation test in actionpack [#4701 state:commited]Santiago Pastorino2010-05-291-1/+1
| | | | Signed-off-by: wycats <wycats@gmail.com>
* translate method doesn't support arrays anymore and is optimized to be used ↵Santiago Pastorino2010-05-243-2/+1
| | | | | | with strings or symbols Signed-off-by: José Valim <jose.valim@gmail.com>
* Revert "translation method for arrays on TranslationHelper module returns an ↵Santiago Pastorino2010-05-242-2/+2
| | | | | | | | array where values for keys of the form (.|_)html keys are html_safe" This reverts commit 05c95b5c5815c0b3ae55fda7a897922b7f3ec2c7. Signed-off-by: José Valim <jose.valim@gmail.com>
* translation method for arrays on TranslationHelper module returns an array ↵Santiago Pastorino2010-05-242-2/+2
| | | | | | | | where values for keys of the form (.|_)html keys are html_safe [#4675] Signed-off-by: José Valim <jose.valim@gmail.com>
* Revert "Moved encoding work in progress to a feature branch."wycats2010-05-174-5/+4
| | | | This reverts commit ade756fe42423033bae8e5aea8f58782f7a6c517.
* Moved encoding work in progress to a feature branch.Jeremy Kemper2010-05-164-4/+5
| | | | This reverts commits af0d1a88157942c6e6398dbf73891cff1e152405 and 64d109e3539ad600f58536d3ecabd2f87b67fd1c.
* Significantly improved internal encoding heuristics and support.wycats2010-05-164-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | * Default Encoding.default_internal to UTF-8 * Eliminated the use of file-wide magic comments to coerce code evaluated inside the file * Read templates as BINARY, use default_external or template-wide magic comments inside the Template to set the initial encoding * This means that template handlers in Ruby 1.9 will receive Strings encoded in default_internal (UTF-8 by default) * Create a better Exception for encoding issues, and use it when the template source has bytes that are not compatible with the specified encoding * Allow template handlers to opt-into handling BINARY. If they do so, they need to do some of their own manual encoding work * Added a "Configuration Gotchas" section to the intro Rails Guide instructing users to use UTF-8 for everything * Use config.encoding= in Ruby 1.8, and raise if a value that is an invalid $KCODE value is used Also: * Fixed a few tests that were assert() rather than assert_equal() and were caught by Minitest requiring a String for the message * Fixed a test where an assert_select was misformed, also caught by Minitest being more restrictive * Fixed a test where a Rack response was returning a String rather than an Enumerable
* Check blocks are not incorrectly detected when compiling erubis templates ↵Simon Jefford2010-05-161-0/+1
| | | | | | [#4575 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* partial counters with :as [#2804 state:resolved]Jeff Kreeftmeijer2010-05-151-0/+1
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Changed translate helper so that it doesn’t mark every translation as safe ↵Craig Davey2010-04-131-1/+1
| | | | | | HTML. Only keys with a "_html" suffix and keys named "html" are considered to be safe HTML. All other translations are left untouched. Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Expect an incompatible encoding exception when a template with a magic ↵Jeremy Kemper2010-04-085-2/+10
| | | | comment renders a partial without one and its source encoding doesn't match the default external encoding
* Expect an incompatible encoding exception when a template doesn't have a ↵Jeremy Kemper2010-04-082-2/+2
| | | | magic comment and its source encoding doesn't match the default external encoding
* Fixed that default locale templates should be used if the current locale ↵Carl Lerche2010-04-082-0/+2
| | | | template is missing [DHH]
* scope_key_by_partial fix for Ruby 1.9 when there's virtual_path [#4202 ↵Santiago Pastorino2010-03-161-0/+1
| | | | | | state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* translation method of TranslationHelper module returns always SafeBuffer ↵Santiago Pastorino2010-03-161-0/+1
| | | | | | [#4194 status:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Break a window :/Jeremy Kemper2010-03-154-6/+6
|
* Add deprecation notices for <% %>.Carlhuda2010-03-154-4/+7
| | | | | | | | | | | | | | | | * The approach is to compile <% %> into a method call that checks whether the value returned from a block is a String. If it is, it concats to the buffer and prints a deprecation warning. * <%= %> uses exactly the same logic to compile the template, which first checks to see whether it's compiling a block. * This should have no impact on other uses of block in templates. For instance, in <% [1,2,3].each do |i| %><%= i %><% end %>, the call to each returns an Array, not a String, so the result is not concatenated * In two cases (#capture and #cache), a String can be returned that should *never* be concatenated. We have temporarily created a String subclass called NonConcattingString which behaves (and is serialized) identically to String, but is not concatenated by the code that handles deprecated <% %> block helpers. Once we remove support for <% %> block helpers, we can remove NonConcattingString.
* Solved a problem that prevented render :file => work in layoutsJose Fernandez2010-03-051-0/+2
| | | | Signed-off-by: wycats <wycats@gmail.com>
* Fix render :file => "#{Rails.root}/public/404.html", :status => :not_found. ↵Yehuda Katz2010-02-231-0/+1
| | | | Closes #8994
* Fix t('.helper').José Valim2010-01-261-0/+1
|
* Fix failing tests after merge.José Valim2010-01-242-4/+8
|
* Missing rename from named_scope to scope [#3735 status:resolved]Damien Mathieu2010-01-181-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Raise an error if respond_with is invoked and no format is declared.José Valim2010-01-104-3/+0
|
* When rendering layouts with blocks, use #capture to avoid assuming that the ↵Nathan Weizenbaum2009-11-051-1/+1
| | | | | | return value is the block's content. Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
* Ported the new ActionView::TestCase from 2-3-stable to master [#3260Erik Ostrom2009-09-281-0/+1
| | | | | | | | | | | | | | | | | state:resolved] The test case now mimicks the template environment more closely, so it's possible to use render, load helper dependencies. This also fixes assert_select, and similar assertions. Because view tests and helpers generally don't render full templates assert_select looks first in rendered and then in output_buffer to find the rendered output. Additional `master'-only changes: Made the Action Pack Rakefile run the ActionView::TestCase tests, and made ActionView::Rendering#_render_text always return a string. Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Move Rails::Static into ActionDispatchJoshua Peek2009-09-263-0/+3
|
* Avoid conflicts with another ContentTypeController used in testingJoshua Peek2009-09-194-0/+0
|
* Missing fixture template -- fixes AP testsYehuda Katz2009-08-151-0/+1
|
* Got tests to pass with some more changes.Yehuda Katz2009-08-151-1/+0
| | | | | | | | | | | | | | | | * request.formats is much simpler now * For XHRs or Accept headers with a single item, we use the Accept header * For other requests, we use params[:format] or fallback to HTML * This is primarily to work around the fact that browsers provide completely broken Accept headers, so we have to whitelist the few cases we can specifically isolate and treat other requests as coming from the browser * For APIs, we can support single-item Accept headers, which disambiguates from the browsers * Requests to an action that only has an XML template from the browser will no longer find the template. This worked previously because most browsers provide a catch-all */*, but this was mostly accidental behavior. If you want to serve XML, either use the :xml format in links, or explicitly specify the XML template: render "template.xml".