aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/request_test.rb
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2011-11-13 10:19:54 -1000
committerAndre Arko <andre@arko.net>2011-11-13 10:19:54 -1000
commit8f0085a483ebc6d416e902c3caff68f82934e091 (patch)
treecaae739a5cd6acdbc091d62ade72947df7f8ed51 /actionpack/test/dispatch/request_test.rb
parente0efe48c45cb02494b88636a4eefc6b37e419101 (diff)
downloadrails-8f0085a483ebc6d416e902c3caff68f82934e091.tar.gz
rails-8f0085a483ebc6d416e902c3caff68f82934e091.tar.bz2
rails-8f0085a483ebc6d416e902c3caff68f82934e091.zip
change tests to expect X-F-F over REMOTE_ADDR
Diffstat (limited to 'actionpack/test/dispatch/request_test.rb')
-rw-r--r--actionpack/test/dispatch/request_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index a611252b31..4658eeea17 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -36,7 +36,7 @@ class RequestTest < ActiveSupport::TestCase
request = stub_request 'REMOTE_ADDR' => '1.2.3.4',
'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
- assert_equal '1.2.3.4', request.remote_ip
+ assert_equal '3.4.5.6', request.remote_ip
request = stub_request 'REMOTE_ADDR' => '127.0.0.1',
'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
@@ -106,7 +106,7 @@ class RequestTest < ActiveSupport::TestCase
request = stub_request 'REMOTE_ADDR' => '67.205.106.74,172.16.0.1',
'HTTP_X_FORWARDED_FOR' => '3.4.5.6'
- assert_equal '67.205.106.74', request.remote_ip
+ assert_equal '3.4.5.6', request.remote_ip
request = stub_request 'HTTP_X_FORWARDED_FOR' => 'unknown,67.205.106.73'
assert_equal 'unknown', request.remote_ip