diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-14 12:34:38 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-14 12:34:38 -0300 |
| commit | 48c1e6d584409d774b184e0f4d2ef28e5b0e9c90 (patch) | |
| tree | a2becf0cce37a47579e848780b02f420d335ccd9 /actionpack/test/dispatch/request_test.rb | |
| parent | 9ac01fad193b27e517ea772e0d1e13e06f4ddf34 (diff) | |
| parent | c6bc8e662614be711f45a8d4b231d5f993b024a7 (diff) | |
| download | rails-48c1e6d584409d774b184e0f4d2ef28e5b0e9c90.tar.gz rails-48c1e6d584409d774b184e0f4d2ef28e5b0e9c90.tar.bz2 rails-48c1e6d584409d774b184e0f4d2ef28e5b0e9c90.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/test/dispatch/request_test.rb')
| -rw-r--r-- | actionpack/test/dispatch/request_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb index f3500fca34..b626063df4 100644 --- a/actionpack/test/dispatch/request_test.rb +++ b/actionpack/test/dispatch/request_test.rb @@ -427,7 +427,7 @@ class RequestTest < ActiveSupport::TestCase request = stub_request 'CONTENT_TYPE' => 'application/xml; charset=UTF-8' request.expects(:parameters).at_least_once.returns({}) - assert_equal with_set(Mime::XML, Mime::HTML), request.formats + assert_equal with_set(Mime::XML, Mime::HTML, Mime::ALL), request.formats end with_accept_header false do @@ -460,7 +460,7 @@ protected end def with_set(*args) - args + Mime::SET + args end def with_accept_header(value) |