diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-04-28 16:25:04 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-04-28 23:29:46 -0500 |
| commit | d63b42da362d696398fd371815734cb0caed48df (patch) | |
| tree | 8351a959540b17935ca5de8f06be51cb882f6162 /actionpack/lib/action_controller/testing | |
| parent | afa7d7ff05a0d4787b216d50d609084649f21669 (diff) | |
| download | rails-d63b42da362d696398fd371815734cb0caed48df.tar.gz rails-d63b42da362d696398fd371815734cb0caed48df.tar.bz2 rails-d63b42da362d696398fd371815734cb0caed48df.zip | |
Move header injection back into integration tests
Diffstat (limited to 'actionpack/lib/action_controller/testing')
| -rw-r--r-- | actionpack/lib/action_controller/testing/integration.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/testing/integration.rb b/actionpack/lib/action_controller/testing/integration.rb index be5f216e2b..037463e489 100644 --- a/actionpack/lib/action_controller/testing/integration.rb +++ b/actionpack/lib/action_controller/testing/integration.rb @@ -263,7 +263,6 @@ module ActionController opts = { :method => method.to_s.upcase, :params => parameters, - :headers => headers, "SERVER_NAME" => host, "SERVER_PORT" => (https? ? "443" : "80"), @@ -282,6 +281,12 @@ module ActionController } env = ActionDispatch::Test::MockRequest.env_for(@path, opts) + (headers || {}).each do |key, value| + key = key.to_s.upcase.gsub(/-/, "_") + key = "HTTP_#{key}" unless env.has_key?(key) || key =~ /^HTTP_/ + env[key] = value + end + app = Rack::Lint.new(@app) status, headers, body = app.call(env) response = ::Rack::MockResponse.new(status, headers, body) |