diff test/.svn/text-base/test_helper.rb.svn-base @ 120:cd2282d2aa55 cannam

Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).
author Chris Cannam
date Thu, 13 Jan 2011 14:33:08 +0000
parents af80e5618e9b 8661b858af72
children 753f1380d6bc
line wrap: on
line diff
--- a/test/.svn/text-base/test_helper.rb.svn-base	Thu Jan 13 13:21:03 2011 +0000
+++ b/test/.svn/text-base/test_helper.rb.svn-base	Thu Jan 13 14:33:08 2011 +0000
@@ -59,7 +59,7 @@
   end
   
   def uploaded_test_file(name, mime)
-    ActionController::TestUploadedFile.new(ActiveSupport::TestCase.fixture_path + "/files/#{name}", mime)
+    ActionController::TestUploadedFile.new(ActiveSupport::TestCase.fixture_path + "/files/#{name}", mime, true)
   end
 
   # Mock out a file