diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-29 11:51:32 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-29 11:51:32 -0200 |
commit | a35ec0c02235e7e332f8551a6c94c69ac929a1bf (patch) | |
tree | 77235d82964272c8721a62ae046b16279d01f945 /actionpack/test/controller/force_ssl_test.rb | |
parent | 069b72aaf04d2caef76f8e71f320716129f2d949 (diff) | |
parent | baf14ae513337cb185acf865e93dfc48f3aabf6a (diff) | |
download | rails-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/force_ssl_test.rb')
-rw-r--r-- | actionpack/test/controller/force_ssl_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/force_ssl_test.rb b/actionpack/test/controller/force_ssl_test.rb index 00d4612ac9..04222745d9 100644 --- a/actionpack/test/controller/force_ssl_test.rb +++ b/actionpack/test/controller/force_ssl_test.rb @@ -100,7 +100,7 @@ class ForceSSLControllerLevelTest < ActionController::TestCase end def test_banana_redirects_to_https_with_extra_params - get :banana, :token => "secret" + get :banana, params: { token: "secret" } assert_response 301 assert_equal "https://test.host/force_ssl_controller_level/banana?token=secret", redirect_to_url end @@ -273,7 +273,7 @@ class ForceSSLFormatTest < ActionController::TestCase get '/foo', :to => 'force_ssl_controller_level#banana' end - get :banana, :format => :json + get :banana, format: :json assert_response 301 assert_equal 'https://test.host/foo.json', redirect_to_url end @@ -294,7 +294,7 @@ class ForceSSLOptionalSegmentsTest < ActionController::TestCase end @request.env['PATH_INFO'] = '/en/foo' - get :banana, :locale => 'en' + get :banana, params: { locale: 'en' } assert_equal 'en', @controller.params[:locale] assert_response 301 assert_equal 'https://test.host/en/foo', redirect_to_url |