aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/new_base/render_test.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-01-29 11:51:32 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-01-29 11:51:32 -0200
commita35ec0c02235e7e332f8551a6c94c69ac929a1bf (patch)
tree77235d82964272c8721a62ae046b16279d01f945 /actionpack/test/controller/new_base/render_test.rb
parent069b72aaf04d2caef76f8e71f320716129f2d949 (diff)
parentbaf14ae513337cb185acf865e93dfc48f3aabf6a (diff)
downloadrails-a35ec0c02235e7e332f8551a6c94c69ac929a1bf.tar.gz
rails-a35ec0c02235e7e332f8551a6c94c69ac929a1bf.tar.bz2
rails-a35ec0c02235e7e332f8551a6c94c69ac929a1bf.zip
Merge pull request #18323 from kirs/controller-test-kwargs
Use kwargs in ActionController::TestCase and ActionDispatch::Integration HTTP methods
Diffstat (limited to 'actionpack/test/controller/new_base/render_test.rb')
-rw-r--r--actionpack/test/controller/new_base/render_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/new_base/render_test.rb b/actionpack/test/controller/new_base/render_test.rb
index 5635e16234..2866be7d9b 100644
--- a/actionpack/test/controller/new_base/render_test.rb
+++ b/actionpack/test/controller/new_base/render_test.rb
@@ -74,7 +74,7 @@ module Render
end
assert_raises(AbstractController::DoubleRenderError) do
- get "/render/double_render", {}, "action_dispatch.show_exceptions" => false
+ get "/render/double_render", headers: {"action_dispatch.show_exceptions" => false}
end
end
end
@@ -84,13 +84,13 @@ module Render
# Only public methods on actual controllers are callable actions
test "raises an exception when a method of Object is called" do
assert_raises(AbstractController::ActionNotFound) do
- get "/render/blank_render/clone", {}, "action_dispatch.show_exceptions" => false
+ get "/render/blank_render/clone", headers: {"action_dispatch.show_exceptions" => false}
end
end
test "raises an exception when a private method is called" do
assert_raises(AbstractController::ActionNotFound) do
- get "/render/blank_render/secretz", {}, "action_dispatch.show_exceptions" => false
+ get "/render/blank_render/secretz", headers: {"action_dispatch.show_exceptions" => false}
end
end
end