diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-02-23 13:59:49 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-02-23 13:59:49 -0300 |
| commit | 3adc35aefa7e5f58fe0e7d6678daeaa5e47dd7df (patch) | |
| tree | 79520ac71677f154f91bbe29d11199ba5ab8de0f /railties/test/application/middleware/remote_ip_test.rb | |
| parent | 79887593c18919fed49f441d64236362cb755872 (diff) | |
| parent | d96550b53ecf3816dff3cb0d68dc976028dc9351 (diff) | |
| download | rails-3adc35aefa7e5f58fe0e7d6678daeaa5e47dd7df.tar.gz rails-3adc35aefa7e5f58fe0e7d6678daeaa5e47dd7df.tar.bz2 rails-3adc35aefa7e5f58fe0e7d6678daeaa5e47dd7df.zip | |
Merge pull request #23789 from wisetara/wisetara/deprecate-args-ActiveSupport__TestCase#assert_nothing_raised-for-pr
Wisetara/deprecate args active support test case#assert nothing raised for pr
Diffstat (limited to 'railties/test/application/middleware/remote_ip_test.rb')
| -rw-r--r-- | railties/test/application/middleware/remote_ip_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/application/middleware/remote_ip_test.rb b/railties/test/application/middleware/remote_ip_test.rb index 97d5b5c698..37bd8a25c1 100644 --- a/railties/test/application/middleware/remote_ip_test.rb +++ b/railties/test/application/middleware/remote_ip_test.rb @@ -36,10 +36,10 @@ module ApplicationTests test "works with both headers individually" do make_basic_app - assert_nothing_raised(ActionDispatch::RemoteIp::IpSpoofAttackError) do + assert_nothing_raised do assert_equal "1.1.1.1", remote_ip("HTTP_X_FORWARDED_FOR" => "1.1.1.1") end - assert_nothing_raised(ActionDispatch::RemoteIp::IpSpoofAttackError) do + assert_nothing_raised do assert_equal "1.1.1.2", remote_ip("HTTP_CLIENT_IP" => "1.1.1.2") end end @@ -49,7 +49,7 @@ module ApplicationTests app.config.action_dispatch.ip_spoofing_check = false end - assert_nothing_raised(ActionDispatch::RemoteIp::IpSpoofAttackError) do + assert_nothing_raised do assert_equal "1.1.1.1", remote_ip("HTTP_X_FORWARDED_FOR" => "1.1.1.1", "HTTP_CLIENT_IP" => "1.1.1.2") end end |