aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures
Commit message (Collapse)AuthorAgeFilesLines
* 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".
* More cleanup of ActionView and reduction in need for blocks in some cases:Yehuda Katz2009-08-153-3/+2
| | | | | | | | * only one of partial_name or :as will be available as a local * `object` is removed * Simplify _layout_for in most cases. * Remove <% render :partial do |args| %> * <% render :partial do %> still works fine
* Tentatively accept the ":as or :object, but not both" solutionYehuda Katz2009-08-111-1/+1
|
* Rendering a template from ActionView will default to looking for partials ↵Yehuda Katz2009-08-091-0/+1
| | | | | | | | | only in the current mime type. * The old behavior was tested only as a side-effect of a different test--the original tests remain; a new template in the XML mime was added. * If you are relying on the current behavior and object to this change, please participate in http://groups.google.com/group/rubyonrails-core/browse_thread/thread/6ef25f3c108389bd
* Add nagivational behavior to respond_with.José Valim2009-08-074-1/+3
|
* Added respond_with.José Valim2009-07-291-0/+1
| | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
* Added tests for respond_to class method.José Valim2009-07-294-0/+4
| | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
* Ignore everything under test/fixtures/public/absolutePratik Naik2009-07-271-1/+1
|
* Handle missing javascript/stylesheets assets by raising an exceptionChristos Zisopoulos2009-06-264-0/+4
| | | | | | | | | | | | An exception will be raised if a local javascript/stylesheet file included by the stylesheet_link_tag or javascript_include_tag can not be found. When caching is enabled, we use atomic_write to ensure that the cache file is not created with zero length. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2738 state:committed]
* ignore absolute tmp directoryJoshua Peek2009-06-251-0/+1
|
* Drive the final stake through @content_for_*'s heart!Yehuda Katz + Carl Lerche2009-06-173-4/+4
|
* Finish making pending tests passYehuda Katz + Carl Lerche2009-06-171-0/+1
|
* ActionPack components should no longer have undeclared dependencies.Yehuda Katz + Carl Lerche2009-06-081-1/+1
| | | | | | | * Tests can be run in isolation * Dependencies added * A few tests modified to avoid depending on AS deps not depended on my files they were testing
* Ensure ERB source begins with the encoding commentJeremy Kemper2009-06-012-1/+5
|
* Ruby 1.9: ERB template encoding using a magic comment at the top of the fileJeremy Kemper2009-05-281-1/+4
|
* Slightly modify things to get content type matching working without breaking ↵Yehuda Katz2009-05-231-0/+0
| | | | other code
* Implemented layout conditions in new baseYehuda Katz + Carl Lerche2009-05-211-1/+1
|
* Refactor ActionView::TemplateYehuda Katz + Carl Lerche2009-04-272-0/+1
| | | | | | | | ActionView::Template is now completely independent from template storage, which allows different back ends such as the database. ActionView::Template's only responsibility is to take in the template source (passed in from ActionView::Path), compile it, and render it.
* Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-1311-0/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46c04970b5e7684998d09405648ecbd4 3942cb406e1d5db0ac00e03153809cc8dc4cc4db f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690 e3b166aab37ddc2fbab030b146eb61713b91bf55 ae9f258e03c9fd5088da12c1c6cd216cc89a01f7 44423126c6f6133a1d9cf1d0832b527e8711d40f 0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.
| * Additional template render test for backup files [#2367 state:resolved]Cezary Baginski2009-04-022-0/+2
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Fixed simplified render with nested models [#2042 state:resolved]Joshua Peek2009-03-071-0/+1
| |