diff options
| author | Michael S. Klishin <michael@novemberain.com> | 2008-12-28 23:47:29 +0300 |
|---|---|---|
| committer | Michael S. Klishin <michael@novemberain.com> | 2008-12-28 23:47:29 +0300 |
| commit | 2b8750eba439c4b829b2e8172a1edc0dfa9c532b (patch) | |
| tree | 1ea12e7fe5ad299119d801c7e7f527f6b7780bc3 /actionpack/lib/action_controller/test_process.rb | |
| parent | e523b43e202d343912f67b8c8737d9e2e956b31f (diff) | |
| parent | 0efec64520d5153e5a961f9a759883656b83bb53 (diff) | |
| download | rails-2b8750eba439c4b829b2e8172a1edc0dfa9c532b.tar.gz rails-2b8750eba439c4b829b2e8172a1edc0dfa9c532b.tar.bz2 rails-2b8750eba439c4b829b2e8172a1edc0dfa9c532b.zip | |
Sync with rails/rails/master, merge two metaprogramming annotation efforts
Diffstat (limited to 'actionpack/lib/action_controller/test_process.rb')
| -rw-r--r-- | actionpack/lib/action_controller/test_process.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index acfb10cdca..285a8b09e4 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -33,11 +33,7 @@ module ActionController #:nodoc: attr_accessor :host def initialize - env = Rack::MockRequest.env_for("/") - - # TODO: Fix Request to assume env['SERVER_ADDR'] doesn't contain port number - env['SERVER_ADDR'] = env.delete("SERVER_NAME") - super(env) + super(Rack::MockRequest.env_for("/")) @query_parameters = {} @session = TestSession.new |