Merged Rails 2.1 compatibility branch.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1623 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-07-04 17:58:14 +00:00
parent 22558f7709
commit 7cdd88a6ce
32 changed files with 629 additions and 421 deletions
@@ -65,20 +65,3 @@ class Test::Unit::TestCase
    Attachment.storage_path = "#{RAILS_ROOT}/tmp/test/attachments"
  end
 end
-
-
-# ActionController::TestUploadedFile bug
-# see http://dev.rubyonrails.org/ticket/4635
-class String
-  def original_filename
-    "testfile.txt"
-  end
-  
-  def content_type
-    "text/plain"
-  end
-  
-  def read
-    self.to_s
-  end
-end