aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-02-07 14:57:27 -0800
committerJosé Valim <jose.valim@plataformatec.com.br>2012-02-07 14:57:27 -0800
commit4b8fe5961ec97e5e36ea4510e7fd47847ec9a57f (patch)
tree7e7a6970fac06fcdb8841c48c2dd0169f9ab09e7 /actionpack
parent91bb008c0b464b2524dcf4bf308b40afeb46021d (diff)
parent4e7d94ea2ca9f368ab929d0bcbd7565f80659ad6 (diff)
downloadrails-4b8fe5961ec97e5e36ea4510e7fd47847ec9a57f.tar.gz
rails-4b8fe5961ec97e5e36ea4510e7fd47847ec9a57f.tar.bz2
rails-4b8fe5961ec97e5e36ea4510e7fd47847ec9a57f.zip
Merge pull request #4932 from carlosantoniodasilva/fix-request-test
Fix failing request test
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/dispatch/request_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index c5e3525d84..8f0ac5310e 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -127,7 +127,7 @@ class RequestTest < ActiveSupport::TestCase
'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
assert_equal '3.4.5.6', request.remote_ip
- request = stub_request 'HTTP_X_FORWARDED_FOR' => '9.9.9.9, 3.4.5.6, 10.0.0.1, 67.205.106.73'
+ request = stub_request 'HTTP_X_FORWARDED_FOR' => '67.205.106.73, 10.0.0.1, 9.9.9.9, 3.4.5.6'
assert_equal '10.0.0.1', request.remote_ip
end