diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-02-07 00:08:28 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-02-07 00:08:28 -0600 |
| commit | 2277fbedbea930fb8ce38ab7eb133de6fcc4a2d6 (patch) | |
| tree | 784f2dfcd066eaa17a89cc435ec4de44393799c8 /actionpack/lib/action_controller/test_process.rb | |
| parent | 24f2e676f700b8a387c6f4c27acf172658cd7863 (diff) | |
| download | rails-2277fbedbea930fb8ce38ab7eb133de6fcc4a2d6.tar.gz rails-2277fbedbea930fb8ce38ab7eb133de6fcc4a2d6.tar.bz2 rails-2277fbedbea930fb8ce38ab7eb133de6fcc4a2d6.zip | |
Temporarily bundle Rack 1.0 prerelease for testing
Diffstat (limited to 'actionpack/lib/action_controller/test_process.rb')
| -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 4b5fc3a3c1..dbaec00bee 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -4,8 +4,12 @@ module ActionController #:nodoc: attr_accessor :query_parameters, :path, :session attr_accessor :host - def initialize - super(Rack::MockRequest.env_for("/")) + def self.new(env = {}) + super + end + + def initialize(env = {}) + super(Rack::MockRequest.env_for("/").merge(env)) @query_parameters = {} @session = TestSession.new |