diff options
author | Yehuda Katz <wycats@gmail.com> | 2009-01-13 13:28:14 -0800 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-01-13 13:28:28 -0800 |
commit | 0932b012fae2ff21214f610a0fd78a55ae4e2420 (patch) | |
tree | 82b521a5ddf17c3bc4fd7762c95d49f29d31de15 /actionpack/test/controller/request/multipart_params_parsing_test.rb | |
parent | 6fe739ad752aeeaaf274ced6111685d2d6ed2eb8 (diff) | |
parent | 5a43908c7414996354ca427354d98d789e0210e7 (diff) | |
download | rails-0932b012fae2ff21214f610a0fd78a55ae4e2420.tar.gz rails-0932b012fae2ff21214f610a0fd78a55ae4e2420.tar.bz2 rails-0932b012fae2ff21214f610a0fd78a55ae4e2420.zip |
Sync 'rails/rails/master'
Diffstat (limited to 'actionpack/test/controller/request/multipart_params_parsing_test.rb')
-rw-r--r-- | actionpack/test/controller/request/multipart_params_parsing_test.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/actionpack/test/controller/request/multipart_params_parsing_test.rb b/actionpack/test/controller/request/multipart_params_parsing_test.rb index 03ab164972..ce28ff46fe 100644 --- a/actionpack/test/controller/request/multipart_params_parsing_test.rb +++ b/actionpack/test/controller/request/multipart_params_parsing_test.rb @@ -3,11 +3,10 @@ require 'abstract_unit' class MultipartParamsParsingTest < ActionController::IntegrationTest class TestController < ActionController::Base class << self - attr_accessor :last_request_parameters, :last_request_type + attr_accessor :last_request_parameters end def parse - self.class.last_request_type = ActionController::Base.param_parsers[request.content_type] self.class.last_request_parameters = request.request_parameters head :ok end @@ -21,7 +20,6 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest def teardown TestController.last_request_parameters = nil - TestController.last_request_type = nil end test "parses single parameter" do @@ -103,11 +101,13 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest assert_equal 19756, files.size end - test "uploads and parses parameters" do + test "uploads and reads binary file" do with_test_routing do - params = { :uploaded_data => fixture_file_upload(FIXTURE_PATH + "/mona_lisa.jpg", "image/jpg") } - post '/parse', params, :location => 'blah' - assert_equal(:multipart_form, TestController.last_request_type) + fixture = FIXTURE_PATH + "/mona_lisa.jpg" + params = { :uploaded_data => fixture_file_upload(fixture, "image/jpg") } + post '/read', params + expected_length = 'File: '.length + File.size(fixture) + assert_equal expected_length, response.content_length end end |