aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-01-15 13:45:31 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-01-17 10:04:38 -0200
commitbb33e88833575184b3bd2d0877ea92e170672cde (patch)
tree3d7e904188dbb1580753628a2e92032c9d85c9d4
parent497004858de24e21dc67f8a9bd3a30b8ce951b92 (diff)
downloadrails-bb33e88833575184b3bd2d0877ea92e170672cde.tar.gz
rails-bb33e88833575184b3bd2d0877ea92e170672cde.tar.bz2
rails-bb33e88833575184b3bd2d0877ea92e170672cde.zip
Remove deprecated logic to render templates starting with /
render :template => "/foo/bar"
-rw-r--r--actionpack/lib/action_controller/metal/compatibility.rb1
-rw-r--r--actionpack/test/controller/new_base/render_template_test.rb22
2 files changed, 0 insertions, 23 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 1c205d7c02..a9e46f9343 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -21,7 +21,6 @@ module ActionController
end
def render_to_body(options)
- options[:template].sub!(/^\//, '') if options.key?(:template)
super || " "
end
diff --git a/actionpack/test/controller/new_base/render_template_test.rb b/actionpack/test/controller/new_base/render_template_test.rb
index ade204c387..88f8cc0d6e 100644
--- a/actionpack/test/controller/new_base/render_template_test.rb
+++ b/actionpack/test/controller/new_base/render_template_test.rb
@@ -201,26 +201,4 @@ module RenderTemplate
assert_status 200
end
end
-
- module Compatibility
- class WithoutLayoutController < ActionController::Base
- self.view_paths = [ActionView::FixtureResolver.new(
- "test/basic.html.erb" => "Hello from basic.html.erb",
- "shared.html.erb" => "Elastica"
- )]
-
- def with_forward_slash
- render :template => "/test/basic"
- end
- end
-
- class TestTemplateRenderWithForwardSlash < Rack::TestCase
- test "rendering a normal template with full path starting with a leading slash" do
- get "/render_template/compatibility/without_layout/with_forward_slash"
-
- assert_body "Hello from basic.html.erb"
- assert_status 200
- end
- end
- end
end