diff options
| author | José Valim <jose.valim@gmail.com> | 2011-11-13 12:34:23 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-11-13 12:34:23 -0800 |
| commit | d37e169856dbe022ce892af2f36d96b2f1f63d8e (patch) | |
| tree | 15679ba801157f7e8f0cd315272563796db4f71c /actionpack/test/dispatch/request_test.rb | |
| parent | e0efe48c45cb02494b88636a4eefc6b37e419101 (diff) | |
| parent | 9c4532bf74604ae1c52a44d1aa8c1022a312ff88 (diff) | |
| download | rails-d37e169856dbe022ce892af2f36d96b2f1f63d8e.tar.gz rails-d37e169856dbe022ce892af2f36d96b2f1f63d8e.tar.bz2 rails-d37e169856dbe022ce892af2f36d96b2f1f63d8e.zip | |
Merge pull request #3623 from indirect/remote_ip
Remote IP fixes/cleanup
Diffstat (limited to 'actionpack/test/dispatch/request_test.rb')
| -rw-r--r-- | actionpack/test/dispatch/request_test.rb | 4 |
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 |