aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/render_test.rb
Commit message (Collapse)AuthorAgeFilesLines
...
* Remove ActionView inline logging to ActiveSupport::Notifications and create ↵José Valim2009-12-261-31/+1
| | | | ActionController::Base#log_event, so everything can be logged within one listener. Also expose log_process_action as a hook for different modules to include their own information during the action processing. This allow ActiveRecord to hook and any other ORM. Finally, this commit changes 'Processing' and 'Rendering' in logs to 'Processed' and 'Rendered' because at the point it's logged, everying already happened.
* AD::StatusCodes support is now part of rackJoshua Peek2009-12-221-2/+2
|
* Use new routing dsl in testsJoshua Peek2009-12-081-15/+15
|
* Ensure Cache-Control max-age is an integerJeremy Kemper2009-12-021-1/+1
|
* Ruby 1.9: resolve constant lookup issuesJeremy Kemper2009-11-041-1/+1
|
* Fixes expires_now and cleans things up a bitYehuda Katz2009-10-261-0/+10
|
* Switch to on-by-default XSS escaping for rails.Michael Koziarski2009-10-081-1/+1
| | | | | | | | | | | | This consists of: * String#html_safe! a method to mark a string as 'safe' * ActionView::SafeBuffer a string subclass which escapes anything unsafe which is concatenated to it * Calls to String#html_safe! throughout the rails helpers * a 'raw' helper which lets you concatenate trusted HTML from non-safety-aware sources (e.g. presantized strings in the DB) * New ERB implementation based on erubis which uses a SafeBuffer instead of a String Hat tip to Django for the inspiration.
* Cleanup route reloading in tests. Prefer with_routing over using ↵Joshua Peek2009-08-161-8/+10
| | | | ActionController::Routing::Routes directly
* More cleanup of ActionView and reduction in need for blocks in some cases:Yehuda Katz2009-08-151-9/+0
| | | | | | | | * 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
* Clean up partial object some more; replace passing around a block to a ↵Yehuda Katz2009-08-091-1/+0
| | | | single block ivar
* Add destroyed? to ActiveRecord, include tests for polymorphic urls for ↵José Valim2009-08-071-5/+7
| | | | destroyed objects and refactor mime responds tests and documentation.
* Add nagivational behavior to respond_with.José Valim2009-08-071-0/+15
|
* Replace _render_template_with_layout with _render_template since the layout ↵Yehuda Katz2009-08-071-1/+2
| | | | is optional
* Update cache_control to be a Hash of options that is used to build the header.Yehuda Katz2009-08-021-1/+1
| | | | * Significantly simplifies setting and modifying cache control in other areas
* Remove deprecated implicit ivar assignmentJoshua Peek2009-06-251-7/+0
|
* Finish making pending tests passYehuda Katz + Carl Lerche2009-06-171-7/+7
|
* Modify render_test's determine_layout to match RJSYehuda Katz + Carl Lerche2009-05-221-3/+1
|
* Cleaning up more render testsYehuda Katz + Carl Lerche2009-05-141-0/+5
|
* Ported over render :file tests.Yehuda Katz + Carl Lerche2009-05-131-320/+14
|
* Implemented redirects and partial rendering in new base.Yehuda Katz + Carl Lerche2009-05-121-2/+2
|
* Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-111-5/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/callbacks.rb actionpack/lib/action_controller/abstract/renderer.rb actionpack/lib/action_controller/base/base.rb actionpack/lib/action_controller/dispatch/dispatcher.rb actionpack/lib/action_controller/routing/route_set.rb actionpack/lib/action_controller/testing/process.rb actionpack/test/abstract_controller/layouts_test.rb actionpack/test/controller/filters_test.rb actionpack/test/controller/helper_test.rb actionpack/test/controller/render_test.rb actionpack/test/new_base/test_helper.rb
| * Functional test runner finalizes response just like the integration test ↵Joshua Peek2009-05-021-11/+11
| | | | | | | | | | runner. In both runners, the @response object will now behave the same. Some functional tests will need to be updated if they are relying on preprocessed data on the response.
* | Aliased AbstractController::ActionNotFound to ActionController::UnknownActionYehuda Katz + Carl Lerche2009-05-111-2/+3
| |
* | Ported ConditionalGet to new BaseYehuda Katz + Carl Lerche2009-05-111-4/+4
| |
* | Starting to get new_base to run on old testsYehuda Katz + Carl Lerche2009-05-011-1/+1
| |
* | Committing the last changes before we start trying to get the old tests to ↵Yehuda Katz + Carl Lerche2009-05-011-1/+10
| | | | | | | | pass on the new base
* | Ported over the concept of public instance methods on controller child ↵Yehuda Katz + Carl Lerche2009-05-011-0/+7
| | | | | | | | classes as callable action methods
* | Ported over render :template testsYehuda Katz + Carl Lerche2009-05-011-0/+19
| |
* | Finished implementing render :text in Base2Yehuda Katz + Carl Lerche2009-05-011-0/+17
| |
* | Renamed the new_base testsYehuda Katz + Carl Lerche2009-05-011-0/+2
| |
* | OMG, a lot of workYehuda Katz + Carl Lerche2009-05-011-0/+3
|/
* Fix render :json => nil [#2589 state:resolved]Jeremy Kemper2009-04-301-0/+10
|
* Refactor ActionView::TemplateYehuda Katz + Carl Lerche2009-04-271-3/+3
| | | | | | | | 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.
* test uses PathnameJeremy Kemper2009-04-241-0/+1
|
* * Add pluggable JSON backends with support for the JSON gem. [rick]rick2009-04-231-9/+9
| | | | | | | | | | | | | | Example: ActiveSupport::JSON.backend = "JSONGem" All internal Rails JSON encoding is now handled by ActiveSupport::JSON.encode(). Use of #to_json is not recommended, as it may clash with other libraries that overwrite it. However, you can recover Rails specific functionality if you really want to use #to_json. gem 'json' ActiveSupport::JSON.backend = "JSONGem" class ActiveRecord::Base alias to_json rails_to_json end
* Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-131-9/+118
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * allowed render :file to take Pathnames [#2220 state:resolved]misfo2009-03-141-0/+10
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Ruby 1.9 compat: rename deprecated assert_raises to assert_raise.Jeremy Kemper2009-03-081-7/+7
| | | | | | | | [#1617 state:resolved]
| * Fixed simplified render with nested models [#2042 state:resolved]Joshua Peek2009-03-071-0/+18
| |
| * fix HTML fallback for explicit templates [#2052 state:resolved]Matt Jones2009-03-071-0/+16
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Ensure expires_in without a :public key sets the Cache-Control header to ↵Johan Sørensen2009-03-071-1/+1
| | | | | | | | | | | | | | | | | | private. [#2095 state:resolved] This fixes a regression introduced in f2a32bd0, which wasn't exposed due to two test methods having the same name. Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Added ability to pass in :public => true to fresh_when, stale?, and ↵Gregg Pollack2009-02-281-0/+72
| | | | | | | | | | | | expires_in to make the request proxy cachable [#2095 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * correctly handle layouts for AJAX requests and regular js files [#2052 ↵Matt Jones2009-02-241-4/+5
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * implicitly rendering a js response should not use the default layout [#1844 ↵Adam McCrea2009-02-051-1/+10
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Temporarily modifies setup to call super directly. This can support more ↵Yehuda Katz and Carl Lerche2009-04-081-0/+4
| | | | | | | | T::U runners.
* | Add support for pendingYehuda Katz2009-02-021-2/+4
| |
* | Merge commit 'rails/3-0-unstable'Yehuda Katz2009-01-301-5/+5
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | 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
| * Move HTTP libs and middleware into ActionDispatch componentJoshua Peek2009-01-271-2/+2
| |
| * Begin unifying the interface between ActionController and ActionViewYehuda Katz2009-01-221-3/+3
| |
* | Restore implicit rendering for XHR requests that want a HTML template [#1590 ↵Joshua Peek2009-01-271-0/+8
|/ | | | state:resolved]