diff options
author | José Valim <jose.valim@gmail.com> | 2009-07-28 09:00:33 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-07-28 09:00:33 +0200 |
commit | d9aae2b56e64a4f417eaffa99e10cca274e928e7 (patch) | |
tree | 8438f6f784df9b252c0f834bc7cb9c369103d4cd /railties/test/fixtures | |
parent | 5025ae610f89989f3e15241ec7065e3d443614d9 (diff) | |
parent | 9533e0eca76b1df68a90e1ebe395d7b6a59d8e91 (diff) | |
download | rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.tar.gz rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.tar.bz2 rails-d9aae2b56e64a4f417eaffa99e10cca274e928e7.zip |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/test/fixtures')
-rw-r--r-- | railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb | 4 | ||||
-rw-r--r-- | railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb index 2d373ce422..4ca4ddd447 100644 --- a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb +++ b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb @@ -1,5 +1,5 @@ -class MetalA < Rails::Rack::Metal +class MetalA def self.call(env) - [200, { "Content-Type" => "text/html"}, ["Hi"]] + [404, { "Content-Type" => "text/html"}, ["Metal A"]] end end diff --git a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb index a8bbf3fd60..80e69fe0b0 100644 --- a/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb +++ b/railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb @@ -1,5 +1,5 @@ -class MetalB < Rails::Rack::Metal +class MetalB def self.call(env) - [200, { "Content-Type" => "text/html"}, ["Hi"]] + [200, { "Content-Type" => "text/html"}, ["Metal B"]] end end |