Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove old compatibility methods not being used

  • Loading branch information...
commit bc50cb31d6b1064463b371cf428e7eb6fcbf2fd3 1 parent 4280b20
@carlosantoniodasilva carlosantoniodasilva authored
View
4 actionpack/lib/action_controller/base.rb
@@ -116,7 +116,7 @@ module ActionController
#
# Title: <%= @post.title %>
#
- # You don't have to rely on the automated rendering. For example, actions that could result in the rendering of different templates
+ # You don't have to rely on the automated rendering. For example, actions that could result in the rendering of different templates
# will use the manual rendering methods:
#
# def search
@@ -133,7 +133,7 @@ module ActionController
# == Redirects
#
# Redirects are used to move from one action to another. For example, after a <tt>create</tt> action, which stores a blog entry to the
- # database, we might like to show the user the new entry. Because we're following good DRY principles (Don't Repeat Yourself), we're
+ # database, we might like to show the user the new entry. Because we're following good DRY principles (Don't Repeat Yourself), we're
# going to reuse (and redirect to) a <tt>show</tt> action that we'll assume has already been created. The code might look like this:
#
# def create
View
4 actionpack/lib/action_controller/metal/compatibility.rb
@@ -28,10 +28,6 @@ def rescue_action(env)
end
end
- # For old tests
- def initialize_template_class(*) end
- def assign_shortcuts(*) end
-
def _normalize_options(options)
options[:text] = nil if options.delete(:nothing) == true
options[:text] = " " if options.key?(:text) && options[:text].nil?
View
2  actionpack/test/controller/caching_test.rb
@@ -686,8 +686,6 @@ def setup
@controller.params = @params
@controller.request = @request
@controller.response = @response
- @controller.send(:initialize_template_class, @response)
- @controller.send(:assign_shortcuts, @request, @response)
end
def test_fragment_cache_key
View
7 actionpack/test/controller/view_paths_test.rb
@@ -24,16 +24,9 @@ def hello_world; render(:template => 'test/hello_world'); end
end
def setup
- # TestController.view_paths = nil
-
@request = ActionController::TestRequest.new
@response = ActionController::TestResponse.new
-
@controller = TestController.new
- # Following is needed in order to setup @controller.template object properly
- @controller.send :assign_shortcuts, @request, @response
- @controller.send :initialize_template_class, @response
-
@paths = TestController.view_paths
end
Please sign in to comment.
Something went wrong with that request. Please try again.