diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-01-06 15:36:38 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-01-06 15:36:38 -0800 |
| commit | 851c3de5c973bf6c0abf2c3b24f1a71dafdcd97a (patch) | |
| tree | 482f3ffc9108ba5723d9cfaa6d80d77399923170 /actionpack/test/controller/integration_test.rb | |
| parent | 9b96e8d1ccb5b4548896b4100004e6371633f9fb (diff) | |
| parent | b7ea4add86231ef628d479516c8a09ca55e610bc (diff) | |
| download | rails-851c3de5c973bf6c0abf2c3b24f1a71dafdcd97a.tar.gz rails-851c3de5c973bf6c0abf2c3b24f1a71dafdcd97a.tar.bz2 rails-851c3de5c973bf6c0abf2c3b24f1a71dafdcd97a.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/test/controller/integration_test.rb')
| -rw-r--r-- | actionpack/test/controller/integration_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb index 53cebf768e..7ac9d97096 100644 --- a/actionpack/test/controller/integration_test.rb +++ b/actionpack/test/controller/integration_test.rb @@ -4,7 +4,7 @@ uses_mocha 'integration' do class SessionTest < Test::Unit::TestCase StubApp = lambda { |env| - [200, {"Content-Type" => "text/html"}, "Hello, World!"] + [200, {"Content-Type" => "text/html", "Content-Length" => "13"}, "Hello, World!"] } def setup @@ -465,9 +465,9 @@ class MetalTest < ActionController::IntegrationTest class Poller def self.call(env) if env["PATH_INFO"] =~ /^\/success/ - [200, {"Content-Type" => "text/plain"}, "Hello World!"] + [200, {"Content-Type" => "text/plain", "Content-Length" => "12"}, "Hello World!"] else - [404, {"Content-Type" => "text/plain"}, ''] + [404, {"Content-Type" => "text/plain", "Content-Length" => "0"}, ''] end end end |