From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 16 Jun 2011 03:53:07 +0000 (+0000)
Subject: back out r6078.
X-Git-Tag: 1.3.0~1811
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=153028f14a71cf4fece3a7c43dd2d97e99c6b161;p=redmine.git

back out r6078.

NoMethodError: undefined method `mkdir_p' for #<Pathname:0x7f56f9deb3c0>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6080 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/test_helper.rb b/test/test_helper.rb
index d9882e7cc..e8474de15 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -78,8 +78,9 @@ class ActiveSupport::TestCase
 
   # Use a temporary directory for attachment related tests
   def set_tmp_attachments_directory
-    Rails.root.join('tmp/test/attachments').mkdir_p
-    Attachment.storage_path = "#{Rails.root}/tmp/test/attachments"
+    Dir.mkdir "#{RAILS_ROOT}/tmp/test" unless File.directory?("#{RAILS_ROOT}/tmp/test")
+    Dir.mkdir "#{RAILS_ROOT}/tmp/test/attachments" unless File.directory?("#{RAILS_ROOT}/tmp/test/attachments")
+    Attachment.storage_path = "#{RAILS_ROOT}/tmp/test/attachments"
   end
   
   def with_settings(options, &block)