aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-10-15 16:27:26 -0700
committerYehuda Katz <wycats@gmail.com>2009-10-15 16:27:26 -0700
commit4869b74aeee2f6d0e88605b73d2bdb4f150cfb63 (patch)
tree218313858f1c44b979b8553f92910de6d2e242dd
parentb71f83c9ccd0ecd1a047710f7b39309f51677119 (diff)
downloadrails-4869b74aeee2f6d0e88605b73d2bdb4f150cfb63.tar.gz
rails-4869b74aeee2f6d0e88605b73d2bdb4f150cfb63.tar.bz2
rails-4869b74aeee2f6d0e88605b73d2bdb4f150cfb63.zip
Fix test to correctly handle 1.9 Array#to_s behavior
-rw-r--r--actionpack/test/controller/new_base/content_negotiation_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/new_base/content_negotiation_test.rb b/actionpack/test/controller/new_base/content_negotiation_test.rb
index 7b38a82f51..b98a22dfcc 100644
--- a/actionpack/test/controller/new_base/content_negotiation_test.rb
+++ b/actionpack/test/controller/new_base/content_negotiation_test.rb
@@ -5,7 +5,7 @@ module ContentNegotiation
# This has no layout and it works
class BasicController < ActionController::Base
self.view_paths = [ActionView::FixtureResolver.new(
- "content_negotiation/basic/hello.html.erb" => "Hello world <%= request.formats %>!"
+ "content_negotiation/basic/hello.html.erb" => "Hello world <%= request.formats.first.to_s %>!"
)]
end