diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-19 18:24:52 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-19 18:24:52 +0000 |
| commit | dd8c92ea5be3faa9436363d8a37d5debec2027c4 (patch) | |
| tree | d1e465b53afe7da9de4f34cb24125a8df8925bfc /actionpack/lib/action_controller | |
| parent | 473e5bde747d227d47d00e9b5f52b668b29f53df (diff) | |
| download | rails-dd8c92ea5be3faa9436363d8a37d5debec2027c4.tar.gz rails-dd8c92ea5be3faa9436363d8a37d5debec2027c4.tar.bz2 rails-dd8c92ea5be3faa9436363d8a37d5debec2027c4.zip | |
Fixed Request#remote_ip in testing #1251 [bitsweat]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1322 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/test_process.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index 3fd86477db..25ad540468 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -32,7 +32,7 @@ module ActionController #:nodoc: class TestRequest < AbstractRequest #:nodoc: attr_accessor :cookies attr_accessor :query_parameters, :request_parameters, :path, :session, :env - attr_accessor :host, :remote_addr + attr_accessor :host def initialize(query_parameters = nil, request_parameters = nil, session = nil) @query_parameters = query_parameters || {} @@ -71,6 +71,10 @@ module ActionController #:nodoc: @path = uri.split("?").first end + def remote_addr=(addr) + @env['REMOTE_ADDR'] = addr + end + def request_uri @request_uri || super() end @@ -88,7 +92,7 @@ module ActionController #:nodoc: def initialize_default_values @host = "test.host" @request_uri = "/" - @remote_addr, @remote_ip = "127.0.0.1" + self.remote_addr = "127.0.0.1" @env["SERVER_PORT"] = 80 end end |