aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-12-02 23:07:04 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-12-02 23:07:04 +0000
commit7611fa6d469cef9accabe6bb5e7e95914756322a (patch)
tree1a2501c62c34858277dd0b91906fabd1884245d2 /actionpack/test
parent5410f2cb74737bd6d96c226230c2b9c2bfe1d80b (diff)
downloadrails-7611fa6d469cef9accabe6bb5e7e95914756322a.tar.gz
rails-7611fa6d469cef9accabe6bb5e7e95914756322a.tar.bz2
rails-7611fa6d469cef9accabe6bb5e7e95914756322a.zip
Added Request#format to return the format used for the request as a mime type. If no format is specified, the first Request#accepts type is used. This means you can stop using respond_to for anything else than responses [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5664 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/request_test.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/actionpack/test/controller/request_test.rb b/actionpack/test/controller/request_test.rb
index 65e88b74d8..db81eb3097 100644
--- a/actionpack/test/controller/request_test.rb
+++ b/actionpack/test/controller/request_test.rb
@@ -303,6 +303,18 @@ class RequestTest < Test::Unit::TestCase
assert @request.head?
end
+ def test_format
+ @request.instance_eval { @parameters = { :format => 'xml' } }
+ assert_equal Mime::XML, @request.format
+
+ @request.instance_eval { @parameters = { :format => 'xhtml' } }
+ assert_equal Mime::HTML, @request.format
+
+ @request.instance_eval { @parameters = { :format => nil } }
+ @request.env["HTTP_ACCEPT"] = "text/javascript"
+ assert_equal Mime::JS, @request.format
+ end
+
protected
def set_request_method_to(method)
@request.env['REQUEST_METHOD'] = method.to_s.upcase