aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-02-07 20:45:59 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-02-07 20:46:00 -0200
commit4e7d94ea2ca9f368ab929d0bcbd7565f80659ad6 (patch)
tree5445c7f6418feb8754aa4faf6cff00dbf7e07e30 /actionpack/test/dispatch
parentd3f0f92501998682d438c387723e8560e3d76899 (diff)
downloadrails-4e7d94ea2ca9f368ab929d0bcbd7565f80659ad6.tar.gz
rails-4e7d94ea2ca9f368ab929d0bcbd7565f80659ad6.tar.bz2
rails-4e7d94ea2ca9f368ab929d0bcbd7565f80659ad6.zip
Fix failing request test
Latest changes in remote ip handling conflicted with each other in tests. Related: dd09811fa6214a130fdc2de1d4c00b4337cb15f9 6a720226aad2adffcbd2422d40db772719579e2f
Diffstat (limited to 'actionpack/test/dispatch')
-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