diff options
| author | Tim Haines <tmhaines@gmail.com> | 2008-08-28 12:57:25 +1200 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-27 18:50:29 -0700 |
| commit | 82778351a8b1036ac4bdc8e72a3f011151fefa31 (patch) | |
| tree | ac2d73e846d316cb7205a5c08f2039787f4ea643 /actionpack | |
| parent | 657898c821b3877ad25ee4f9764e169ce554e884 (diff) | |
| download | rails-82778351a8b1036ac4bdc8e72a3f011151fefa31.tar.gz rails-82778351a8b1036ac4bdc8e72a3f011151fefa31.tar.bz2 rails-82778351a8b1036ac4bdc8e72a3f011151fefa31.zip | |
Add TestUploadFile.content_type= to match Request.UploadedFile
[#920 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/test_process.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/test_test.rb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index c6b1470070..a11fa7cd10 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -331,7 +331,7 @@ module ActionController #:nodoc: attr_reader :original_filename # The content type of the "uploaded" file - attr_reader :content_type + attr_accessor :content_type def initialize(path, content_type = Mime::TEXT, binary = false) raise "#{path} file does not exist" unless File.exist?(path) diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb index 58d9ca537f..9eff34a542 100644 --- a/actionpack/test/controller/test_test.rb +++ b/actionpack/test/controller/test_test.rb @@ -531,6 +531,11 @@ XML assert_equal content_type, file.content_type assert_equal file.path, file.local_path assert_equal expected, file.read + + new_content_type = "new content_type" + file.content_type = new_content_type + assert_equal new_content_type, file.content_type + end def test_test_uploaded_file_with_binary |