aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/new_base/render_file_test.rb
diff options
context:
space:
mode:
authorGodfrey Chan <godfreykfc@gmail.com>2014-09-26 00:26:29 +0900
committerGodfrey Chan <godfreykfc@gmail.com>2014-09-26 01:42:18 +0900
commit391cfc20546049e056b99f8e47be92799412ef78 (patch)
tree444d86e75f7b2b4059d235a979e86699b27e6ae5 /actionpack/test/controller/new_base/render_file_test.rb
parentb5571b3ccfbbfae7fea49c7934bb0348acceeeb4 (diff)
downloadrails-391cfc20546049e056b99f8e47be92799412ef78.tar.gz
rails-391cfc20546049e056b99f8e47be92799412ef78.tar.bz2
rails-391cfc20546049e056b99f8e47be92799412ef78.zip
Fix actionpack test cases broken by #16888
Diffstat (limited to 'actionpack/test/controller/new_base/render_file_test.rb')
-rw-r--r--actionpack/test/controller/new_base/render_file_test.rb29
1 files changed, 0 insertions, 29 deletions
diff --git a/actionpack/test/controller/new_base/render_file_test.rb b/actionpack/test/controller/new_base/render_file_test.rb
index a961cbf849..0c21bb0719 100644
--- a/actionpack/test/controller/new_base/render_file_test.rb
+++ b/actionpack/test/controller/new_base/render_file_test.rb
@@ -13,15 +13,6 @@ module RenderFile
render :file => File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_ivar')
end
- def without_file_key
- render File.join(File.dirname(__FILE__), *%w[.. .. fixtures test hello_world])
- end
-
- def without_file_key_with_instance_variable
- @secret = 'in the sauce'
- render File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_ivar')
- end
-
def relative_path
@secret = 'in the sauce'
render :file => '../../fixtures/test/render_file_with_ivar'
@@ -41,11 +32,6 @@ module RenderFile
path = File.join(File.dirname(__FILE__), '../../fixtures/test/render_file_with_locals')
render :file => path, :locals => {:secret => 'in the sauce'}
end
-
- def without_file_key_with_locals
- path = FIXTURES.join('test/render_file_with_locals').to_s
- render path, :locals => {:secret => 'in the sauce'}
- end
end
class TestBasic < Rack::TestCase
@@ -61,16 +47,6 @@ module RenderFile
assert_response "The secret is in the sauce\n"
end
- test "rendering path without specifying the :file key" do
- get :without_file_key
- assert_response "Hello world!"
- end
-
- test "rendering path without specifying the :file key with ivar" do
- get :without_file_key_with_instance_variable
- assert_response "The secret is in the sauce\n"
- end
-
test "rendering a relative path" do
get :relative_path
assert_response "The secret is in the sauce\n"
@@ -90,10 +66,5 @@ module RenderFile
get :with_locals
assert_response "The secret is in the sauce\n"
end
-
- test "rendering path without specifying the :file key with locals" do
- get :without_file_key_with_locals
- assert_response "The secret is in the sauce\n"
- end
end
end