From 67b2d08c0a64ddec3a0c4e1c0b5d96bd418cceef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Wed, 29 Jul 2009 10:09:21 +0200 Subject: Ensure that the proper accept header value is set during tests. Signed-off-by: Yehuda Katz --- actionpack/lib/action_controller/base/mime_responds.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_controller/base/mime_responds.rb b/actionpack/lib/action_controller/base/mime_responds.rb index dff4d7b943..ece4920a23 100644 --- a/actionpack/lib/action_controller/base/mime_responds.rb +++ b/actionpack/lib/action_controller/base/mime_responds.rb @@ -146,12 +146,12 @@ module ActionController #:nodoc: # # Mime::Type.register "image/jpg", :jpg def respond_to(*mimes, &block) + raise ArgumentError, "respond_to takes either types or a block, never both" if mimes.any? && block_given? responder = Responder.new - block.call(responder) if block_given? mimes = collect_mimes_from_class_level if mimes.empty? - mimes.each { |mime| responder.send(mime) } + mimes.each { |mime| responder.custom(mime) } if format = request.negotiate_mime(responder.order) # TODO It should be just: self.formats = [ :foo ] -- cgit v1.2.3