aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/url_generation_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/dispatch/url_generation_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/dispatch/url_generation_test.rb')
-rw-r--r--actionpack/test/dispatch/url_generation_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/url_generation_test.rb b/actionpack/test/dispatch/url_generation_test.rb
index 8f79e7bf9a..3d7b6086ee 100644
--- a/actionpack/test/dispatch/url_generation_test.rb
+++ b/actionpack/test/dispatch/url_generation_test.rb
@@ -39,12 +39,12 @@ module TestUrlGeneration
end
test "the request's SCRIPT_NAME takes precedence over the route" do
- get "/foo", {}, 'SCRIPT_NAME' => "/new", 'action_dispatch.routes' => Routes
+ get "/foo", headers: {'SCRIPT_NAME' => "/new", 'action_dispatch.routes' => Routes}
assert_equal "/new/foo", response.body
end
test "the request's SCRIPT_NAME wraps the mounted app's" do
- get '/new/bar/foo', {}, 'SCRIPT_NAME' => '/new', 'PATH_INFO' => '/bar/foo', 'action_dispatch.routes' => Routes
+ get '/new/bar/foo', headers: { 'SCRIPT_NAME' => '/new', 'PATH_INFO' => '/bar/foo', 'action_dispatch.routes' => Routes }
assert_equal "/new/bar/foo", response.body
end