diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2008-12-28 20:00:29 +0000 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2008-12-28 20:00:29 +0000 |
commit | d6c2285e31cbc7150cf99ff3a537eddbdb50fb29 (patch) | |
tree | 785f0c7ad566a09b9bc558854b4a5d43ae86ed46 /actionpack/lib/action_controller/test_process.rb | |
parent | aaea12c497ca86a86fbda8409c226630ade22f89 (diff) | |
parent | a2270ef2594b97891994848138614657363f2806 (diff) | |
download | rails-d6c2285e31cbc7150cf99ff3a537eddbdb50fb29.tar.gz rails-d6c2285e31cbc7150cf99ff3a537eddbdb50fb29.tar.bz2 rails-d6c2285e31cbc7150cf99ff3a537eddbdb50fb29.zip |
Merge commit 'mainstream/master'
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 |