aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/new_render_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-01-19 06:01:57 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2008-01-19 06:01:57 +0000
commit88bc014acc82129e55a7ae7505cb62bacd0d685d (patch)
tree855c3779b5eb527ba70ace6901d73242a05be7f0 /actionpack/test/controller/new_render_test.rb
parent16b129a68ca1770815107a3edb54090282349ba7 (diff)
downloadrails-88bc014acc82129e55a7ae7505cb62bacd0d685d.tar.gz
rails-88bc014acc82129e55a7ae7505cb62bacd0d685d.tar.bz2
rails-88bc014acc82129e55a7ae7505cb62bacd0d685d.zip
Revert r8669 for now, breaks Action Mailer. Reopens #10800.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8676 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller/new_render_test.rb')
-rw-r--r--actionpack/test/controller/new_render_test.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb
index 4a9b0e9ddf..eb19b2e391 100644
--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -78,6 +78,11 @@ class NewRenderTestController < ActionController::Base
@secret = 'in the sauce'
render :file => 'test/render_file_with_ivar', :use_full_path => true
end
+
+ def render_file_not_using_full_path_with_relative_path
+ @secret = 'in the sauce'
+ render :file => 'test/../test/render_file_with_ivar', :use_full_path => true
+ end
def render_file_not_using_full_path_with_dot_in_path
@secret = 'in the sauce'
@@ -483,6 +488,11 @@ class NewRenderTest < Test::Unit::TestCase
assert_equal "The secret is in the sauce\n", @response.body
end
+ def test_render_file_not_using_full_path_with_relative_path
+ get :render_file_not_using_full_path_with_relative_path
+ assert_equal "The secret is in the sauce\n", @response.body
+ end
+
def test_render_file_not_using_full_path_with_dot_in_path
get :render_file_not_using_full_path_with_dot_in_path
assert_equal "The secret is in the sauce\n", @response.body