diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-01-31 11:03:00 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-01-31 11:03:00 -0800 |
| commit | a02d752ae408b34e048b7b040e28c36074a9119f (patch) | |
| tree | c4945d5832b1b18dd423b8d93ab58c443e23620d /actionpack | |
| parent | bc94061156e52ec45fceec582e8400250cc022fb (diff) | |
| download | rails-a02d752ae408b34e048b7b040e28c36074a9119f.tar.gz rails-a02d752ae408b34e048b7b040e28c36074a9119f.tar.bz2 rails-a02d752ae408b34e048b7b040e28c36074a9119f.zip | |
Ruby 1.9 compat: omit Rack::Lint from integration tests until it accepts String headers and bodies
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/integration.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index fd3c30a92f..c335d638a1 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -308,7 +308,11 @@ module ActionController ActionController::Base.clear_last_instantiation! - app = Rack::Lint.new(@application) + app = @application + # Rack::Lint doesn't accept String headers or bodies in Ruby 1.9 + unless RUBY_VERSION >= '1.9.0' && Rack.release <= '0.9.0' + app = Rack::Lint.new(app) + end status, headers, body = app.call(env) @request_count += 1 |