diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-19 18:08:04 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-19 18:11:45 -0700 |
| commit | 321168b17bce2e73ab7ba22309491ad5c245dcf8 (patch) | |
| tree | e52f3603c45cb23c8e0d1fcc4230f9be73d7979e /actionpack/lib/action_controller/new_base | |
| parent | 67cc021d019515c94d4bcc4c3c7060c9a2594c87 (diff) | |
| download | rails-321168b17bce2e73ab7ba22309491ad5c245dcf8.tar.gz rails-321168b17bce2e73ab7ba22309491ad5c245dcf8.tar.bz2 rails-321168b17bce2e73ab7ba22309491ad5c245dcf8.zip | |
Make old caching tests pass on new base.
Diffstat (limited to 'actionpack/lib/action_controller/new_base')
| -rw-r--r-- | actionpack/lib/action_controller/new_base/compatibility.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/new_base/http.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/new_base/url_for.rb | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/new_base/compatibility.rb b/actionpack/lib/action_controller/new_base/compatibility.rb index 0a283887b6..0098c0747e 100644 --- a/actionpack/lib/action_controller/new_base/compatibility.rb +++ b/actionpack/lib/action_controller/new_base/compatibility.rb @@ -55,6 +55,10 @@ module ActionController self.consider_all_requests_local = true end + # For old tests + def initialize_template_class(*) end + def assign_shortcuts(*) end + module ClassMethods def protect_from_forgery() end def consider_all_requests_local() end diff --git a/actionpack/lib/action_controller/new_base/http.rb b/actionpack/lib/action_controller/new_base/http.rb index 8891a2a8c3..17466a2d52 100644 --- a/actionpack/lib/action_controller/new_base/http.rb +++ b/actionpack/lib/action_controller/new_base/http.rb @@ -60,7 +60,6 @@ module ActionController # :api: private def to_rack - @_response.body = response_body @_response.prepare! @_response.to_a end diff --git a/actionpack/lib/action_controller/new_base/url_for.rb b/actionpack/lib/action_controller/new_base/url_for.rb index af5b21012b..94de9fab50 100644 --- a/actionpack/lib/action_controller/new_base/url_for.rb +++ b/actionpack/lib/action_controller/new_base/url_for.rb @@ -1,5 +1,10 @@ module ActionController module UrlFor + def process_action(*) + initialize_current_url + super + end + def initialize_current_url @url = UrlRewriter.new(request, params.clone) end |