aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * fix HTML fallback for explicit templates [#2052 state:resolved]Matt Jones2009-03-071-0/+1
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * missed template fixtures with ~Joshua Peek2009-02-243-0/+3
| |
| * correctly handle layouts for AJAX requests and regular js files [#2052 ↵Matt Jones2009-02-241-0/+2
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * make action_controller/layouts pick templates from the current instance's ↵Sven Fuchs2009-02-201-0/+0
| | | | | | | | | | | | view_paths instead of the class view_paths [#1974 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * ~ backup files don't clobber original templates [#1818 state:resolved]Joshua Peek2009-02-071-0/+1
| |
| * Render implicit html template when xhr request now supports localization ↵José Valim2009-02-071-0/+1
| | | | | | | | | | | | [#1886 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Added support to dashed locales in templates localization [#1888 state:resolved]José Valim2009-02-061-0/+1
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Ruby 1.9 compat: change encoding of action_view/renderable to utf-8, so erb ↵Eugene Pimenov2009-02-061-0/+2
| | | | | | | | | | | | | | | | templates can use utf-8 properly [#1881 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * implicitly rendering a js response should not use the default layout [#1844 ↵Adam McCrea2009-02-051-0/+1
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Added localized rescue (404.da.html) [#1835 state:committed]José Valim2009-02-021-0/+1
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* | Started implementing render :actionYehuda Katz2009-03-191-0/+1
| |
* | Implemented basic template rendering in AC::Base2:Yehuda Katz2009-03-181-0/+1
| | | | | | | | | | | | | | * Created several macros for writing simpler specs * Finished making Rack::Test work right * Implemented render_to_string * Status Codes * render :text => nil
* | Merge commit 'rails/3-0-unstable'Yehuda Katz2009-01-301-0/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/base.rb actionpack/lib/action_dispatch/http/mime_type.rb actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/paths.rb actionpack/test/controller/session/cookie_store_test.rb actionpack/test/dispatch/rack_test.rb actionpack/test/dispatch/request_test.rb
| * Begin unifying the interface between ActionController and ActionViewYehuda Katz2009-01-221-0/+1
| |
* | Restore implicit rendering for XHR requests that want a HTML template [#1590 ↵Joshua Peek2009-01-271-0/+1
| | | | | | | | state:resolved]
* | Add localized templatesJoshua Peek2009-01-251-0/+1
| | | | | | | | | | | | | | | | # Default locale app/views/messages/index.html.erb # I18n.locale is set to :da (Danish) app/views/messages/index.da.html.erb
* | Remove the irrelevant fixture added in fe6ffce51dc16285094be49244b26591956c2dd6Pratik Naik2009-01-241-8/+0
| |
* | Make sure inner scope conditions get a preference over the outer onesPratik Naik2009-01-241-1/+9
|/
* Allow empty files to be uploadedJoshua Peek2009-01-202-1/+11
|
* Don't let empty Tempfiles come through as uploaded files [#1785 state:resolved]Mislav Marohnić2009-01-201-0/+9
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Add failing test for file uploads with unrewindable inputJoshua Peek2009-01-021-0/+1
|
* Fix rendering html partials from an rjs templateSam Stephenson2008-12-044-0/+4
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Validate template extensions [#1187 state:resolved]Joshua Peek2008-12-031-0/+1
|
* Allow helpers directory to be overridden via ↵Sam Pohlenz2008-11-231-0/+3
| | | | | | ActionController::Base.helpers_dir (Sam Pohlenz) [#1424 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Changed the default of ActionView#render to assume partials instead of files ↵David Heinemeier Hansson2008-11-191-1/+1
| | | | when not given an options hash [DHH]
* Fix rendering html partial via inline render when with :js format [#1399 ↵Luke Melia2008-11-181-0/+1
| | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Dup local assigns for partial collections so nil values doesn't get ↵Joshua Peek2008-10-301-1/+1
| | | | overwritten [#1250 state:resolved]
* Ensure @content_for_* is checked before yielding to block in render :layout ↵Ryan Bates2008-10-282-0/+5
| | | | | | [#8994 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Track rendered templates in stack so the current template can always be ↵Joshua Peek2008-10-281-0/+1
| | | | accessed. Added ActionView::Base#template to access the template object.
* Fixed missing template paths on exception [#1082 state:resolved]Claudio Poli2008-09-201-0/+1
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* pass yielded arguments to block for ActionView::Base#render with :layout ↵Ryan Bates2008-08-172-0/+4
| | | | | | [#847 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Fix rendering partials at the top level [#795 state:resolved]Joshua Peek2008-08-132-0/+2
|
* Added tests for partial collection counters [#766 state:resolved]Cameron Yule2008-08-091-0/+1
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Set the response content type to that of found template if not explicitly ↵Tom Ward2008-07-181-0/+2
| | | | | | set elsewhere [#444 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Improved test coverage for fragment cache helperJoshua Peek2008-07-153-0/+14
|
* Made ActionView::Base#first_render a little more private. And added ↵Joshua Peek2008-07-131-0/+2
| | | | _last_render to track the most recent render. Will fix #609 as a side effect. [#609 state:resolved]
* Improve test coverage and create fixtures for ↵Joshua Peek2008-07-125-0/+5
| | | | RenderPartialWithRecordIdentificationTests
* Rendering default template for missing actions works with non-word ↵Jeremy Kemper2008-07-091-0/+1
| | | | characters in action name
* Add :recursive option to javascript_include_tag and stylesheet_link_tag to ↵Damian Janowski2008-07-082-0/+2
| | | | | | be used along with :all. [#480 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Make sure render :collection doesnt set nil local when :as is absentPratik Naik2008-07-021-0/+1
|
* Add :as option to render a collection of partials with a custom local ↵Pratik Naik2008-07-021-0/+1
| | | | variable name. [#509 state:resolved] [Simon Jefford, Pratik Naik]
* Made ActionView::Base#render_file privateJoshua Peek2008-06-251-1/+1
|
* Check whether blocks are called from erb using a special __in_erb_template ↵Jeremy Kemper2008-06-191-1/+1
| | | | variable visible in block binding.
* Remove some internal dead code that supported content_forJeremy Kemper2008-06-062-4/+0
|
* Ensure render :file works inside templatesPratik Naik2008-06-051-0/+1
|
* Improve PartialTemplate testsPratik Naik2008-05-021-0/+1
|
* Fixed render :template for templates in top level of view path. [#54 ↵Pratik Naik2008-05-011-0/+1
| | | | state:resolved]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 22:24:00 +0000