aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * 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
|