Skip to content
This repository
Browse code

Make old caching tests pass on new base.

  • Loading branch information...
commit 321168b17bce2e73ab7ba22309491ad5c245dcf8 1 parent 67cc021
authored
4  actionpack/lib/action_controller/new_base/compatibility.rb
@@ -55,6 +55,10 @@ module Rails2Compatibility
55 55
       self.consider_all_requests_local = true
56 56
     end
57 57
     
  58
+    # For old tests
  59
+    def initialize_template_class(*) end
  60
+    def assign_shortcuts(*) end
  61
+
58 62
     module ClassMethods
59 63
       def protect_from_forgery() end
60 64
       def consider_all_requests_local() end
1  actionpack/lib/action_controller/new_base/http.rb
@@ -60,7 +60,6 @@ def self.action(name)
60 60
     
61 61
     # :api: private
62 62
     def to_rack
63  
-      @_response.body = response_body
64 63
       @_response.prepare!
65 64
       @_response.to_a
66 65
     end
5  actionpack/lib/action_controller/new_base/url_for.rb
... ...
@@ -1,5 +1,10 @@
1 1
 module ActionController
2 2
   module UrlFor
  3
+    def process_action(*)
  4
+      initialize_current_url
  5
+      super
  6
+    end
  7
+
3 8
     def initialize_current_url
4 9
       @url = UrlRewriter.new(request, params.clone)
5 10
     end

0 notes on commit 321168b

Please sign in to comment.
Something went wrong with that request. Please try again.