diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-24 15:24:57 -0800 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-24 15:24:57 -0800 |
commit | 38af368360ab35600ef69b21d85ae9604e6ebb22 (patch) | |
tree | ce198e83d0523584f7def682bff537c9893e0099 /actionpack/test/dispatch/response_test.rb | |
parent | 2b7256a42e63640d6e94fe80ee67093ed0f06e4c (diff) | |
parent | 46b376962f064077734773c7e1eea5881e5d5696 (diff) | |
download | rails-38af368360ab35600ef69b21d85ae9604e6ebb22.tar.gz rails-38af368360ab35600ef69b21d85ae9604e6ebb22.tar.bz2 rails-38af368360ab35600ef69b21d85ae9604e6ebb22.zip |
Merge
Diffstat (limited to 'actionpack/test/dispatch/response_test.rb')
-rw-r--r-- | actionpack/test/dispatch/response_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb index 59ad2e48bd..02f63f7006 100644 --- a/actionpack/test/dispatch/response_test.rb +++ b/actionpack/test/dispatch/response_test.rb @@ -178,7 +178,7 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest @app = lambda { |env| [200, {'ETag' => '"202cb962ac59075b964b07152d234b70"', - 'Cache-Control' => 'public'}, 'Hello'] + 'Cache-Control' => 'public'}, ['Hello']] } get '/' @@ -217,7 +217,7 @@ class ResponseIntegrationTest < ActionDispatch::IntegrationTest @app = lambda { |env| [200, {'Content-Type' => 'application/xml; charset=utf-16'}, - 'Hello'] + ['Hello']] } get '/' |